Version Information
+
| aFreeRDP Version | %1$s |
| System Version | %2$s |
| Model | %3$s |
Gestures
++aFreeRDP is designed for touch sensitive devices. +These gestures let you do the most usual operations with your fingers.
+ 
+
+
+ Help
+
+
+
+
+
+
+
+
+Help
+
+
+
+
+
+
+
+
+
+
+
+Help
+
+
+
+
+
+
+
+
+
+
+
+Help
+
+
+
+
+
+
+
+
+
+
+
+Help
+
+
+
+
+
+
+
+
+
+
+
+Help
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/jni/CMakeLists.txt b/client/Android/jni/CMakeLists.txt
new file mode 100644
index 000000000..58d96f6c7
--- /dev/null
+++ b/client/Android/jni/CMakeLists.txt
@@ -0,0 +1,65 @@
+# FreeRDP: A Remote Desktop Protocol Implementation
+# Android Client
+#
+# Copyright 2012 Marc-Andre Moreau
+# Copyright 2013 Bernhard Miklautz
+#
+# 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.
+
+set(MODULE_NAME "freerdp-android")
+set(MODULE_PREFIX "FREERDP_CLIENT_ANDROID")
+
+
+include_directories(.)
+include_directories(generated)
+
+if(CMAKE_COMPILER_IS_GNUCC)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-pointer-sign")
+endif()
+
+set(${MODULE_PREFIX}_SRCS
+ android_debug.h
+ android_event.c
+ android_event.h
+ android_freerdp.c
+ android_freerdp.h
+ android_jni_callback.c
+ android_jni_callback.h)
+
+set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS}
+ generated/android_freerdp_jni.c
+ generated/android_freerdp_jni.h)
+
+add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
+
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
+
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+ MONOLITHIC ${MONOLITHIC_BUILD}
+ MODULE freerdp
+ MODULES freerdp-core freerdp-gdi freerdp-utils)
+
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+ MONOLITHIC ${MONOLITHIC_BUILD}
+ MODULE winpr
+ MODULES winpr-crt winpr-synch)
+
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} dl)
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} log)
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} jnigraphics)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+
+set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${ANDROID_SOURCE_DIR}/libs/${ANDROID_ABI}")
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Android")
diff --git a/client/Android/jni/android_debug.h b/client/Android/jni/android_debug.h
new file mode 100644
index 000000000..46892fb91
--- /dev/null
+++ b/client/Android/jni/android_debug.h
@@ -0,0 +1,34 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Android Debug Interface
+ *
+ * Copyright 2013 Thinstuff 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/.
+ */
+
+#ifndef FREERDP_ANDROID_DEBUG_H
+#define FREERDP_ANDROID_DEBUG_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include
+
+#define TAG "LibFreeRDP"
+
+#define DEBUG_ANDROID_NULL(fmt, ...) do { } while (0)
+#define DEBUG_ANDROID_PRINT(_dbg_str, fmt, ...) __android_log_print(ANDROID_LOG_INFO, TAG, _dbg_str fmt "\n" , __FUNCTION__, __LINE__, ## __VA_ARGS__)
+#define DEBUG_ANDROID_CLASS(_dbg_class, fmt, ...) DEBUG_ANDROID_PRINT("DBG_" #_dbg_class " %s (%d): ", fmt, ## __VA_ARGS__)
+
+#ifdef WITH_DEBUG_ANDROID_JNI
+#define DEBUG_ANDROID(fmt, ...) DEBUG_ANDROID_PRINT("DBG %s (%d): ", fmt, ## __VA_ARGS__)
+#else
+#define DEBUG_ANDROID(fmt, ...) DEBUG_ANDROID_NULL(fmt, ## __VA_ARGS__)
+#endif
+
+#endif /* FREERDP_ANDROID_DEBUG_H */
+
diff --git a/client/Android/jni/android_event.c b/client/Android/jni/android_event.c
new file mode 100644
index 000000000..bb0f55bb1
--- /dev/null
+++ b/client/Android/jni/android_event.c
@@ -0,0 +1,289 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Android Event System
+ *
+ * Copyright 2010-2012 Marc-Andre Moreau
+ * Copyright 2013 Thinstuff 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/.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#ifdef HAVE_UNISTD_H
+#include
+#endif
+
+#include "android_freerdp.h"
+
+int android_is_event_set(ANDROID_EVENT_QUEUE * queue)
+{
+ fd_set rfds;
+ int num_set;
+ struct timeval time;
+
+ FD_ZERO(&rfds);
+ FD_SET(queue->pipe_fd[0], &rfds);
+ memset(&time, 0, sizeof(time));
+ num_set = select(queue->pipe_fd[0] + 1, &rfds, 0, 0, &time);
+
+ return (num_set == 1);
+}
+
+void android_set_event(ANDROID_EVENT_QUEUE * queue)
+{
+ int length;
+
+ length = write(queue->pipe_fd[1], "sig", 4);
+
+ if (length != 4)
+ printf("android_set_event: error\n");
+}
+
+
+void android_clear_event(ANDROID_EVENT_QUEUE * queue)
+{
+ int length;
+
+ while (android_is_event_set(queue))
+ {
+ length = read(queue->pipe_fd[0], &length, 4);
+
+ if (length != 4)
+ printf("android_clear_event: error\n");
+ }
+}
+
+void android_push_event(freerdp * inst, ANDROID_EVENT* event)
+{
+
+ androidContext* aCtx = (androidContext*)inst->context;
+ if (aCtx->event_queue->count >= aCtx->event_queue->size)
+ {
+ aCtx->event_queue->size = aCtx->event_queue->size * 2;
+ aCtx->event_queue->events = realloc((void*) aCtx->event_queue->events, aCtx->event_queue->size);
+ }
+
+ aCtx->event_queue->events[(aCtx->event_queue->count)++] = event;
+
+ android_set_event(aCtx->event_queue);
+}
+
+ANDROID_EVENT* android_peek_event(ANDROID_EVENT_QUEUE * queue)
+{
+ ANDROID_EVENT* event;
+
+ if (queue->count < 1)
+ return NULL;
+
+ event = queue->events[0];
+
+ return event;
+}
+
+ANDROID_EVENT* android_pop_event(ANDROID_EVENT_QUEUE * queue)
+{
+ int i;
+ ANDROID_EVENT* event;
+
+ if (queue->count < 1)
+ return NULL;
+
+ event = queue->events[0];
+ (queue->count)--;
+
+ for (i = 0; i < queue->count; i++)
+ {
+ queue->events[i] = queue->events[i + 1];
+ }
+
+ return event;
+}
+
+int android_process_event(ANDROID_EVENT_QUEUE * queue, freerdp * inst)
+{
+ ANDROID_EVENT* event;
+
+ while (android_peek_event(queue) != NULL)
+ {
+ event = android_pop_event(queue);
+
+ if (event->type == EVENT_TYPE_KEY)
+ {
+ ANDROID_EVENT_KEY* key_event = (ANDROID_EVENT_KEY*) event;
+ inst->input->KeyboardEvent(inst->input, key_event->flags, key_event->scancode);
+ android_event_key_free(key_event);
+ }
+ else if (event->type == EVENT_TYPE_KEY_UNICODE)
+ {
+ ANDROID_EVENT_KEY* key_event = (ANDROID_EVENT_KEY*) event;
+ inst->input->UnicodeKeyboardEvent(inst->input, key_event->flags, key_event->scancode);
+ android_event_key_free(key_event);
+ }
+ else if (event->type == EVENT_TYPE_CURSOR)
+ {
+ ANDROID_EVENT_CURSOR* cursor_event = (ANDROID_EVENT_CURSOR*) event;
+ inst->input->MouseEvent(inst->input, cursor_event->flags, cursor_event->x, cursor_event->y);
+ android_event_cursor_free(cursor_event);
+ }
+ else if (event->type == EVENT_TYPE_DISCONNECT)
+ {
+ android_event_disconnect_free(event);
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+BOOL android_get_fds(freerdp * inst, void ** read_fds,
+ int * read_count, void ** write_fds, int * write_count)
+{
+ androidContext* aCtx = (androidContext*)inst->context;
+ if (aCtx->event_queue->pipe_fd[0] == -1)
+ return TRUE;
+
+ read_fds[*read_count] = (void *)(long) aCtx->event_queue->pipe_fd[0];
+
+ (*read_count)++;
+ return TRUE;
+}
+
+BOOL android_check_fds(freerdp * inst)
+{
+ androidContext* aCtx = (androidContext*)inst->context;
+
+ if (aCtx->event_queue->pipe_fd[0] == -1)
+ return TRUE;
+
+ if (android_is_event_set(aCtx->event_queue))
+ {
+ android_clear_event(aCtx->event_queue);
+ if(android_process_event(aCtx->event_queue, inst) != 0)
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+ANDROID_EVENT_KEY* android_event_key_new(int flags, UINT16 scancode)
+{
+ ANDROID_EVENT_KEY* event;
+
+ event = (ANDROID_EVENT_KEY*) malloc(sizeof(ANDROID_EVENT_KEY));
+ memset(event, 0, sizeof(ANDROID_EVENT_KEY));
+
+ event->type = EVENT_TYPE_KEY;
+ event->flags = flags;
+ event->scancode = scancode;
+
+ return event;
+}
+
+void android_event_key_free(ANDROID_EVENT_KEY* event)
+{
+ if (event != NULL)
+ free(event);
+}
+
+ANDROID_EVENT_KEY* android_event_unicodekey_new(UINT16 key)
+{
+ ANDROID_EVENT_KEY* event;
+
+ event = (ANDROID_EVENT_KEY*) malloc(sizeof(ANDROID_EVENT_KEY));
+ memset(event, 0, sizeof(ANDROID_EVENT_KEY));
+
+ event->type = EVENT_TYPE_KEY_UNICODE;
+ event->scancode = key;
+
+ return event;
+}
+
+void android_event_unicodekey_free(ANDROID_EVENT_KEY* event)
+{
+ if (event != NULL)
+ free(event);
+}
+
+ANDROID_EVENT_CURSOR* android_event_cursor_new(UINT16 flags, UINT16 x, UINT16 y)
+{
+ ANDROID_EVENT_CURSOR* event;
+
+ event = (ANDROID_EVENT_CURSOR*) malloc(sizeof(ANDROID_EVENT_CURSOR));
+ memset(event, 0, sizeof(ANDROID_EVENT_CURSOR));
+
+ event->type = EVENT_TYPE_CURSOR;
+ event->x = x;
+ event->y = y;
+ event->flags = flags;
+
+ return event;
+}
+
+void android_event_cursor_free(ANDROID_EVENT_CURSOR* event)
+{
+ if (event != NULL)
+ free(event);
+}
+
+ANDROID_EVENT* android_event_disconnect_new()
+{
+ ANDROID_EVENT* event;
+
+ event = (ANDROID_EVENT*) malloc(sizeof(ANDROID_EVENT));
+ memset(event, 0, sizeof(ANDROID_EVENT));
+
+ event->type = EVENT_TYPE_DISCONNECT;
+ return event;
+}
+
+void android_event_disconnect_free(ANDROID_EVENT* event)
+{
+ if (event != NULL)
+ free(event);
+}
+
+void android_event_queue_init(freerdp * inst)
+{
+ androidContext* aCtx = (androidContext*)inst->context;
+
+ aCtx->event_queue = (ANDROID_EVENT_QUEUE*) malloc(sizeof(ANDROID_EVENT_QUEUE));
+ memset(aCtx->event_queue, 0, sizeof(ANDROID_EVENT_QUEUE));
+
+ aCtx->event_queue->pipe_fd[0] = -1;
+ aCtx->event_queue->pipe_fd[1] = -1;
+
+ aCtx->event_queue->size = 16;
+ aCtx->event_queue->count = 0;
+ aCtx->event_queue->events = (ANDROID_EVENT**) malloc(sizeof(ANDROID_EVENT*) * aCtx->event_queue->size);
+
+ if (pipe(aCtx->event_queue->pipe_fd) < 0)
+ printf("android_pre_connect: pipe failed\n");
+}
+
+void android_event_queue_uninit(freerdp * inst)
+{
+ androidContext* aCtx = (androidContext*)inst->context;
+
+ if (aCtx->event_queue->pipe_fd[0] != -1)
+ {
+ close(aCtx->event_queue->pipe_fd[0]);
+ aCtx->event_queue->pipe_fd[0] = -1;
+ }
+ if (aCtx->event_queue->pipe_fd[1] != -1)
+ {
+ close(aCtx->event_queue->pipe_fd[1]);
+ aCtx->event_queue->pipe_fd[1] = -1;
+ }
+}
diff --git a/client/Android/jni/android_event.h b/client/Android/jni/android_event.h
new file mode 100644
index 000000000..f0a373652
--- /dev/null
+++ b/client/Android/jni/android_event.h
@@ -0,0 +1,74 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Android Event System
+ *
+ * Copyright 2010-2012 Marc-Andre Moreau
+ *
+ * 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/.
+ */
+
+#ifndef FREERDP_ANDROID_EVENT_H
+#define FREERDP_ANDROID_EVENT_H
+#include
+
+#define EVENT_TYPE_KEY 1
+#define EVENT_TYPE_CURSOR 2
+#define EVENT_TYPE_DISCONNECT 3
+#define EVENT_TYPE_KEY_UNICODE 4
+
+struct _ANDROID_EVENT
+{
+ int type;
+};
+typedef struct _ANDROID_EVENT ANDROID_EVENT;
+
+struct _ANDROID_EVENT_KEY
+{
+ int type;
+ int flags;
+ UINT16 scancode;
+};
+typedef struct _ANDROID_EVENT_KEY ANDROID_EVENT_KEY;
+
+struct _ANDROID_EVENT_CURSOR
+{
+ int type;
+ UINT16 flags;
+ UINT16 x;
+ UINT16 y;
+};
+typedef struct _ANDROID_EVENT_CURSOR ANDROID_EVENT_CURSOR;
+
+struct _ANDROID_EVENT_QUEUE
+{
+ int size;
+ int count;
+ int pipe_fd[2];
+ ANDROID_EVENT **events;
+};
+typedef struct _ANDROID_EVENT_QUEUE ANDROID_EVENT_QUEUE;
+
+int android_is_event_set(ANDROID_EVENT_QUEUE * queue);
+void android_set_event(ANDROID_EVENT_QUEUE * queue);
+void android_clear_event(ANDROID_EVENT_QUEUE * queue);
+void android_push_event(freerdp * inst, ANDROID_EVENT* event);
+ANDROID_EVENT* android_peek_event(ANDROID_EVENT_QUEUE * queue);
+ANDROID_EVENT* android_pop_event(ANDROID_EVENT_QUEUE * queue);
+int android_process_event(ANDROID_EVENT_QUEUE * queue, freerdp * inst);
+BOOL android_get_fds(freerdp * inst, void ** read_fds,
+ int * read_count, void ** write_fds, int * write_count);
+BOOL android_check_fds(freerdp * inst);
+ANDROID_EVENT_KEY* android_event_key_new(int flags, UINT16 scancode);
+ANDROID_EVENT_KEY* android_event_unicodekey_new(UINT16 key);
+ANDROID_EVENT_CURSOR* android_event_cursor_new(UINT16 flags, UINT16 x, UINT16 y);
+ANDROID_EVENT* android_event_disconnect_new();
+void android_event_key_free(ANDROID_EVENT_KEY* event);
+void android_event_unicodekey_free(ANDROID_EVENT_KEY* event);
+void android_event_cursor_free(ANDROID_EVENT_CURSOR* event);
+void android_event_disconnect_free(ANDROID_EVENT* event);
+void android_event_queue_init(freerdp * inst);
+void android_event_queue_uninit(freerdp * inst);
+
+#endif /* FREERDP_ANDROID_EVENT_H */
diff --git a/client/Android/jni/android_freerdp.c b/client/Android/jni/android_freerdp.c
new file mode 100644
index 000000000..6a31ebc0e
--- /dev/null
+++ b/client/Android/jni/android_freerdp.c
@@ -0,0 +1,841 @@
+/*
+ Android JNI Client Layer
+
+ Copyright 2010-2012 Marc-Andre Moreau
+ Copyright 2013 Thinstuff 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/.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include "android_freerdp.h"
+#include "android_jni_callback.h"
+#include "android_debug.h"
+
+struct thread_data
+{
+ freerdp* instance;
+};
+
+
+void android_context_new(freerdp* instance, rdpContext* context)
+{
+ context->channels = freerdp_channels_new();
+ android_event_queue_init(instance);
+}
+
+void android_context_free(freerdp* instance, rdpContext* context)
+{
+ freerdp_channels_free(context->channels);
+ android_event_queue_uninit(instance);
+}
+
+
+void android_begin_paint(rdpContext* context)
+{
+ rdpGdi* gdi = context->gdi;
+ gdi->primary->hdc->hwnd->invalid->null = 1;
+ gdi->primary->hdc->hwnd->ninvalid = 0;
+}
+
+
+void android_end_paint(rdpContext* context)
+{
+ DEBUG_ANDROID("ui_update");
+
+ rdpGdi *gdi = context->gdi;
+ if (gdi->primary->hdc->hwnd->invalid->null)
+ return;
+
+ int x = gdi->primary->hdc->hwnd->invalid->x;
+ int y = gdi->primary->hdc->hwnd->invalid->y;
+ int w = gdi->primary->hdc->hwnd->invalid->w;
+ int h = gdi->primary->hdc->hwnd->invalid->h;
+
+ DEBUG_ANDROID("ui_update: x:%d y:%d w:%d h:%d", x, y, w, h);
+
+ freerdp_callback("OnGraphicsUpdate", "(IIIII)V", context->instance, x, y, w, h);
+}
+
+void android_desktop_resize(rdpContext* context)
+{
+ DEBUG_ANDROID("ui_desktop_resize");
+
+ rdpGdi *gdi = context->gdi;
+ rdpSettings* settings = context->instance->settings;
+
+ gdi_resize(gdi, settings->DesktopWidth, settings->DesktopHeight);
+ freerdp_callback("OnGraphicsResize", "(III)V", context->instance, settings->DesktopWidth, settings->DesktopHeight);
+}
+
+
+BOOL android_pre_connect(freerdp* instance)
+{
+ DEBUG_ANDROID("android_pre_connect");
+
+ rdpSettings* settings = instance->settings;
+ BOOL bitmap_cache = settings->BitmapCacheEnabled;
+ settings->OrderSupport[NEG_DSTBLT_INDEX] = TRUE;
+ settings->OrderSupport[NEG_PATBLT_INDEX] = TRUE;
+ settings->OrderSupport[NEG_SCRBLT_INDEX] = TRUE;
+ settings->OrderSupport[NEG_OPAQUE_RECT_INDEX] = TRUE;
+ settings->OrderSupport[NEG_DRAWNINEGRID_INDEX] = FALSE;
+ settings->OrderSupport[NEG_MULTIDSTBLT_INDEX] = FALSE;
+ settings->OrderSupport[NEG_MULTIPATBLT_INDEX] = FALSE;
+ settings->OrderSupport[NEG_MULTISCRBLT_INDEX] = FALSE;
+ settings->OrderSupport[NEG_MULTIOPAQUERECT_INDEX] = TRUE;
+ settings->OrderSupport[NEG_MULTI_DRAWNINEGRID_INDEX] = FALSE;
+ settings->OrderSupport[NEG_LINETO_INDEX] = TRUE;
+ settings->OrderSupport[NEG_POLYLINE_INDEX] = TRUE;
+ settings->OrderSupport[NEG_MEMBLT_INDEX] = bitmap_cache;
+ settings->OrderSupport[NEG_MEM3BLT_INDEX] = TRUE;
+ settings->OrderSupport[NEG_MEMBLT_V2_INDEX] = bitmap_cache;
+ settings->OrderSupport[NEG_MEM3BLT_V2_INDEX] = FALSE;
+ settings->OrderSupport[NEG_SAVEBITMAP_INDEX] = FALSE;
+ settings->OrderSupport[NEG_GLYPH_INDEX_INDEX] = TRUE;
+ settings->OrderSupport[NEG_FAST_INDEX_INDEX] = TRUE;
+ settings->OrderSupport[NEG_FAST_GLYPH_INDEX] = TRUE;
+ settings->OrderSupport[NEG_POLYGON_SC_INDEX] = FALSE;
+ settings->OrderSupport[NEG_POLYGON_CB_INDEX] = FALSE;
+ settings->OrderSupport[NEG_ELLIPSE_SC_INDEX] = FALSE;
+ settings->OrderSupport[NEG_ELLIPSE_CB_INDEX] = FALSE;
+
+ settings->FrameAcknowledge = 10;
+
+ freerdp_channels_load_plugin(instance->context->channels, instance->settings, "tsxlc", NULL);
+
+ freerdp_channels_pre_connect(instance->context->channels, instance);
+
+ return TRUE;
+}
+
+BOOL android_post_connect(freerdp* instance)
+{
+ DEBUG_ANDROID("android_post_connect");
+
+ freerdp_callback("OnSettingsChanged", "(IIII)V", instance, instance->settings->DesktopWidth, instance->settings->DesktopHeight, instance->settings->ColorDepth);
+
+ instance->context->cache = cache_new(instance->settings);
+
+ gdi_init(instance, CLRCONV_ALPHA | ((instance->settings->ColorDepth > 16) ? CLRBUF_32BPP : CLRBUF_16BPP), NULL);
+
+ instance->update->BeginPaint = android_begin_paint;
+ instance->update->EndPaint = android_end_paint;
+ instance->update->DesktopResize = android_desktop_resize;
+
+ //ai->rail = rail_new(instance->settings);
+ //instance->update->rail = (void*) ai->rail;
+ //rail_register_update_callbacks(xfi->rail, instance->update);
+ //android_rail_register_callbacks(xfi, xfi->rail);
+
+ freerdp_channels_post_connect(instance->context->channels, instance);
+
+ // send notifications
+ freerdp_callback("OnConnectionSuccess", "(I)V", instance);
+
+ return TRUE;
+}
+
+jobject create_string_builder(JNIEnv *env, char* initialStr)
+{
+ jclass cls;
+ jmethodID methodId;
+ jobject obj;
+
+ // get class
+ cls = (*env)->FindClass(env, "java/lang/StringBuilder");
+ if(!cls)
+ return NULL;
+
+ if(initialStr)
+ {
+ // get method id for constructor
+ methodId = (*env)->GetMethodID(env, cls, "", "(Ljava/lang/String;)V");
+ if(!methodId)
+ return NULL;
+
+ // create string that holds our initial string
+ jstring jstr = (*env)->NewStringUTF(env, initialStr);
+
+ // construct new StringBuilder
+ obj = (*env)->NewObject(env, cls, methodId, jstr);
+ }
+ else
+ {
+ // get method id for constructor
+ methodId = (*env)->GetMethodID(env, cls, "", "()V");
+ if(!methodId)
+ return NULL;
+
+ // construct new StringBuilder
+ obj = (*env)->NewObject(env, cls, methodId);
+ }
+
+ return obj;
+}
+
+char* get_string_from_string_builder(JNIEnv* env, jobject strBuilder)
+{
+ jclass cls;
+ jmethodID methodId;
+ jstring strObj;
+ const jbyte* native_str;
+ char* result;
+
+ // get class
+ cls = (*env)->FindClass(env, "java/lang/StringBuilder");
+ if(!cls)
+ return NULL;
+
+ // get method id for constructor
+ methodId = (*env)->GetMethodID(env, cls, "toString", "()Ljava/lang/String;");
+ if(!methodId)
+ return NULL;
+
+ // get jstring representation of our buffer
+ strObj = (*env)->CallObjectMethod(env, strBuilder, methodId);
+
+ // read string
+ native_str = (*env)->GetStringUTFChars(env, strObj, NULL);
+ result = strdup(native_str);
+ (*env)->ReleaseStringUTFChars(env, strObj, native_str);
+
+ return result;
+}
+
+
+BOOL android_authenticate(freerdp* instance, char** username, char** password, char** domain)
+{
+ DEBUG_ANDROID("Authenticate user:");
+ DEBUG_ANDROID(" Username: %s", *username);
+ DEBUG_ANDROID(" Domain: %s", *domain);
+
+ JNIEnv* env;
+ jboolean attached = jni_attach_thread(&env);
+ jobject jstr1 = create_string_builder(env, *username);
+ jobject jstr2 = create_string_builder(env, *domain);
+ jobject jstr3 = create_string_builder(env, *password);
+
+ jboolean res = freerdp_callback_bool_result("OnAuthenticate", "(ILjava/lang/StringBuilder;Ljava/lang/StringBuilder;Ljava/lang/StringBuilder;)Z", instance, jstr1, jstr2, jstr3);
+ if(res == JNI_TRUE)
+ {
+ // read back string values
+ if(*username != NULL)
+ free(*username);
+
+ *username = get_string_from_string_builder(env, jstr1);
+
+ if(*domain != NULL)
+ free(*domain);
+
+ *domain = get_string_from_string_builder(env, jstr2);
+
+ if(*password == NULL)
+ free(*password);
+
+ *password = get_string_from_string_builder(env, jstr3);
+ }
+
+ if(attached == JNI_TRUE)
+ jni_detach_thread();
+
+ return ((res == JNI_TRUE) ? TRUE : FALSE);
+}
+
+BOOL android_verify_certificate(freerdp* instance, char* subject, char* issuer, char* fingerprint)
+{
+ DEBUG_ANDROID("Certificate details:");
+ DEBUG_ANDROID("\tSubject: %s", subject);
+ DEBUG_ANDROID("\tIssuer: %s", issuer);
+ DEBUG_ANDROID("\tThumbprint: %s", fingerprint);
+ DEBUG_ANDROID("The above X.509 certificate could not be verified, possibly because you do not have "
+ "the CA certificate in your certificate store, or the certificate has expired."
+ "Please look at the documentation on how to create local certificate store for a private CA.\n");
+
+ JNIEnv* env;
+ jboolean attached = jni_attach_thread(&env);
+ jstring jstr1 = (*env)->NewStringUTF(env, subject);
+ jstring jstr2 = (*env)->NewStringUTF(env, issuer);
+ jstring jstr3 = (*env)->NewStringUTF(env, fingerprint);
+
+ jboolean res = freerdp_callback_bool_result("OnVerifyCertificate", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z", instance, jstr1, jstr2, jstr3);
+
+ if(attached == JNI_TRUE)
+ jni_detach_thread();
+
+ return ((res == JNI_TRUE) ? TRUE : FALSE);
+}
+
+BOOL android_verify_changed_certificate(freerdp* instance, char* subject, char* issuer, char* new_fingerprint, char* old_fingerprint)
+{
+ return android_verify_certificate(instance, subject, issuer, new_fingerprint);
+}
+
+
+/*
+int xf_process_plugin_args(rdpSettings* settings, const char* name, RDP_PLUGIN_DATA* plugin_data, void* user_data)
+{
+ rdpChanMan* chanman = (rdpChanMan*) user_data;
+
+ printf("loading plugin %s\n", name);
+ freerdp_chanman_load_plugin(chanman, settings, name, plugin_data);
+
+ return 1;
+}
+*/
+
+int android_receive_channel_data(freerdp* instance, int channelId, UINT8* data, int size, int flags, int total_size)
+{
+ return freerdp_channels_data(instance, channelId, data, size, flags, total_size);
+}
+
+void android_process_channel_event(rdpChannels* channels, freerdp* instance)
+{
+ RDP_EVENT* event;
+
+ event = freerdp_channels_pop_event(channels);
+
+ if (event)
+ {
+/* switch (event->event_class)
+ {
+ case RDP_EVENT_CLASS_RAIL:
+ xf_process_rail_event(ai, chanman, event);
+ break;
+
+ default:
+ break;
+ }
+
+ switch (event->event_type)
+ {
+ case RDP_EVENT_TYPE_CB_SYNC:
+ android_process_cb_sync_event(chanman, instance);
+ break;
+ default:
+ break;
+ }
+*/
+ freerdp_event_free(event);
+ }
+}
+
+int android_freerdp_run(freerdp* instance)
+{
+ int i;
+ int fds;
+ int max_fds;
+ int rcount;
+ int wcount;
+ void* rfds[32];
+ void* wfds[32];
+ fd_set rfds_set;
+ fd_set wfds_set;
+
+ memset(rfds, 0, sizeof(rfds));
+ memset(wfds, 0, sizeof(wfds));
+
+ if (!freerdp_connect(instance))
+ {
+ freerdp_callback("OnConnectionFailure", "(I)V", instance);
+ return 0;
+ }
+
+ ((androidContext*)instance->context)->is_connected = TRUE;
+ while (1)
+ {
+ rcount = 0;
+ wcount = 0;
+
+ if (freerdp_get_fds(instance, rfds, &rcount, wfds, &wcount) != TRUE)
+ {
+ DEBUG_ANDROID("Failed to get FreeRDP file descriptor\n");
+ break;
+ }
+ if (freerdp_channels_get_fds(instance->context->channels, instance, rfds, &rcount, wfds, &wcount) != TRUE)
+ {
+ DEBUG_ANDROID("Failed to get channel manager file descriptor\n");
+ break;
+ }
+ if (android_get_fds(instance, rfds, &rcount, wfds, &wcount) != TRUE)
+ {
+ DEBUG_ANDROID("Failed to get android file descriptor\n");
+ break;
+ }
+
+ max_fds = 0;
+ FD_ZERO(&rfds_set);
+ FD_ZERO(&wfds_set);
+
+ for (i = 0; i < rcount; i++)
+ {
+ fds = (int)(long)(rfds[i]);
+
+ if (fds > max_fds)
+ max_fds = fds;
+
+ FD_SET(fds, &rfds_set);
+ }
+
+ if (max_fds == 0)
+ break;
+
+ if (select(max_fds + 1, &rfds_set, &wfds_set, NULL, NULL) == -1)
+ {
+ /* these are not really errors */
+ if (!((errno == EAGAIN) ||
+ (errno == EWOULDBLOCK) ||
+ (errno == EINPROGRESS) ||
+ (errno == EINTR))) /* signal occurred */
+ {
+ DEBUG_ANDROID("android_run: select failed\n");
+ break;
+ }
+ }
+
+ if (freerdp_check_fds(instance) != TRUE)
+ {
+ DEBUG_ANDROID("Failed to check FreeRDP file descriptor\n");
+ break;
+ }
+ if (android_check_fds(instance) != TRUE)
+ {
+ DEBUG_ANDROID("Failed to check android file descriptor\n");
+ break;
+ }
+ if (freerdp_channels_check_fds(instance->context->channels, instance) != TRUE)
+ {
+ DEBUG_ANDROID("Failed to check channel manager file descriptor\n");
+ break;
+ }
+ android_process_channel_event(instance->context->channels, instance);
+ }
+
+ // issue another OnDisconnecting here in case the disconnect was initiated by the sever and not our client
+ freerdp_callback("OnDisconnecting", "(I)V", instance);
+ freerdp_channels_close(instance->context->channels, instance);
+ freerdp_disconnect(instance);
+ gdi_free(instance);
+ cache_free(instance->context->cache);
+ freerdp_callback("OnDisconnected", "(I)V", instance);
+
+ return 0;
+}
+
+void* android_thread_func(void* param)
+{
+ struct thread_data* data;
+ data = (struct thread_data*) param;
+
+ freerdp* instance = data->instance;
+ android_freerdp_run(instance);
+ free(data);
+
+ pthread_detach(pthread_self());
+
+ return NULL;
+}
+
+jint JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+
+ DEBUG_ANDROID("JNI_OnLoad");
+
+ jint res = init_callback_environment(vm);
+
+ setlocale(LC_ALL, "");
+
+ freerdp_channels_global_init();
+
+ return res;
+}
+
+JNIEXPORT jint JNICALL jni_freerdp_new(JNIEnv *env, jclass cls)
+{
+ freerdp* instance;
+
+ // create instance
+ instance = freerdp_new();
+ instance->PreConnect = android_pre_connect;
+ instance->PostConnect = android_post_connect;
+ instance->Authenticate = android_authenticate;
+ instance->VerifyCertificate = android_verify_certificate;
+ instance->VerifyChangedCertificate = android_verify_changed_certificate;
+ instance->ReceiveChannelData = android_receive_channel_data;
+
+
+ // create context
+ instance->context_size = sizeof(androidContext);
+ instance->ContextNew = android_context_new;
+ instance->ContextFree = android_context_free;
+ freerdp_context_new(instance);
+
+ return (jint) instance;
+}
+
+JNIEXPORT void JNICALL jni_freerdp_free(JNIEnv *env, jclass cls, jint instance)
+{
+ freerdp* inst = (freerdp*)instance;
+ freerdp_free(inst);
+}
+
+JNIEXPORT jboolean JNICALL jni_freerdp_connect(JNIEnv *env, jclass cls, jint instance)
+{
+ freerdp* inst = (freerdp*)instance;
+ struct thread_data* data = (struct thread_data*) malloc(sizeof(struct thread_data));
+ data->instance = inst;
+
+ androidContext* ctx = (androidContext*)inst->context;
+ pthread_create(&ctx->thread, 0, android_thread_func, data);
+
+ return JNI_TRUE;
+}
+
+JNIEXPORT jboolean JNICALL jni_freerdp_disconnect(JNIEnv *env, jclass cls, jint instance)
+{
+ freerdp* inst = (freerdp*)instance;
+ ANDROID_EVENT* event = (ANDROID_EVENT*)android_event_disconnect_new();
+ android_push_event(inst, event);
+ freerdp_callback("OnDisconnecting", "(I)V", instance);
+ return (jboolean) JNI_TRUE;
+}
+
+JNIEXPORT void JNICALL jni_freerdp_cancel_connection(JNIEnv *env, jclass cls, jint instance)
+{
+ DEBUG_ANDROID("Cancelling connection ...");
+ freerdp* inst = (freerdp*)instance;
+ ANDROID_EVENT* event = (ANDROID_EVENT*)android_event_disconnect_new();
+ android_push_event(inst, event);
+ freerdp_callback("OnDisconnecting", "(I)V", instance);
+}
+
+JNIEXPORT void JNICALL jni_freerdp_set_data_directory(JNIEnv *env, jclass cls, jint instance, jstring jdirectory)
+{
+ freerdp* inst = (freerdp*)instance;
+ rdpSettings * settings = inst->settings;
+
+ const jbyte *directory = (*env)->GetStringUTFChars(env, jdirectory, NULL);
+ free(settings->HomePath);
+ settings->HomePath = strdup(directory);
+ (*env)->ReleaseStringUTFChars(env, jdirectory, directory);
+}
+
+JNIEXPORT void JNICALL jni_freerdp_set_connection_info(JNIEnv *env, jclass cls, jint instance,
+ jstring jhostname, jstring jusername, jstring jpassword, jstring jdomain, jint width, jint height,
+ jint color_depth, jint port, jboolean console, jint security, jstring jcertname)
+{
+ freerdp* inst = (freerdp*)instance;
+ rdpSettings * settings = inst->settings;
+
+ const jbyte *hostname = (*env)->GetStringUTFChars(env, jhostname, NULL);
+ const jbyte *username = (*env)->GetStringUTFChars(env, jusername, NULL);
+ const jbyte *password = (*env)->GetStringUTFChars(env, jpassword, NULL);
+ const jbyte *domain = (*env)->GetStringUTFChars(env, jdomain, NULL);
+ const jbyte *certname = (*env)->GetStringUTFChars(env, jcertname, NULL);
+
+ DEBUG_ANDROID("hostname: %s", (char*) hostname);
+ DEBUG_ANDROID("username: %s", (char*) username);
+ DEBUG_ANDROID("password: %s", (char*) password);
+ DEBUG_ANDROID("domain: %s", (char*) domain);
+ DEBUG_ANDROID("width: %d", width);
+ DEBUG_ANDROID("height: %d", height);
+ DEBUG_ANDROID("color depth: %d", color_depth);
+ DEBUG_ANDROID("port: %d", port);
+ DEBUG_ANDROID("security: %d", security);
+
+ settings->DesktopWidth = width;
+ settings->DesktopHeight = height;
+ settings->ColorDepth = color_depth;
+ settings->ServerPort = port;
+
+ // Hack for 16 bit RDVH connections:
+ // In this case we get screen corruptions when we have an odd screen resolution width ... need to investigate what is causing this...
+ if (color_depth <= 16)
+ settings->DesktopWidth &= (~1);
+
+ settings->ServerHostname = strdup(hostname);
+
+ if(username && strlen(username) > 0)
+ settings->Username = strdup(username);
+
+ if(password && strlen(password) > 0)
+ {
+ settings->Password = strdup(password);
+ settings->AutoLogonEnabled = TRUE;
+ }
+
+ settings->Domain = strdup(domain);
+
+ if(certname && strlen(certname) > 0)
+ settings->CertificateName = strdup(certname);
+
+ settings->ConsoleSession = (console == JNI_TRUE) ? TRUE : FALSE;
+
+ settings->SoftwareGdi = TRUE;
+
+ /* enable NSCodec */
+ settings->NSCodec = TRUE;
+
+ switch ((int) security)
+ {
+ case 1:
+ /* Standard RDP */
+ settings->RdpSecurity = TRUE;
+ settings->TlsSecurity = FALSE;
+ settings->NlaSecurity = FALSE;
+ settings->ExtSecurity = FALSE;
+ settings->DisableEncryption = TRUE;
+ settings->EncryptionMethods = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
+ settings->EncryptionLevel = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
+ break;
+
+ case 2:
+ /* TLS */
+ settings->NlaSecurity = FALSE;
+ settings->TlsSecurity = TRUE;
+ settings->RdpSecurity = FALSE;
+ settings->ExtSecurity = FALSE;
+ break;
+
+ case 3:
+ /* NLA */
+ settings->NlaSecurity = TRUE;
+ settings->TlsSecurity = FALSE;
+ settings->RdpSecurity = FALSE;
+ settings->ExtSecurity = FALSE;
+ break;
+
+ default:
+ break;
+ }
+
+ // set US keyboard layout
+ settings->KeyboardLayout = 0x0409;
+
+ (*env)->ReleaseStringUTFChars(env, jhostname, hostname);
+ (*env)->ReleaseStringUTFChars(env, jusername, username);
+ (*env)->ReleaseStringUTFChars(env, jpassword, password);
+ (*env)->ReleaseStringUTFChars(env, jdomain, domain);
+ (*env)->ReleaseStringUTFChars(env, jcertname, certname);
+
+ return;
+}
+
+JNIEXPORT void JNICALL jni_freerdp_set_performance_flags(
+ JNIEnv *env, jclass cls, jint instance, jboolean remotefx, jboolean disableWallpaper, jboolean disableFullWindowDrag,
+ jboolean disableMenuAnimations, jboolean disableTheming, jboolean enableFontSmoothing, jboolean enableDesktopComposition)
+{
+ freerdp* inst = (freerdp*)instance;
+ rdpSettings * settings = inst->settings;
+
+ DEBUG_ANDROID("remotefx: %d", (remotefx == JNI_TRUE) ? 1 : 0);
+ if (remotefx == JNI_TRUE)
+ {
+ settings->RemoteFxCodec = TRUE;
+ settings->FastPathOutput = TRUE;
+ settings->ColorDepth = 32;
+ settings->LargePointerFlag = TRUE;
+ settings->PerformanceFlags = PERF_FLAG_NONE;
+ settings->FrameMarkerCommandEnabled = TRUE;
+ }
+
+ /* store performance settings */
+ if (disableWallpaper == JNI_TRUE)
+ settings->DisableWallpaper = TRUE;
+
+ if (disableFullWindowDrag == JNI_TRUE)
+ settings->DisableFullWindowDrag = TRUE;
+
+ if (disableMenuAnimations == JNI_TRUE)
+ settings->DisableMenuAnims = TRUE;
+
+ if (disableTheming == JNI_TRUE)
+ settings->DisableThemes = TRUE;
+
+ if (enableFontSmoothing == JNI_TRUE)
+ settings->AllowFontSmoothing = TRUE;
+
+ if(enableDesktopComposition == JNI_TRUE)
+ settings->AllowDesktopComposition = TRUE;
+
+
+ /* Create performance flags from settings */
+ if (settings->AllowFontSmoothing)
+ settings->PerformanceFlags |= PERF_ENABLE_FONT_SMOOTHING;
+
+ if (settings->AllowDesktopComposition)
+ settings->PerformanceFlags |= PERF_ENABLE_DESKTOP_COMPOSITION;
+
+ if (settings->DisableWallpaper)
+ settings->PerformanceFlags |= PERF_DISABLE_WALLPAPER;
+
+ if (settings->DisableFullWindowDrag)
+ settings->PerformanceFlags |= PERF_DISABLE_FULLWINDOWDRAG;
+
+ if (settings->DisableMenuAnims)
+ settings->PerformanceFlags |= PERF_DISABLE_MENUANIMATIONS;
+
+ if (settings->DisableThemes)
+ settings->PerformanceFlags |= PERF_DISABLE_THEMING;
+
+ DEBUG_ANDROID("performance_flags: %04X", settings->PerformanceFlags);
+}
+
+JNIEXPORT void JNICALL jni_freerdp_set_advanced_settings(JNIEnv *env, jclass cls, jint instance, jstring jRemoteProgram, jstring jWorkDir)
+{
+ freerdp* inst = (freerdp*)instance;
+ rdpSettings * settings = inst->settings;
+
+ const jbyte *remote_program = (*env)->GetStringUTFChars(env, jRemoteProgram, NULL);
+ const jbyte *work_dir = (*env)->GetStringUTFChars(env, jWorkDir, NULL);
+
+ DEBUG_ANDROID("Remote Program: %s", (char*) remote_program);
+ DEBUG_ANDROID("Work Dir: %s", (char*) work_dir);
+
+ if(remote_program && strlen(remote_program) > 0)
+ settings->AlternateShell = strdup(remote_program);
+
+ if(work_dir && strlen(work_dir) > 0)
+ settings->ShellWorkingDirectory = strdup(work_dir);
+
+ (*env)->ReleaseStringUTFChars(env, jRemoteProgram, remote_program);
+ (*env)->ReleaseStringUTFChars(env, jWorkDir, work_dir);
+}
+
+void copy_pixel_buffer(UINT8* dstBuf, UINT8* srcBuf, int x, int y, int width, int height, int wBuf, int hBuf, int bpp)
+{
+ int i, j;
+ int length;
+ int scanline;
+ UINT8 *dstp, *srcp;
+
+ length = width * bpp;
+ scanline = wBuf * bpp;
+
+ srcp = (UINT8*) &srcBuf[(scanline * y) + (x * bpp)];
+ dstp = (UINT8*) &dstBuf[(scanline * y) + (x * bpp)];
+
+ if (bpp == 4)
+ {
+ for (i = 0; i < height; i++)
+ {
+ for (j = 0; j < width * 4; j += 4)
+ {
+ // ARGB <-> ABGR
+ dstp[j + 0] = srcp[j + 2];
+ dstp[j + 1] = srcp[j + 1];
+ dstp[j + 2] = srcp[j + 0];
+ dstp[j + 3] = srcp[j + 3];
+ }
+
+ srcp += scanline;
+ dstp += scanline;
+ }
+ }
+ else
+ {
+ for (i = 0; i < height; i++)
+ {
+ memcpy(dstp, srcp, length);
+ srcp += scanline;
+ dstp += scanline;
+ }
+ }
+}
+
+JNIEXPORT jboolean JNICALL jni_freerdp_update_graphics(
+ JNIEnv *env, jclass cls, jint instance, jobject bitmap, jint x, jint y, jint width, jint height)
+{
+
+ int ret;
+ void* pixels;
+ AndroidBitmapInfo info;
+ freerdp* inst = (freerdp*)instance;
+ rdpGdi *gdi = inst->context->gdi;
+
+ if ((ret = AndroidBitmap_getInfo(env, bitmap, &info)) < 0)
+ {
+ DEBUG_ANDROID("AndroidBitmap_getInfo() failed ! error=%d", ret);
+ return JNI_FALSE;
+ }
+
+ if ((ret = AndroidBitmap_lockPixels(env, bitmap, &pixels)) < 0)
+ {
+ DEBUG_ANDROID("AndroidBitmap_lockPixels() failed ! error=%d", ret);
+ return JNI_FALSE;
+ }
+
+ copy_pixel_buffer(pixels, gdi->primary_buffer, x, y, width, height, gdi->width, gdi->height, gdi->bytesPerPixel);
+
+ AndroidBitmap_unlockPixels(env, bitmap);
+
+ return JNI_TRUE;
+}
+
+JNIEXPORT void JNICALL jni_freerdp_send_key_event(
+ JNIEnv *env, jclass cls, jint instance, jint keycode, jboolean down)
+{
+ RDP_SCANCODE scancode;
+ ANDROID_EVENT* event;
+
+ freerdp* inst = (freerdp*)instance;
+
+ scancode = freerdp_keyboard_get_rdp_scancode_from_virtual_key_code(keycode);
+ int flags = (down == JNI_TRUE) ? KBD_FLAGS_DOWN : KBD_FLAGS_RELEASE;
+ flags |= (RDP_SCANCODE_EXTENDED(scancode)) ? KBD_FLAGS_EXTENDED : 0;
+ event = (ANDROID_EVENT*) android_event_key_new(flags, RDP_SCANCODE_CODE(scancode));
+
+ android_push_event(inst, event);
+
+ DEBUG_ANDROID("send_key_event: %d, %d", scancode, flags);
+}
+
+JNIEXPORT void JNICALL jni_freerdp_send_unicodekey_event(
+ JNIEnv *env, jclass cls, jint instance, jint keycode)
+{
+ ANDROID_EVENT* event;
+
+ freerdp* inst = (freerdp*)instance;
+ event = (ANDROID_EVENT*) android_event_unicodekey_new(keycode);
+ android_push_event(inst, event);
+
+ DEBUG_ANDROID("send_unicodekey_event: %d", keycode);
+}
+
+JNIEXPORT void JNICALL jni_freerdp_send_cursor_event(
+ JNIEnv *env, jclass cls, jint instance, jint x, jint y, jint flags)
+{
+ ANDROID_EVENT* event;
+
+ freerdp* inst = (freerdp*)instance;
+ event = (ANDROID_EVENT*) android_event_cursor_new(flags, x, y);
+ android_push_event(inst, event);
+
+ DEBUG_ANDROID("send_cursor_event: (%d, %d), %d", x, y, flags);
+}
+
+JNIEXPORT jstring JNICALL jni_freerdp_get_version(JNIEnv *env, jclass cls)
+{
+ return (*env)->NewStringUTF(env, GIT_REVISION);
+}
+
diff --git a/client/Android/jni/android_freerdp.h b/client/Android/jni/android_freerdp.h
new file mode 100644
index 000000000..e932220d0
--- /dev/null
+++ b/client/Android/jni/android_freerdp.h
@@ -0,0 +1,53 @@
+/*
+ Android JNI Client Layer
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+#ifndef __ANDROID_FREERDP_H
+#define __ANDROID_FREERDP_H
+
+#include
+#include
+#include
+
+#include "android_event.h"
+
+struct android_context
+{
+ rdpContext rdpCtx;
+
+ ANDROID_EVENT_QUEUE* event_queue;
+ pthread_t thread;
+ BOOL is_connected;
+};
+typedef struct android_context androidContext;
+
+
+
+void copy_remotefx_tile(UINT8* dstBuf, UINT8* srcBuf, int x, int y, int width, int height, int bpp);
+void copy_pixel_buffer(UINT8* dstBuf, UINT8* srcBuf, int x, int y, int width, int height, int wBuf, int hBuf, int bpp);
+
+JNIEXPORT jint JNICALL jni_freerdp_new(JNIEnv *env, jclass cls);
+JNIEXPORT void JNICALL jni_freerdp_free(JNIEnv *env, jclass cls, jint instance);
+JNIEXPORT jboolean JNICALL jni_freerdp_connect(JNIEnv *env, jclass cls, jint instance);
+JNIEXPORT jboolean JNICALL jni_freerdp_disconnect(JNIEnv *env, jclass cls, jint instance);
+JNIEXPORT void JNICALL jni_freerdp_cancel_connection(JNIEnv *env, jclass cls, jint instance);
+JNIEXPORT void JNICALL jni_freerdp_set_connection_info(JNIEnv *env, jclass cls, jint instance,
+ jstring jhostname, jstring jusername, jstring jpassword, jstring jdomain, jint width,
+ jint height, jint color_depth, jint port, jboolean console, jint security, jstring jcertname);
+JNIEXPORT void JNICALL jni_freerdp_set_performance_flags(JNIEnv *env, jclass cls, jint instance, jboolean remotefx, jboolean disableWallpaper, jboolean disableFullWindowDrag,
+ jboolean disableMenuAnimations, jboolean disableTheming, jboolean enableFontSmoothing, jboolean enableDesktopComposition);
+JNIEXPORT void JNICALL jni_freerdp_set_advanced_settings(JNIEnv *env, jclass cls, jint instance, jstring jRemoteProgram, jstring jWorkDir);
+JNIEXPORT void JNICALL jni_freerdp_set_data_directory(JNIEnv *env, jclass cls, jint instance, jstring jdirectory);
+JNIEXPORT jboolean JNICALL jni_freerdp_update_graphics(JNIEnv *env, jclass cls, jint instance, jobject bitmap, jint x, jint y, jint width, jint height);
+JNIEXPORT void JNICALL jni_freerdp_send_cursor_event(JNIEnv *env, jclass cls, jint instance, jint x, jint y, jint flags);
+JNIEXPORT void JNICALL jni_freerdp_send_key_event(JNIEnv *env, jclass cls, jint instance, jint keycode, jboolean down);
+JNIEXPORT void JNICALL jni_freerdp_send_unicodekey_event(JNIEnv *env, jclass cls, jint instance, jint keycode);
+JNIEXPORT jstring JNICALL jni_freerdp_get_version(JNIEnv *env, jclass cls);
+
+#endif /* __ANDROID_FREERDP_H */
+
diff --git a/client/Android/jni/android_jni_callback.c b/client/Android/jni/android_jni_callback.c
new file mode 100644
index 000000000..071b3de3f
--- /dev/null
+++ b/client/Android/jni/android_jni_callback.c
@@ -0,0 +1,179 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Android JNI Callback Helpers
+ *
+ * Copyright 2011-2013 Thinstuff 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/.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include
+#include
+
+#include "android_jni_callback.h"
+#include "android_debug.h"
+#include "android_freerdp_jni.h"
+
+JavaVM *jVM;
+jobject jLibFreeRDPObject;
+
+const char *jLibFreeRDPPath = JAVA_LIBFREERDP_CLASS;
+
+void jni_load_class(JNIEnv *env, const char *path, jobject *objptr)
+{
+ jclass class;
+ jmethodID method;
+ jobject object;
+
+ DEBUG_ANDROID("jni_load_class: %s", path);
+
+ class = (*env)->FindClass(env, path);
+
+ if (!class)
+ {
+ DEBUG_ANDROID("jni_load_class: failed to find class %s", path);
+ }
+
+ method = (*env)->GetMethodID(env, class, "", "()V");
+
+ if (!method)
+ {
+ DEBUG_ANDROID("jni_load_class: failed to find class constructor of %s", path);
+ }
+
+ object = (*env)->NewObject(env, class, method);
+
+ if (!object)
+ {
+ DEBUG_ANDROID("jni_load_class: failed create new object of %s", path);
+ }
+
+ (*objptr) = (*env)->NewGlobalRef(env, object);
+}
+
+jint init_callback_environment(JavaVM* vm)
+{
+ JNIEnv* env;
+ if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_4) != JNI_OK)
+ {
+ DEBUG_ANDROID("JNI_OnLoad: failed to obtain current JNI environment");
+ return -1;
+ }
+
+ jVM = vm;
+
+ jni_load_class(env, jLibFreeRDPPath, &jLibFreeRDPObject);
+
+ return JNI_VERSION_1_4;
+}
+
+/* attach current thread to jvm */
+jboolean jni_attach_thread(JNIEnv** env)
+{
+ if ((*jVM)->GetEnv(jVM, (void**) env, JNI_VERSION_1_4) != JNI_OK)
+ {
+ DEBUG_ANDROID("android_java_callback: attaching current thread");
+
+ (*jVM)->AttachCurrentThread(jVM, env, NULL);
+
+ if ((*jVM)->GetEnv(jVM, (void**) env, JNI_VERSION_1_4) != JNI_OK)
+ {
+ DEBUG_ANDROID("android_java_callback: failed to obtain current JNI environment");
+ }
+
+ return JNI_TRUE;
+ }
+
+ return JNI_FALSE;
+}
+
+/* attach current thread to JVM */
+void jni_detach_thread()
+{
+ (*jVM)->DetachCurrentThread(jVM);
+}
+
+/* callback with void result */
+void java_callback_void(jobject obj, const char * callback, const char* signature, va_list args)
+{
+ jclass jObjClass;
+ jmethodID jCallback;
+ jboolean attached;
+ JNIEnv *env;
+
+ DEBUG_ANDROID("java_callback: %s (%s)", callback, signature);
+
+ attached = jni_attach_thread(&env);
+
+ jObjClass = (*env)->GetObjectClass(env, obj);
+
+ if (!jObjClass) {
+ DEBUG_ANDROID("android_java_callback: failed to get class reference");
+ }
+
+ jCallback = (*env)->GetStaticMethodID(env, jObjClass, callback, signature);
+
+ if (!jCallback) {
+ DEBUG_ANDROID("android_java_callback: failed to get method id");
+ }
+
+ (*env)->CallStaticVoidMethodV(env, jObjClass, jCallback, args);
+
+ if(attached == JNI_TRUE)
+ jni_detach_thread();
+}
+
+/* callback with bool result */
+jboolean java_callback_bool(jobject obj, const char * callback, const char* signature, va_list args)
+{
+ jclass jObjClass;
+ jmethodID jCallback;
+ jboolean attached;
+ JNIEnv *env;
+
+ DEBUG_ANDROID("java_callback: %s (%s)", callback, signature);
+
+ attached = jni_attach_thread(&env);
+
+ jObjClass = (*env)->GetObjectClass(env, obj);
+
+ if (!jObjClass) {
+ DEBUG_ANDROID("android_java_callback: failed to get class reference");
+ }
+
+ jCallback = (*env)->GetStaticMethodID(env, jObjClass, callback, signature);
+
+ if (!jCallback) {
+ DEBUG_ANDROID("android_java_callback: failed to get method id");
+ }
+
+ jboolean res = (*env)->CallStaticBooleanMethodV(env, jObjClass, jCallback, args);
+
+ if(attached == JNI_TRUE)
+ jni_detach_thread();
+
+ return res;
+}
+
+/* callback to freerdp class */
+void freerdp_callback(const char * callback, const char * signature, ...)
+{
+ va_list vl;
+ va_start(vl, signature);
+ java_callback_void(jLibFreeRDPObject, callback, signature, vl);
+ va_end(vl);
+}
+
+jboolean freerdp_callback_bool_result(const char * callback, const char * signature, ...)
+{
+ va_list vl;
+ va_start(vl, signature);
+ jboolean res = java_callback_bool(jLibFreeRDPObject, callback, signature, vl);
+ va_end(vl);
+ return res;
+}
diff --git a/client/Android/jni/android_jni_callback.h b/client/Android/jni/android_jni_callback.h
new file mode 100644
index 000000000..106fc326b
--- /dev/null
+++ b/client/Android/jni/android_jni_callback.h
@@ -0,0 +1,27 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Android JNI Callback Helpers
+ *
+ * Copyright 2010-2012 Marc-Andre Moreau
+ * Copyright 2011-2013 Thinstuff 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/.
+ */
+
+#ifndef FREERDP_ANDROID_JNI_CALLBACK_H
+#define FREERDP_ANDROID_JNI_CALLBACK_H
+
+#include
+#include
+
+jint init_callback_environment(JavaVM* vm);
+jboolean jni_attach_thread(JNIEnv** env);
+void jni_detach_thread();
+void freerdp_callback(const char * callback, const char * signature, ...);
+jboolean freerdp_callback_bool_result(const char * callback, const char * signature, ...);
+void tsxconnect_callback(const char * callback, const char * signature, ...);
+
+#endif /* FREERDP_ANDROID_JNI_CALLBACK_H */
+
diff --git a/client/Android/jni/generated/android_freerdp_jni.c b/client/Android/jni/generated/android_freerdp_jni.c
new file mode 100644
index 000000000..8d64e094c
--- /dev/null
+++ b/client/Android/jni/generated/android_freerdp_jni.c
@@ -0,0 +1,101 @@
+/*
+ FreeRDP: A Remote Desktop Protocol client.
+ Android JNI Bindings and Native Code
+
+ Copyright 2010 Marc-Andre Moreau
+
+ 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 "android_freerdp.h"
+#include "android_freerdp_jni.h"
+
+JNIEXPORT jint JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1new(JNIEnv *env, jclass cls)
+{
+ return jni_freerdp_new(env, cls);
+}
+
+JNIEXPORT void JNICALL JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1free(JNIEnv *env, jclass cls, jint instance)
+{
+ jni_freerdp_free(env, cls, instance);
+}
+
+JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1connect(JNIEnv *env, jclass cls, jint instance)
+{
+ return jni_freerdp_connect(env, cls, instance);
+}
+
+JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1disconnect(JNIEnv *env, jclass cls, jint instance)
+{
+ return jni_freerdp_disconnect(env, cls, instance);
+}
+
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1cancel_1connection(JNIEnv *env, jclass cls, jint instance)
+{
+ jni_freerdp_cancel_connection(env, cls, instance);
+}
+
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1connection_1info(JNIEnv *env, jclass cls, jint instance,
+ jstring jhostname, jstring jusername, jstring jpassword, jstring jdomain, jint width, jint height, jint color_depth, jint port,
+ jboolean console, jint security, jstring certname)
+{
+ jni_freerdp_set_connection_info(env, cls, instance, jhostname, jusername, jpassword, jdomain,
+ width, height, color_depth, port, console, security, certname);
+}
+
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1advanced_1settings(JNIEnv *env, jclass cls, jint instance, jstring remote_program, jstring work_dir)
+{
+ jni_freerdp_set_advanced_settings(env, cls, instance, remote_program, work_dir);
+}
+
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1data_1directory(JNIEnv *env, jclass cls, jint instance, jstring directory)
+{
+ jni_freerdp_set_data_directory(env, cls, instance, directory);
+}
+
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1performance_1flags(
+ JNIEnv *env, jclass cls, jint instance, jboolean remotefx, jboolean disableWallpaper, jboolean disableFullWindowDrag,
+ jboolean disableMenuAnimations, jboolean disableTheming, jboolean enableFontSmoothing, jboolean enableDesktopComposition)
+{
+ jni_freerdp_set_performance_flags(env, cls, instance, remotefx, disableWallpaper, disableFullWindowDrag, disableMenuAnimations, disableTheming, enableFontSmoothing, enableDesktopComposition);
+}
+
+JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1update_1graphics(
+ JNIEnv *env, jclass cls, jint instance, jobject bitmap, jint x, jint y, jint width, jint height)
+{
+ return jni_freerdp_update_graphics(env, cls, instance, bitmap, x, y, width, height);
+}
+
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1send_1cursor_1event(
+ JNIEnv *env, jclass cls, jint instance, jint x, jint y, jint flags)
+{
+ jni_freerdp_send_cursor_event(env, cls, instance, x, y, flags);
+}
+
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1send_1key_1event(
+ JNIEnv *env, jclass cls, jint instance, jint keycode, jboolean down)
+{
+ jni_freerdp_send_key_event(env, cls, instance, keycode, down);
+}
+
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1send_1unicodekey_1event
+ (JNIEnv *env, jclass cls, jint instance, jint keycode)
+{
+ jni_freerdp_send_unicodekey_event(env, cls, instance, keycode);
+}
+
+JNIEXPORT jstring JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1get_1version(JNIEnv *env, jclass cls)
+{
+ return jni_freerdp_get_version(env, cls);
+}
+
diff --git a/client/Android/jni/generated/android_freerdp_jni.h b/client/Android/jni/generated/android_freerdp_jni.h
new file mode 100644
index 000000000..a10d17cc6
--- /dev/null
+++ b/client/Android/jni/generated/android_freerdp_jni.h
@@ -0,0 +1,28 @@
+/*
+ FreeRDP: A Remote Desktop Protocol client.
+ Android FreeRDP JNI Definitions
+
+ Copyright 2010 Marc-Andre Moreau
+
+ 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.
+*/
+
+#ifndef __ANDROID_FREERDP_JNI_H
+#define __ANDROID_FREERDP_JNI_H
+
+#include "com_freerdp_afreerdp_services_LibFreeRDP.h"
+
+#define JAVA_LIBFREERDP_CLASS "com/freerdp/afreerdp/services/LibFreeRDP"
+
+#endif /* __ANDROID_FREERDP_JNI_H */
+
diff --git a/client/Android/jni/generated/com_freerdp_afreerdp_services_LibFreeRDP.h b/client/Android/jni/generated/com_freerdp_afreerdp_services_LibFreeRDP.h
new file mode 100644
index 000000000..cfe8d65f5
--- /dev/null
+++ b/client/Android/jni/generated/com_freerdp_afreerdp_services_LibFreeRDP.h
@@ -0,0 +1,125 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include
+/* Header for class com_freerdp_afreerdp_services_LibFreeRDP */
+
+#ifndef _Included_com_freerdp_afreerdp_services_LibFreeRDP
+#define _Included_com_freerdp_afreerdp_services_LibFreeRDP
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_new
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1new
+ (JNIEnv *, jclass);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_free
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1free
+ (JNIEnv *, jclass, jint);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_connect
+ * Signature: (I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1connect
+ (JNIEnv *, jclass, jint);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_disconnect
+ * Signature: (I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1disconnect
+ (JNIEnv *, jclass, jint);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_cancel_connection
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1cancel_1connection
+ (JNIEnv *, jclass, jint);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_set_connection_info
+ * Signature: (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIZILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1connection_1info
+ (JNIEnv *, jclass, jint, jstring, jstring, jstring, jstring, jint, jint, jint, jint, jboolean, jint, jstring);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_set_performance_flags
+ * Signature: (IZZZZZZZ)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1performance_1flags
+ (JNIEnv *, jclass, jint, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_set_advanced_settings
+ * Signature: (ILjava/lang/String;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1advanced_1settings
+ (JNIEnv *, jclass, jint, jstring, jstring);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_set_data_directory
+ * Signature: (ILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1set_1data_1directory
+ (JNIEnv *, jclass, jint, jstring);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_update_graphics
+ * Signature: (ILandroid/graphics/Bitmap;IIII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1update_1graphics
+ (JNIEnv *, jclass, jint, jobject, jint, jint, jint, jint);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_send_cursor_event
+ * Signature: (IIII)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1send_1cursor_1event
+ (JNIEnv *, jclass, jint, jint, jint, jint);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_send_key_event
+ * Signature: (IIZ)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1send_1key_1event
+ (JNIEnv *, jclass, jint, jint, jboolean);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_send_unicodekey_event
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1send_1unicodekey_1event
+ (JNIEnv *, jclass, jint, jint);
+
+/*
+ * Class: com_freerdp_afreerdp_services_LibFreeRDP
+ * Method: freerdp_get_version
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_freerdp_afreerdp_services_LibFreeRDP_freerdp_1get_1version
+ (JNIEnv *, jclass);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/client/Android/local.properties.cmake b/client/Android/local.properties.cmake
new file mode 100644
index 000000000..159126370
--- /dev/null
+++ b/client/Android/local.properties.cmake
@@ -0,0 +1,2 @@
+# This file is automatically generated by cmake.
+sdk.dir=@ANDROID_SDK@
diff --git a/client/Android/project.properties b/client/Android/project.properties
new file mode 100644
index 000000000..ea89160e0
--- /dev/null
+++ b/client/Android/project.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-8
diff --git a/client/Android/res/drawable-hdpi/icon_button_add.png b/client/Android/res/drawable-hdpi/icon_button_add.png
new file mode 100644
index 000000000..6e028b20b
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_button_add.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_edittext_clear.png b/client/Android/res/drawable-hdpi/icon_edittext_clear.png
new file mode 100644
index 000000000..90db01b5b
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_edittext_clear.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_edittext_search.png b/client/Android/res/drawable-hdpi/icon_edittext_search.png
new file mode 100644
index 000000000..0a91eabcc
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_edittext_search.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_launcher_freerdp.png b/client/Android/res/drawable-hdpi/icon_launcher_freerdp.png
new file mode 100644
index 000000000..45ed86123
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_launcher_freerdp.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_about.png b/client/Android/res/drawable-hdpi/icon_menu_about.png
new file mode 100644
index 000000000..6b3f7fd15
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_about.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_add.png b/client/Android/res/drawable-hdpi/icon_menu_add.png
new file mode 100644
index 000000000..7b0dfc5e1
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_add.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_close.png b/client/Android/res/drawable-hdpi/icon_menu_close.png
new file mode 100644
index 000000000..4683f6193
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_close.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_disconnect.png b/client/Android/res/drawable-hdpi/icon_menu_disconnect.png
new file mode 100644
index 000000000..172ae5f3d
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_disconnect.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_ext_keyboard.png b/client/Android/res/drawable-hdpi/icon_menu_ext_keyboard.png
new file mode 100644
index 000000000..53319e291
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_ext_keyboard.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_help.png b/client/Android/res/drawable-hdpi/icon_menu_help.png
new file mode 100644
index 000000000..a5b4a2f60
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_help.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_preferences.png b/client/Android/res/drawable-hdpi/icon_menu_preferences.png
new file mode 100644
index 000000000..039c72174
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_preferences.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_settings.png b/client/Android/res/drawable-hdpi/icon_menu_settings.png
new file mode 100644
index 000000000..c08e64f91
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_settings.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_sys_keyboard.png b/client/Android/res/drawable-hdpi/icon_menu_sys_keyboard.png
new file mode 100644
index 000000000..5b14130e3
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_sys_keyboard.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_menu_touch_pointer.png b/client/Android/res/drawable-hdpi/icon_menu_touch_pointer.png
new file mode 100644
index 000000000..3f5142012
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_menu_touch_pointer.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_star_off.png b/client/Android/res/drawable-hdpi/icon_star_off.png
new file mode 100644
index 000000000..4be0f5df2
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_star_off.png differ
diff --git a/client/Android/res/drawable-hdpi/icon_star_on.png b/client/Android/res/drawable-hdpi/icon_star_on.png
new file mode 100644
index 000000000..421305087
Binary files /dev/null and b/client/Android/res/drawable-hdpi/icon_star_on.png differ
diff --git a/client/Android/res/drawable-hdpi/search_plate.9.png b/client/Android/res/drawable-hdpi/search_plate.9.png
new file mode 100644
index 000000000..32c6dc370
Binary files /dev/null and b/client/Android/res/drawable-hdpi/search_plate.9.png differ
diff --git a/client/Android/res/drawable-hdpi/sym_keyboard_delete.png b/client/Android/res/drawable-hdpi/sym_keyboard_delete.png
new file mode 100755
index 000000000..59d78bec0
Binary files /dev/null and b/client/Android/res/drawable-hdpi/sym_keyboard_delete.png differ
diff --git a/client/Android/res/drawable-hdpi/sym_keyboard_feedback_delete.png b/client/Android/res/drawable-hdpi/sym_keyboard_feedback_delete.png
new file mode 100755
index 000000000..ca7637552
Binary files /dev/null and b/client/Android/res/drawable-hdpi/sym_keyboard_feedback_delete.png differ
diff --git a/client/Android/res/drawable-hdpi/sym_keyboard_feedback_return.png b/client/Android/res/drawable-hdpi/sym_keyboard_feedback_return.png
new file mode 100755
index 000000000..ae57299e4
Binary files /dev/null and b/client/Android/res/drawable-hdpi/sym_keyboard_feedback_return.png differ
diff --git a/client/Android/res/drawable-hdpi/sym_keyboard_return.png b/client/Android/res/drawable-hdpi/sym_keyboard_return.png
new file mode 100755
index 000000000..58505c5e0
Binary files /dev/null and b/client/Android/res/drawable-hdpi/sym_keyboard_return.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_button_add.png b/client/Android/res/drawable-ldpi/icon_button_add.png
new file mode 100644
index 000000000..7afaeded1
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_button_add.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_edittext_search.png b/client/Android/res/drawable-ldpi/icon_edittext_search.png
new file mode 100644
index 000000000..bdefbf5c6
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_edittext_search.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_launcher_freerdp.png b/client/Android/res/drawable-ldpi/icon_launcher_freerdp.png
new file mode 100644
index 000000000..b57651bed
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_launcher_freerdp.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_about.png b/client/Android/res/drawable-ldpi/icon_menu_about.png
new file mode 100644
index 000000000..55c57d5c5
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_about.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_add.png b/client/Android/res/drawable-ldpi/icon_menu_add.png
new file mode 100644
index 000000000..89620af8c
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_add.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_disconnect.png b/client/Android/res/drawable-ldpi/icon_menu_disconnect.png
new file mode 100644
index 000000000..606cce4a7
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_disconnect.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_exit.png b/client/Android/res/drawable-ldpi/icon_menu_exit.png
new file mode 100644
index 000000000..760b9254d
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_exit.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_ext_keyboard.png b/client/Android/res/drawable-ldpi/icon_menu_ext_keyboard.png
new file mode 100644
index 000000000..425d904ca
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_ext_keyboard.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_help.png b/client/Android/res/drawable-ldpi/icon_menu_help.png
new file mode 100644
index 000000000..f93a4e640
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_help.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_preferences.png b/client/Android/res/drawable-ldpi/icon_menu_preferences.png
new file mode 100644
index 000000000..efc2f3e45
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_preferences.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_settings.png b/client/Android/res/drawable-ldpi/icon_menu_settings.png
new file mode 100644
index 000000000..b137b8c6e
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_settings.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_sys_keyboard.png b/client/Android/res/drawable-ldpi/icon_menu_sys_keyboard.png
new file mode 100644
index 000000000..49837f290
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_sys_keyboard.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_menu_touch_pointer.png b/client/Android/res/drawable-ldpi/icon_menu_touch_pointer.png
new file mode 100644
index 000000000..4e3b7d7a6
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_menu_touch_pointer.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_star_off.png b/client/Android/res/drawable-ldpi/icon_star_off.png
new file mode 100644
index 000000000..f0f1eb845
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_star_off.png differ
diff --git a/client/Android/res/drawable-ldpi/icon_star_on.png b/client/Android/res/drawable-ldpi/icon_star_on.png
new file mode 100644
index 000000000..cf5ed353b
Binary files /dev/null and b/client/Android/res/drawable-ldpi/icon_star_on.png differ
diff --git a/client/Android/res/drawable-ldpi/search_plate.9.png b/client/Android/res/drawable-ldpi/search_plate.9.png
new file mode 100644
index 000000000..2fa21299f
Binary files /dev/null and b/client/Android/res/drawable-ldpi/search_plate.9.png differ
diff --git a/client/Android/res/drawable-ldpi/sym_keyboard_delete.png b/client/Android/res/drawable-ldpi/sym_keyboard_delete.png
new file mode 100644
index 000000000..d9d565391
Binary files /dev/null and b/client/Android/res/drawable-ldpi/sym_keyboard_delete.png differ
diff --git a/client/Android/res/drawable-ldpi/sym_keyboard_feedback_delete.png b/client/Android/res/drawable-ldpi/sym_keyboard_feedback_delete.png
new file mode 100644
index 000000000..8922bf92c
Binary files /dev/null and b/client/Android/res/drawable-ldpi/sym_keyboard_feedback_delete.png differ
diff --git a/client/Android/res/drawable-ldpi/sym_keyboard_feedback_return.png b/client/Android/res/drawable-ldpi/sym_keyboard_feedback_return.png
new file mode 100644
index 000000000..c5f324752
Binary files /dev/null and b/client/Android/res/drawable-ldpi/sym_keyboard_feedback_return.png differ
diff --git a/client/Android/res/drawable-ldpi/sym_keyboard_return.png b/client/Android/res/drawable-ldpi/sym_keyboard_return.png
new file mode 100644
index 000000000..1c7c58d5d
Binary files /dev/null and b/client/Android/res/drawable-ldpi/sym_keyboard_return.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_button_add.png b/client/Android/res/drawable-mdpi/icon_button_add.png
new file mode 100644
index 000000000..af637b3be
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_button_add.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_edittext_clear.png b/client/Android/res/drawable-mdpi/icon_edittext_clear.png
new file mode 100644
index 000000000..90db01b5b
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_edittext_clear.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_edittext_search.png b/client/Android/res/drawable-mdpi/icon_edittext_search.png
new file mode 100644
index 000000000..3f8913e2a
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_edittext_search.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_launcher_freerdp.png b/client/Android/res/drawable-mdpi/icon_launcher_freerdp.png
new file mode 100644
index 000000000..55335c869
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_launcher_freerdp.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_about.png b/client/Android/res/drawable-mdpi/icon_menu_about.png
new file mode 100644
index 000000000..1f8a7cd47
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_about.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_add.png b/client/Android/res/drawable-mdpi/icon_menu_add.png
new file mode 100644
index 000000000..57a4099bb
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_add.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_disconnect.png b/client/Android/res/drawable-mdpi/icon_menu_disconnect.png
new file mode 100644
index 000000000..c1aa860da
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_disconnect.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_exit.png b/client/Android/res/drawable-mdpi/icon_menu_exit.png
new file mode 100644
index 000000000..04a76b589
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_exit.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_ext_keyboard.png b/client/Android/res/drawable-mdpi/icon_menu_ext_keyboard.png
new file mode 100644
index 000000000..9ae25ff2e
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_ext_keyboard.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_help.png b/client/Android/res/drawable-mdpi/icon_menu_help.png
new file mode 100644
index 000000000..4f65a619d
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_help.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_preferences.png b/client/Android/res/drawable-mdpi/icon_menu_preferences.png
new file mode 100644
index 000000000..2f34c7695
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_preferences.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_settings.png b/client/Android/res/drawable-mdpi/icon_menu_settings.png
new file mode 100644
index 000000000..a96bb0c4c
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_settings.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_sys_keyboard.png b/client/Android/res/drawable-mdpi/icon_menu_sys_keyboard.png
new file mode 100644
index 000000000..bcd3eba42
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_sys_keyboard.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_menu_touch_pointer.png b/client/Android/res/drawable-mdpi/icon_menu_touch_pointer.png
new file mode 100644
index 000000000..e37e1dbbe
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_menu_touch_pointer.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_star_off.png b/client/Android/res/drawable-mdpi/icon_star_off.png
new file mode 100755
index 000000000..7e9342b5c
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_star_off.png differ
diff --git a/client/Android/res/drawable-mdpi/icon_star_on.png b/client/Android/res/drawable-mdpi/icon_star_on.png
new file mode 100755
index 000000000..a9bdb052a
Binary files /dev/null and b/client/Android/res/drawable-mdpi/icon_star_on.png differ
diff --git a/client/Android/res/drawable-mdpi/search_plate.9.png b/client/Android/res/drawable-mdpi/search_plate.9.png
new file mode 100644
index 000000000..1cad9020d
Binary files /dev/null and b/client/Android/res/drawable-mdpi/search_plate.9.png differ
diff --git a/client/Android/res/drawable-mdpi/sym_keyboard_delete.png b/client/Android/res/drawable-mdpi/sym_keyboard_delete.png
new file mode 100644
index 000000000..43a033ead
Binary files /dev/null and b/client/Android/res/drawable-mdpi/sym_keyboard_delete.png differ
diff --git a/client/Android/res/drawable-mdpi/sym_keyboard_feedback_delete.png b/client/Android/res/drawable-mdpi/sym_keyboard_feedback_delete.png
new file mode 100644
index 000000000..1edb10b4e
Binary files /dev/null and b/client/Android/res/drawable-mdpi/sym_keyboard_feedback_delete.png differ
diff --git a/client/Android/res/drawable-mdpi/sym_keyboard_feedback_return.png b/client/Android/res/drawable-mdpi/sym_keyboard_feedback_return.png
new file mode 100644
index 000000000..03d9c9b2d
Binary files /dev/null and b/client/Android/res/drawable-mdpi/sym_keyboard_feedback_return.png differ
diff --git a/client/Android/res/drawable-mdpi/sym_keyboard_return.png b/client/Android/res/drawable-mdpi/sym_keyboard_return.png
new file mode 100644
index 000000000..17f257439
Binary files /dev/null and b/client/Android/res/drawable-mdpi/sym_keyboard_return.png differ
diff --git a/client/Android/res/drawable/button_background.xml b/client/Android/res/drawable/button_background.xml
new file mode 100644
index 000000000..9fdf3096d
--- /dev/null
+++ b/client/Android/res/drawable/button_background.xml
@@ -0,0 +1,61 @@
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
diff --git a/client/Android/res/drawable/icon_button_cancel.png b/client/Android/res/drawable/icon_button_cancel.png
new file mode 100644
index 000000000..606cce4a7
Binary files /dev/null and b/client/Android/res/drawable/icon_button_cancel.png differ
diff --git a/client/Android/res/drawable/icon_launcher_freerdp.png b/client/Android/res/drawable/icon_launcher_freerdp.png
new file mode 100644
index 000000000..ad325d46e
Binary files /dev/null and b/client/Android/res/drawable/icon_launcher_freerdp.png differ
diff --git a/client/Android/res/drawable/separator_background.xml b/client/Android/res/drawable/separator_background.xml
new file mode 100644
index 000000000..61c7b8925
--- /dev/null
+++ b/client/Android/res/drawable/separator_background.xml
@@ -0,0 +1,13 @@
+
+
+
+
\ No newline at end of file
diff --git a/client/Android/res/drawable/sym_keyboard_arrows.png b/client/Android/res/drawable/sym_keyboard_arrows.png
new file mode 100755
index 000000000..3ad31caba
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_arrows.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_arrows_black.png b/client/Android/res/drawable/sym_keyboard_arrows_black.png
new file mode 100755
index 000000000..3e9168240
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_arrows_black.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_down_arrow.png b/client/Android/res/drawable/sym_keyboard_down_arrow.png
new file mode 100755
index 000000000..9039b78e9
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_down_arrow.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_down_arrow_black.png b/client/Android/res/drawable/sym_keyboard_down_arrow_black.png
new file mode 100755
index 000000000..c01ef09ed
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_down_arrow_black.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_left_arrow.png b/client/Android/res/drawable/sym_keyboard_left_arrow.png
new file mode 100755
index 000000000..471e42171
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_left_arrow.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_left_arrow_black.png b/client/Android/res/drawable/sym_keyboard_left_arrow_black.png
new file mode 100755
index 000000000..b43956dd5
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_left_arrow_black.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_menu.png b/client/Android/res/drawable/sym_keyboard_menu.png
new file mode 100755
index 000000000..c92d6f225
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_menu.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_menu_black.png b/client/Android/res/drawable/sym_keyboard_menu_black.png
new file mode 100755
index 000000000..a24081b1c
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_menu_black.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_right_arrow.png b/client/Android/res/drawable/sym_keyboard_right_arrow.png
new file mode 100755
index 000000000..c82f696a6
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_right_arrow.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_right_arrow_black.png b/client/Android/res/drawable/sym_keyboard_right_arrow_black.png
new file mode 100755
index 000000000..19208ec0f
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_right_arrow_black.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_up_arrow.png b/client/Android/res/drawable/sym_keyboard_up_arrow.png
new file mode 100755
index 000000000..ca187b5ca
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_up_arrow.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_up_arrow_black.png b/client/Android/res/drawable/sym_keyboard_up_arrow_black.png
new file mode 100755
index 000000000..4240b5928
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_up_arrow_black.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_winkey.png b/client/Android/res/drawable/sym_keyboard_winkey.png
new file mode 100755
index 000000000..6196b7246
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_winkey.png differ
diff --git a/client/Android/res/drawable/sym_keyboard_winkey_black.png b/client/Android/res/drawable/sym_keyboard_winkey_black.png
new file mode 100755
index 000000000..8173d5c9c
Binary files /dev/null and b/client/Android/res/drawable/sym_keyboard_winkey_black.png differ
diff --git a/client/Android/res/drawable/touch_pointer_active.png b/client/Android/res/drawable/touch_pointer_active.png
new file mode 100755
index 000000000..9f91b2465
Binary files /dev/null and b/client/Android/res/drawable/touch_pointer_active.png differ
diff --git a/client/Android/res/drawable/touch_pointer_default.png b/client/Android/res/drawable/touch_pointer_default.png
new file mode 100644
index 000000000..273e21114
Binary files /dev/null and b/client/Android/res/drawable/touch_pointer_default.png differ
diff --git a/client/Android/res/drawable/touch_pointer_extkeyboard.png b/client/Android/res/drawable/touch_pointer_extkeyboard.png
new file mode 100644
index 000000000..c82bdea37
Binary files /dev/null and b/client/Android/res/drawable/touch_pointer_extkeyboard.png differ
diff --git a/client/Android/res/drawable/touch_pointer_keyboard.png b/client/Android/res/drawable/touch_pointer_keyboard.png
new file mode 100644
index 000000000..cd58c87ee
Binary files /dev/null and b/client/Android/res/drawable/touch_pointer_keyboard.png differ
diff --git a/client/Android/res/drawable/touch_pointer_lclick.png b/client/Android/res/drawable/touch_pointer_lclick.png
new file mode 100644
index 000000000..f0a7afa93
Binary files /dev/null and b/client/Android/res/drawable/touch_pointer_lclick.png differ
diff --git a/client/Android/res/drawable/touch_pointer_rclick.png b/client/Android/res/drawable/touch_pointer_rclick.png
new file mode 100644
index 000000000..2129a1f33
Binary files /dev/null and b/client/Android/res/drawable/touch_pointer_rclick.png differ
diff --git a/client/Android/res/drawable/touch_pointer_reset.png b/client/Android/res/drawable/touch_pointer_reset.png
new file mode 100644
index 000000000..3c1289474
Binary files /dev/null and b/client/Android/res/drawable/touch_pointer_reset.png differ
diff --git a/client/Android/res/drawable/touch_pointer_scroll.png b/client/Android/res/drawable/touch_pointer_scroll.png
new file mode 100644
index 000000000..b6205da61
Binary files /dev/null and b/client/Android/res/drawable/touch_pointer_scroll.png differ
diff --git a/client/Android/res/layout/bookmark_list_item.xml b/client/Android/res/layout/bookmark_list_item.xml
new file mode 100644
index 000000000..8903355aa
--- /dev/null
+++ b/client/Android/res/layout/bookmark_list_item.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
diff --git a/client/Android/res/layout/button_preference.xml b/client/Android/res/layout/button_preference.xml
new file mode 100644
index 000000000..dcf913933
--- /dev/null
+++ b/client/Android/res/layout/button_preference.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/layout/credentials.xml b/client/Android/res/layout/credentials.xml
new file mode 100644
index 000000000..e5a0c1771
--- /dev/null
+++ b/client/Android/res/layout/credentials.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
diff --git a/client/Android/res/layout/dont_show_again_dialog.xml b/client/Android/res/layout/dont_show_again_dialog.xml
new file mode 100644
index 000000000..36a06f6ba
--- /dev/null
+++ b/client/Android/res/layout/dont_show_again_dialog.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/layout/home.xml b/client/Android/res/layout/home.xml
new file mode 100644
index 000000000..e2929bf92
--- /dev/null
+++ b/client/Android/res/layout/home.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
diff --git a/client/Android/res/layout/list_header.xml b/client/Android/res/layout/list_header.xml
new file mode 100644
index 000000000..1d7942bbc
--- /dev/null
+++ b/client/Android/res/layout/list_header.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/layout/session_list_item.xml b/client/Android/res/layout/session_list_item.xml
new file mode 100644
index 000000000..c5e3d9b96
--- /dev/null
+++ b/client/Android/res/layout/session_list_item.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
diff --git a/client/Android/res/layout/super_bar.xml b/client/Android/res/layout/super_bar.xml
new file mode 100644
index 000000000..ceaf21b16
--- /dev/null
+++ b/client/Android/res/layout/super_bar.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
diff --git a/client/Android/res/menu/bookmark_context_menu.xml b/client/Android/res/menu/bookmark_context_menu.xml
new file mode 100644
index 000000000..6ebfb3470
--- /dev/null
+++ b/client/Android/res/menu/bookmark_context_menu.xml
@@ -0,0 +1,17 @@
+
+
diff --git a/client/Android/res/menu/home_menu.xml b/client/Android/res/menu/home_menu.xml
new file mode 100644
index 000000000..6611b04d8
--- /dev/null
+++ b/client/Android/res/menu/home_menu.xml
@@ -0,0 +1,24 @@
+
+
+
diff --git a/client/Android/res/menu/session_menu.xml b/client/Android/res/menu/session_menu.xml
new file mode 100644
index 000000000..63ff36cf7
--- /dev/null
+++ b/client/Android/res/menu/session_menu.xml
@@ -0,0 +1,26 @@
+
+
+
diff --git a/client/Android/res/values-land/dimens.xml b/client/Android/res/values-land/dimens.xml
new file mode 100644
index 000000000..9b8ae0bb4
--- /dev/null
+++ b/client/Android/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+
+
+ 46dip
+
diff --git a/client/Android/res/values/attrs.xml b/client/Android/res/values/attrs.xml
new file mode 100644
index 000000000..40092abcd
--- /dev/null
+++ b/client/Android/res/values/attrs.xml
@@ -0,0 +1,14 @@
+
+
+ #9AB6CD
+ #C2D6E6
+ #164E76
+ @android:color/black
+
+
+
+
+
diff --git a/client/Android/res/values/dimens.xml b/client/Android/res/values/dimens.xml
new file mode 100644
index 000000000..dc7f5bb72
--- /dev/null
+++ b/client/Android/res/values/dimens.xml
@@ -0,0 +1,4 @@
+
+
+ 50dip
+
\ No newline at end of file
diff --git a/client/Android/res/values/integers.xml b/client/Android/res/values/integers.xml
new file mode 100644
index 000000000..f6a53db51
--- /dev/null
+++ b/client/Android/res/values/integers.xml
@@ -0,0 +1,72 @@
+
+
+
+ 0xF1
+ 0xF2
+ 0xF3
+
+
+ 0x01
+ 0x02
+
+
+ 0x03
+ 0x04
+ 0x05
+
+ 0x06
+ 0x07
+ 0x08
+ 0x09
+
+
+ 0x0A
+ 0x0B
+ 0x0C
+ 0x0D
+ 0x0E
+ 0x0F
+ 0x10
+ 0x11
+ 0x12
+ 0x13
+ 0x14
+ 0x15
+ 0x16
+ 0x17
+ 0x18
+ 0x19
+ 0x1A
+ 0x1B
+ 0x1C
+ 0x1D
+
+
+ 0x1E
+ 0x1F
+ 0x20
+ 0x21
+ 0x22
+ 0x23
+ 0x24
+ 0x25
+ 0x26
+ 0x27
+ 0x28
+ 0x29
+ 0x2A
+ 0x2B
+ 0x2C
+ 0x2D
+ 0x2E
+ 0x2F
+ 0x30
+ 0x31
+
+
+ 0x32
+ 0x33
+ 0x34
+ 0x45
+
+
diff --git a/client/Android/res/values/strings.xml b/client/Android/res/values/strings.xml
new file mode 100644
index 000000000..780a7aa3e
--- /dev/null
+++ b/client/Android/res/values/strings.xml
@@ -0,0 +1,179 @@
+
+
+ aFreeRDP
+ Yes
+ No
+ Cancel
+ Continue
+ Login
+ Logout
+
+ Exit
+ About
+ Help
+ New Connection
+ Settings
+
+ Connection
+ Connect
+ Edit
+ Delete
+
+ Keyboard
+ Function Keys
+ Touch Pointer
+ home
+ disconnect
+
+ Manual Connections
+ Active Sessions
+
+ Login
+ No Servers
+ Connecting ...
+ Disconnecting ...
+ Connection Lost
+ Wrong Password
+ Invalid Username
+ Add Connection
+
+ aFreeRDP
+ Connect to Computer
+ Remote Computers
+
+ Host
+ Label
+ Host
+ Port
+ Credentials
+ Credentials
+ Username
+ Password
+ Domain
+ Settings
+ Screen
+ Screen Settings
+ Colors
+
+ - High Color (16 Bit)
+ - True Color (24 Bit)
+ - Highest Quality (32 Bit)
+
+
+ - 16
+ - 24
+ - 32
+
+ Resolution
+ Automatic
+ Custom
+
+ - Automatic
+ - Custom
+ - 640x480
+ - 720x480
+ - 800x600
+ - 1024x768
+ - 1280x1024
+ - 1440x900
+ - 1920x1080
+ - 1920x1200
+
+
+ - automatic
+ - custom
+ - 640x480
+ - 720x480
+ - 800x600
+ - 1024x768
+ - 1280x1024
+ - 1440x900
+ - 1920x1080
+ - 1920x1200
+
+ Width
+ Height
+ Performance
+ Performance Settings
+ RemoteFX
+ Desktop Background
+ Font Smoothing
+ Desktop Composition
+ Window contents while dragging
+ Menu Animation
+ Visual Styles
+ Advanced
+ Advanced Settings
+ 3G Settings
+ 3G Screen
+ 3G Performance
+ Security
+
+ - Automatic
+ - RDP
+ - TLS
+ - NLA
+
+
+ - 0
+ - 1
+ - 2
+ - 3
+
+ Remote Program
+ Working Directory
+ Console Mode
+
+ *******
+ not set
+ User Interface
+ Hide Status Bar
+ Hide Zoom Controls
+ Swap Mouse Buttons
+ Invert Scrolling
+ Touch Pointer Auto Scroll
+ Show Dialog on Exit
+ Power Saving
+ Close idle Connections
+ Security
+ Accept all Certificates
+ Clear Certificate Cache
+ After %1$d Minutes
+ Disabled
+
+ Connection Settings
+ Settings
+ aFreeRDP - FreeRDP for Android
+ RDP Connections
+ Help
+ About
+
+ Cancel without saving?
+ Press "Cancel" to abort!\nPress "Continue" to specify the required fields!
+ Failed to establish a connection to the server!
+
+ The screen settings have changed because the server does not support the settings you specified!
+ Deleted the certificate cache!
+ Failed to delete certificate cache!
+
+ Verify Certificate
+ The identity of the remote computer cannot be verified. Do you want to connect anyway?
+ Please enter your credentials
+ Create Shortcut
+ Shortcut name:
+ Connecting ...
+ Logging in ...
+ About aFreeRDP
+ Version: %1$s\n\u00A9 2012 Thinstuff Technologies GmbH
+ Save Connection Settings?
+ Your connection settings have not been saved! Do you want to save them?
+ Save Connection?
+ Do you want to save any changes you made to the connection settings?
+ Do not ask again
+ Exit Application?
+ Are you sure you want to exit the application?
+ Delete Certificates?
+ Are you sure you want to delete all your cached Certificates?
+
diff --git a/client/Android/res/values/theme.xml b/client/Android/res/values/theme.xml
new file mode 100644
index 000000000..ef321c4c0
--- /dev/null
+++ b/client/Android/res/values/theme.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/xml/advanced_settings.xml b/client/Android/res/xml/advanced_settings.xml
new file mode 100644
index 000000000..657a0dd7c
--- /dev/null
+++ b/client/Android/res/xml/advanced_settings.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/xml/application_settings.xml b/client/Android/res/xml/application_settings.xml
new file mode 100644
index 000000000..314b2acb9
--- /dev/null
+++ b/client/Android/res/xml/application_settings.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/xml/bookmark_settings.xml b/client/Android/res/xml/bookmark_settings.xml
new file mode 100644
index 000000000..86df480ad
--- /dev/null
+++ b/client/Android/res/xml/bookmark_settings.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/xml/credentials_settings.xml b/client/Android/res/xml/credentials_settings.xml
new file mode 100644
index 000000000..0247b66cd
--- /dev/null
+++ b/client/Android/res/xml/credentials_settings.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/client/Android/res/xml/cursor_keyboard.xml b/client/Android/res/xml/cursor_keyboard.xml
new file mode 100644
index 000000000..59c1bdd2e
--- /dev/null
+++ b/client/Android/res/xml/cursor_keyboard.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/xml/modifiers_keyboard.xml b/client/Android/res/xml/modifiers_keyboard.xml
new file mode 100644
index 000000000..1b2f8ad61
--- /dev/null
+++ b/client/Android/res/xml/modifiers_keyboard.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/xml/numpad_keyboard.xml b/client/Android/res/xml/numpad_keyboard.xml
new file mode 100644
index 000000000..5d9e3cbf6
--- /dev/null
+++ b/client/Android/res/xml/numpad_keyboard.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/res/xml/performance_flags.xml b/client/Android/res/xml/performance_flags.xml
new file mode 100644
index 000000000..1f6d22afd
--- /dev/null
+++ b/client/Android/res/xml/performance_flags.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/client/Android/res/xml/performance_flags_3g.xml b/client/Android/res/xml/performance_flags_3g.xml
new file mode 100644
index 000000000..c0f639743
--- /dev/null
+++ b/client/Android/res/xml/performance_flags_3g.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/client/Android/res/xml/screen_settings.xml b/client/Android/res/xml/screen_settings.xml
new file mode 100644
index 000000000..589a35a8d
--- /dev/null
+++ b/client/Android/res/xml/screen_settings.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/client/Android/res/xml/screen_settings_3g.xml b/client/Android/res/xml/screen_settings_3g.xml
new file mode 100644
index 000000000..de750855c
--- /dev/null
+++ b/client/Android/res/xml/screen_settings_3g.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/client/Android/res/xml/searchable.xml b/client/Android/res/xml/searchable.xml
new file mode 100644
index 000000000..4d0d7ed79
--- /dev/null
+++ b/client/Android/res/xml/searchable.xml
@@ -0,0 +1,26 @@
+
+
+
+
diff --git a/client/Android/res/xml/specialkeys_keyboard.xml b/client/Android/res/xml/specialkeys_keyboard.xml
new file mode 100644
index 000000000..8f84e1ed1
--- /dev/null
+++ b/client/Android/res/xml/specialkeys_keyboard.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/src/com/freerdp/afreerdp/application/GlobalApp.java b/client/Android/src/com/freerdp/afreerdp/application/GlobalApp.java
new file mode 100644
index 000000000..4fd849c21
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/application/GlobalApp.java
@@ -0,0 +1,217 @@
+/*
+ Android Main Application
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.application;
+
+import android.app.Application;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.util.Log;
+
+import java.util.*;
+
+import com.freerdp.afreerdp.application.SessionState;
+import com.freerdp.afreerdp.domain.BookmarkBase;
+import com.freerdp.afreerdp.services.BookmarkDB;
+import com.freerdp.afreerdp.services.HistoryDB;
+import com.freerdp.afreerdp.services.LibFreeRDP;
+import com.freerdp.afreerdp.services.ManualBookmarkGateway;
+import com.freerdp.afreerdp.services.QuickConnectHistoryGateway;
+
+public class GlobalApp extends Application implements LibFreeRDP.EventListener
+{
+ private static Map sessionMap;
+
+ public static boolean ConnectedTo3G = false;
+
+ // event notification defines
+ public static final String EVENT_TYPE = "EVENT_TYPE";
+ public static final String EVENT_PARAM = "EVENT_PARAM";
+ public static final String EVENT_STATUS = "EVENT_STATUS";
+ public static final String EVENT_ERROR = "EVENT_ERROR";
+
+ public static final String ACTION_EVENT_FREERDP = "com.freerdp.freerdp.event.freerdp";
+
+ public static final int FREERDP_EVENT_CONNECTION_SUCCESS = 1;
+ public static final int FREERDP_EVENT_CONNECTION_FAILURE = 2;
+ public static final int FREERDP_EVENT_DISCONNECTED = 3;
+
+ private static BookmarkDB bookmarkDB;
+ private static ManualBookmarkGateway manualBookmarkGateway;
+
+ private static HistoryDB historyDB;
+ private static QuickConnectHistoryGateway quickConnectHistoryGateway;
+
+ // timer for disconnecting sessions after the screen was turned off
+ private static Timer disconnectTimer = null;
+
+ // TimerTask for disconnecting sessions after screen was turned off
+ private static class DisconnectTask extends TimerTask
+ {
+ @Override
+ public void run() {
+ Log.v("DisconnectTask", "Doing action");
+
+ // disconnect any running rdp session
+ Collection sessions = GlobalApp.getSessions();
+ for (SessionState session : sessions)
+ {
+ LibFreeRDP.disconnect(session.getInstance());
+ }
+ }
+ }
+
+
+ public GlobalApp()
+ {
+ sessionMap = Collections.synchronizedMap(new HashMap());
+
+ GlobalApp.load();
+ LibFreeRDP.setEventListener(this);
+ }
+
+ @Override
+ public void onCreate()
+ {
+ super.onCreate();
+
+ bookmarkDB = new BookmarkDB(this);
+ manualBookmarkGateway = new ManualBookmarkGateway(bookmarkDB);
+
+ historyDB = new HistoryDB(this);
+ quickConnectHistoryGateway = new QuickConnectHistoryGateway(historyDB);
+
+ GlobalSettings.init(this);
+ ConnectedTo3G = NetworkStateReceiver.isConnectedTo3G(this);
+
+ // init screen receiver here (this can't be declared in AndroidManifest - refer to:
+ // http://thinkandroid.wordpress.com/2010/01/24/handling-screen-off-and-screen-on-intents/
+ IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);
+ filter.addAction(Intent.ACTION_SCREEN_OFF);
+ registerReceiver(new ScreenReceiver(), filter);
+ }
+
+ public static ManualBookmarkGateway getManualBookmarkGateway()
+ {
+ return manualBookmarkGateway;
+ }
+
+ public static QuickConnectHistoryGateway getQuickConnectHistoryGateway()
+ {
+ return quickConnectHistoryGateway;
+ }
+
+ static private void load()
+ {
+ final String libname = "freerdp-android";
+ final String LD_PATH = System.getProperty("java.library.path");
+
+ Log.v("LibFreeRDP", "Trying to load library " + libname + " from LD_PATH: " + LD_PATH);
+
+ try {
+ System.loadLibrary(libname);
+ } catch (UnsatisfiedLinkError e) {
+ Log.e("LibFreeRDP", e.toString());
+ }
+ }
+
+ // Disconnect handling for Screen on/off events
+ static public void startDisconnectTimer()
+ {
+ int timeoutMinutes = GlobalSettings.getDisconnectTimeout();
+ if (timeoutMinutes > 0)
+ {
+ // start disconnect timeout...
+ disconnectTimer = new Timer();
+ disconnectTimer.schedule(new DisconnectTask(), timeoutMinutes * 60 * 1000);
+ }
+ }
+
+ static public void cancelDisconnectTimer()
+ {
+ // cancel any pending timer events
+ if (disconnectTimer != null)
+ {
+ disconnectTimer.cancel();
+ disconnectTimer.purge();
+ disconnectTimer = null;
+ }
+ }
+
+ // RDP session handling
+ static public SessionState createSession(BookmarkBase bookmark)
+ {
+ SessionState session = new SessionState(LibFreeRDP.newInstance(), bookmark);
+ sessionMap.put(Integer.valueOf(session.getInstance()), session);
+ return session;
+ }
+
+ static public SessionState getSession(int instance)
+ {
+ return sessionMap.get(instance);
+ }
+
+ static public Collection getSessions()
+ {
+ // return a copy of the session items
+ return new ArrayList(sessionMap.values());
+ }
+
+ static public void freeSession(int instance)
+ {
+ if (GlobalApp.sessionMap.containsKey(instance))
+ {
+ GlobalApp.sessionMap.remove(instance);
+ LibFreeRDP.freeInstance(instance);
+ }
+ }
+
+ // helper to send FreeRDP notifications
+ private void sendRDPNotification(int type, int param)
+ {
+ // send broadcast
+ Intent intent = new Intent(ACTION_EVENT_FREERDP);
+ intent.putExtra(EVENT_TYPE, type);
+ intent.putExtra(EVENT_PARAM, param);
+ sendBroadcast(intent);
+ }
+
+ // //////////////////////////////////////////////////////////////////////
+ // Implementation of LibFreeRDP.EventListener
+ public void OnConnectionSuccess(int instance)
+ {
+ Log.v("LibFreeRDP", "OnConnectionSuccess");
+ sendRDPNotification(FREERDP_EVENT_CONNECTION_SUCCESS, instance);
+ }
+
+ public void OnConnectionFailure(int instance)
+ {
+ Log.v("LibFreeRDP", "OnConnectionFailure");
+
+ // free session
+ GlobalApp.freeSession(instance);
+ sendRDPNotification(FREERDP_EVENT_CONNECTION_FAILURE, instance);
+ }
+
+ public void OnDisconnecting(int instance)
+ {
+ Log.v("LibFreeRDP", "OnDisconnecting");
+
+ // send disconnect notification
+ sendRDPNotification(FREERDP_EVENT_DISCONNECTED, instance);
+ }
+
+ public void OnDisconnected(int instance)
+ {
+ Log.v("LibFreeRDP", "OnDisconnected");
+
+ // free session
+ GlobalApp.freeSession(instance);
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/application/GlobalSettings.java b/client/Android/src/com/freerdp/afreerdp/application/GlobalSettings.java
new file mode 100644
index 000000000..48ef10fbb
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/application/GlobalSettings.java
@@ -0,0 +1,141 @@
+/*
+ Global Settings helper class
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.application;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class GlobalSettings {
+
+ private static final String PREF_UI_ASKONEXIT = "ui.ask_on_exit";
+ private static final String PREF_UI_HIDESTATUSBAR = "ui.hide_status_bar";
+ private static final String PREF_UI_INVERTSCROLLING = "ui.invert_scrolling";
+ private static final String PREF_UI_SWAPMOUSEBUTTONS = "ui.swap_mouse_buttons";
+ private static final String PREF_UI_HIDEZOOMCONTROLS = "ui.hide_zoom_controls";
+ private static final String PREF_UI_AUTOSCROLLTOUCHPOINTER = "ui.auto_scroll_touchpointer";
+
+ private static final String PREF_POWER_DISCONNECTTIMEOUT = "power.disconnect_timeout";
+
+ private static final String PREF_SECURITY_ACCEPTALLCERTIFICATES = "security.accept_certificates";
+
+ private static SharedPreferences settings;
+
+ public static void init(Context context)
+ {
+ settings = PreferenceManager.getDefaultSharedPreferences(context);
+ initValues();
+ }
+
+ private static void initValues()
+ {
+ SharedPreferences.Editor editor = settings.edit();
+
+ if (!settings.contains(PREF_UI_HIDESTATUSBAR))
+ editor.putBoolean(PREF_UI_HIDESTATUSBAR, false);
+ if (!settings.contains(PREF_UI_HIDEZOOMCONTROLS))
+ editor.putBoolean(PREF_UI_HIDEZOOMCONTROLS, true);
+ if (!settings.contains(PREF_UI_SWAPMOUSEBUTTONS))
+ editor.putBoolean(PREF_UI_SWAPMOUSEBUTTONS, false);
+ if (!settings.contains(PREF_UI_INVERTSCROLLING))
+ editor.putBoolean(PREF_UI_INVERTSCROLLING, false);
+ if (!settings.contains(PREF_UI_ASKONEXIT))
+ editor.putBoolean(PREF_UI_ASKONEXIT, true);
+ if (!settings.contains(PREF_UI_AUTOSCROLLTOUCHPOINTER))
+ editor.putBoolean(PREF_UI_AUTOSCROLLTOUCHPOINTER, true);
+ if (!settings.contains(PREF_POWER_DISCONNECTTIMEOUT))
+ editor.putInt(PREF_POWER_DISCONNECTTIMEOUT, 5);
+ if (!settings.contains(PREF_SECURITY_ACCEPTALLCERTIFICATES))
+ editor.putBoolean(PREF_SECURITY_ACCEPTALLCERTIFICATES, false);
+
+ editor.commit();
+ }
+
+ public static void setHideStatusBar(boolean hide)
+ {
+ settings.edit().putBoolean(PREF_UI_HIDESTATUSBAR, hide).commit();
+ }
+
+ public static boolean getHideStatusBar()
+ {
+ return settings.getBoolean(PREF_UI_HIDESTATUSBAR, false);
+ }
+
+ public static void setHideZoomControls(boolean hide)
+ {
+ settings.edit().putBoolean(PREF_UI_HIDEZOOMCONTROLS, hide).commit();
+ }
+
+ public static boolean getHideZoomControls()
+ {
+ return settings.getBoolean(PREF_UI_HIDEZOOMCONTROLS, true);
+ }
+
+ public static void setSwapMouseButtons(boolean swap)
+ {
+ settings.edit().putBoolean(PREF_UI_SWAPMOUSEBUTTONS, swap).commit();
+ }
+
+ public static boolean getSwapMouseButtons()
+ {
+ return settings.getBoolean(PREF_UI_SWAPMOUSEBUTTONS, false);
+ }
+
+ public static void setInvertScrolling(boolean invert)
+ {
+ settings.edit().putBoolean(PREF_UI_INVERTSCROLLING, invert).commit();
+ }
+
+ public static boolean getInvertScrolling()
+ {
+ return settings.getBoolean(PREF_UI_INVERTSCROLLING, false);
+ }
+
+ public static void setAskOnExit(boolean ask)
+ {
+ settings.edit().putBoolean(PREF_UI_ASKONEXIT, ask).commit();
+ }
+
+ public static boolean getAskOnExit()
+ {
+ return settings.getBoolean(PREF_UI_ASKONEXIT, true);
+ }
+
+ public static void setAutoScrollTouchPointer(boolean scroll)
+ {
+ settings.edit().putBoolean(PREF_UI_AUTOSCROLLTOUCHPOINTER, scroll).commit();
+ }
+
+ public static boolean getAutoScrollTouchPointer()
+ {
+ return settings.getBoolean(PREF_UI_AUTOSCROLLTOUCHPOINTER, true);
+ }
+
+ public static void setAcceptAllCertificates(boolean accept)
+ {
+ settings.edit().putBoolean(PREF_SECURITY_ACCEPTALLCERTIFICATES, accept).commit();
+ }
+
+ public static boolean getAcceptAllCertificates()
+ {
+ return settings.getBoolean(PREF_SECURITY_ACCEPTALLCERTIFICATES, false);
+ }
+
+ public static void setDisconnectTimeout(int timeoutMinutes)
+ {
+ settings.edit().putInt(PREF_POWER_DISCONNECTTIMEOUT, timeoutMinutes).commit();
+ }
+
+ public static int getDisconnectTimeout()
+ {
+ return settings.getInt(PREF_POWER_DISCONNECTTIMEOUT, 5);
+ }
+
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/application/NetworkStateReceiver.java b/client/Android/src/com/freerdp/afreerdp/application/NetworkStateReceiver.java
new file mode 100644
index 000000000..24a7ff990
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/application/NetworkStateReceiver.java
@@ -0,0 +1,52 @@
+/*
+ Network State Receiver
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.application;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.util.Log;
+
+public class NetworkStateReceiver extends BroadcastReceiver {
+
+ public static boolean isConnectedTo3G(Context context)
+ {
+ ConnectivityManager connectivity = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+ NetworkInfo info = connectivity.getActiveNetworkInfo();
+
+ // no connection or background data disabled
+ if(info == null || !info.isConnected())
+ return false;
+
+ return (info.getType() != ConnectivityManager.TYPE_WIFI && info.getType() != ConnectivityManager.TYPE_WIMAX);
+ }
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+
+ // check if we are connected via 3g or wlan
+ if(intent.getExtras() != null)
+ {
+ NetworkInfo info = (NetworkInfo)intent.getExtras().get(ConnectivityManager.EXTRA_NETWORK_INFO);
+
+ // are we connected at all?
+ if(info != null && info.isConnected())
+ {
+ // see if we are connected through 3G or WiFi
+ Log.d("app", "Connected via type " + info.getTypeName());
+ GlobalApp.ConnectedTo3G = (info.getType() != ConnectivityManager.TYPE_WIFI && info.getType() != ConnectivityManager.TYPE_WIMAX);
+ }
+
+ Log.v("NetworkState", info.toString());
+ }
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/application/ScreenReceiver.java b/client/Android/src/com/freerdp/afreerdp/application/ScreenReceiver.java
new file mode 100644
index 000000000..d2d74286e
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/application/ScreenReceiver.java
@@ -0,0 +1,29 @@
+/*
+ Helper class to receive notifications when the screen is turned on/off
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.application;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class ScreenReceiver extends BroadcastReceiver {
+
+ @Override
+ public void onReceive(Context context, Intent intent)
+ {
+ Log.v("ScreenReceiver", "Received action: " + intent.getAction());
+ if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF))
+ GlobalApp.startDisconnectTimer();
+ else if (intent.getAction().equals(Intent.ACTION_SCREEN_ON))
+ GlobalApp.cancelDisconnectTimer();
+ }
+
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/application/SessionState.java b/client/Android/src/com/freerdp/afreerdp/application/SessionState.java
new file mode 100644
index 000000000..18d19f232
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/application/SessionState.java
@@ -0,0 +1,95 @@
+/*
+ Session State class
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.application;
+
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.freerdp.afreerdp.domain.BookmarkBase;
+import com.freerdp.afreerdp.services.LibFreeRDP;
+
+public class SessionState implements Parcelable
+{
+ private int instance;
+ private BookmarkBase bookmark;
+ private BitmapDrawable surface;
+ private LibFreeRDP.UIEventListener uiEventListener;
+
+ public SessionState(Parcel parcel)
+ {
+ instance = parcel.readInt();
+ bookmark = parcel.readParcelable(null);
+
+ Bitmap bitmap = parcel.readParcelable(null);
+ surface = new BitmapDrawable(bitmap);
+ }
+
+ public SessionState(int instance, BookmarkBase bookmark)
+ {
+ this.instance = instance;
+ this.bookmark = bookmark;
+ this.uiEventListener = null;
+ }
+
+ public void connect() {
+ LibFreeRDP.setConnectionInfo(instance, bookmark);
+ LibFreeRDP.connect(instance);
+ }
+
+ public int getInstance() {
+ return instance;
+ }
+
+ public BookmarkBase getBookmark() {
+ return bookmark;
+ }
+
+ public LibFreeRDP.UIEventListener getUIEventListener() {
+ return uiEventListener;
+ }
+
+ public void setUIEventListener(LibFreeRDP.UIEventListener uiEventListener) {
+ this.uiEventListener = uiEventListener;
+ }
+
+ public void setSurface(BitmapDrawable surface) {
+ this.surface = surface;
+ }
+
+ public BitmapDrawable getSurface() {
+ return surface;
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator()
+ {
+ public SessionState createFromParcel(Parcel in) {
+ return new SessionState(in);
+ }
+
+ @Override
+ public SessionState[] newArray(int size) {
+ return new SessionState[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeInt(instance);
+ out.writeParcelable(bookmark, flags);
+ out.writeParcelable(surface.getBitmap(), flags);
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/domain/BookmarkBase.java b/client/Android/src/com/freerdp/afreerdp/domain/BookmarkBase.java
new file mode 100644
index 000000000..b7d5d43e2
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/domain/BookmarkBase.java
@@ -0,0 +1,658 @@
+/*
+ Defines base attributes of a bookmark object
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.domain;
+
+import com.freerdp.afreerdp.application.GlobalApp;
+
+import android.content.SharedPreferences;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class BookmarkBase implements Parcelable, Cloneable
+{
+ public static final int TYPE_INVALID = -1;
+ public static final int TYPE_MANUAL = 1;
+ public static final int TYPE_QUICKCONNECT = 2;
+ public static final int TYPE_PLACEHOLDER = 3;
+
+ // performance flags
+ public static class PerformanceFlags implements Parcelable
+ {
+ private boolean remotefx;
+ private boolean wallpaper;
+ private boolean theming;
+ private boolean fullWindowDrag;
+ private boolean menuAnimations;
+ private boolean fontSmoothing;
+ private boolean desktopComposition;
+
+ public PerformanceFlags() {
+ remotefx = false;
+ wallpaper = false;
+ theming = false;
+ fullWindowDrag = false;
+ menuAnimations = false;
+ fontSmoothing = false;
+ desktopComposition = false;
+ }
+
+ public PerformanceFlags(Parcel parcel) {
+ remotefx = (parcel.readInt() == 1) ? true : false;
+ wallpaper = (parcel.readInt() == 1) ? true : false;
+ theming = (parcel.readInt() == 1) ? true : false;
+ fullWindowDrag = (parcel.readInt() == 1) ? true : false;
+ menuAnimations = (parcel.readInt() == 1) ? true : false;
+ fontSmoothing = (parcel.readInt() == 1) ? true : false;
+ desktopComposition = (parcel.readInt() == 1) ? true : false;
+ }
+
+ public boolean getRemoteFX() {
+ return remotefx;
+ }
+
+ public void setRemoteFX(boolean remotefx) {
+ this.remotefx = remotefx;
+ }
+
+ public boolean getWallpaper() {
+ return wallpaper;
+ }
+
+ public void setWallpaper(boolean wallpaper) {
+ this.wallpaper = wallpaper;
+ }
+
+ public boolean getTheming() {
+ return theming;
+ }
+
+ public void setTheming(boolean theming) {
+ this.theming = theming;
+ }
+
+ public boolean getFullWindowDrag() {
+ return fullWindowDrag;
+ }
+
+ public void setFullWindowDrag(boolean fullWindowDrag) {
+ this.fullWindowDrag = fullWindowDrag;
+ }
+
+ public boolean getMenuAnimations() {
+ return menuAnimations;
+ }
+
+ public void setMenuAnimations(boolean menuAnimations) {
+ this.menuAnimations = menuAnimations;
+ }
+
+ public boolean getFontSmoothing() {
+ return fontSmoothing;
+ }
+
+ public void setFontSmoothing(boolean fontSmoothing) {
+ this.fontSmoothing = fontSmoothing;
+ }
+
+ public boolean getDesktopComposition() {
+ return desktopComposition;
+ }
+
+ public void setDesktopComposition(boolean desktopComposition) {
+ this.desktopComposition = desktopComposition;
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator()
+ {
+ public PerformanceFlags createFromParcel(Parcel in) {
+ return new PerformanceFlags(in);
+ }
+
+ @Override
+ public PerformanceFlags[] newArray(int size) {
+ return new PerformanceFlags[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags)
+ {
+ out.writeInt(remotefx ? 1 : 0);
+ out.writeInt(wallpaper ? 1 : 0);
+ out.writeInt(theming ? 1 : 0);
+ out.writeInt(fullWindowDrag ? 1 : 0);
+ out.writeInt(menuAnimations ? 1 : 0);
+ out.writeInt(fontSmoothing ? 1 : 0);
+ out.writeInt(desktopComposition ? 1 : 0);
+ }
+ }
+
+ // Screen Settings class
+ public static class ScreenSettings implements Parcelable
+ {
+ public static final int AUTOMATIC = -1;
+ public static final int CUSTOM = 0;
+ public static final int PREDEFINED = 1;
+
+ private int resolution;
+ private int colors;
+ private int width;
+ private int height;
+
+ public ScreenSettings() {
+ init();
+ }
+
+ public ScreenSettings(Parcel parcel) {
+ resolution = parcel.readInt();
+ colors = parcel.readInt();
+ width = parcel.readInt();
+ height = parcel.readInt();
+ }
+
+ private void init() {
+ resolution = AUTOMATIC;
+ colors = 16;
+ width = 0;
+ height = 0;
+ }
+
+ public void setResolution(int resolution)
+ {
+ this.resolution = resolution;
+
+ if (resolution == AUTOMATIC) {
+ width = 0;
+ height = 0;
+ }
+ }
+
+ public void setResolution(String resolution, int width, int height)
+ {
+ if (resolution.contains("x")) {
+ String[] dimensions = resolution.split("x");
+ this.width = Integer.valueOf(dimensions[0]);
+ this.height = Integer.valueOf(dimensions[1]);
+ this.resolution = PREDEFINED;
+ }
+ else if (resolution.equalsIgnoreCase("custom"))
+ {
+ this.width = width;
+ this.height = height;
+ this.resolution = CUSTOM;
+ }
+ else
+ {
+ this.width = this.height = 0;
+ this.resolution = AUTOMATIC;
+ }
+ }
+
+ public int getResolution()
+ {
+ return resolution;
+ }
+
+ public String getResolutionString()
+ {
+ if (isPredefined())
+ return (width + "x" + height);
+
+ return (isAutomatic() ? "automatic" : "custom");
+ }
+
+ public boolean isPredefined() {
+ return (resolution == PREDEFINED);
+ }
+
+ public boolean isAutomatic() {
+ return (resolution == AUTOMATIC);
+ }
+
+ public boolean isCustom() {
+ return (resolution == CUSTOM);
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ public void setColors(int colors) {
+ this.colors = colors;
+ }
+
+ public int getColors() {
+ return colors;
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator()
+ {
+ public ScreenSettings createFromParcel(Parcel in) {
+ return new ScreenSettings(in);
+ }
+
+ @Override
+ public ScreenSettings[] newArray(int size) {
+ return new ScreenSettings[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags)
+ {
+ out.writeInt(resolution);
+ out.writeInt(colors);
+ out.writeInt(width);
+ out.writeInt(height);
+ }
+ }
+
+
+ // Session Settings
+ public static class AdvancedSettings implements Parcelable
+ {
+ private boolean enable3GSettings;
+ private ScreenSettings screen3G;
+ private PerformanceFlags performance3G;
+ private int security;
+ private boolean consoleMode;
+ private String remoteProgram;
+ private String workDir;
+
+ public AdvancedSettings() {
+ init();
+ }
+
+ public AdvancedSettings(Parcel parcel) {
+ enable3GSettings = (parcel.readInt() == 1) ? true : false;
+ screen3G = parcel.readParcelable(ScreenSettings.class.getClassLoader());
+ performance3G = parcel.readParcelable(PerformanceFlags.class.getClassLoader());
+ security = parcel.readInt();
+ consoleMode = (parcel.readInt() == 1) ? true : false;
+ remoteProgram = parcel.readString();
+ workDir = parcel.readString();
+ }
+
+ private void init() {
+ enable3GSettings = false;
+ screen3G = new ScreenSettings();
+ performance3G = new PerformanceFlags();
+ security = 0;
+ consoleMode = false;
+ remoteProgram = "";
+ workDir = "";
+ }
+
+ public void setEnable3GSettings(boolean enable3GSettings) {
+ this.enable3GSettings = enable3GSettings;
+ }
+
+ public boolean getEnable3GSettings() {
+ return enable3GSettings;
+ }
+
+ public ScreenSettings getScreen3G() {
+ return screen3G;
+ }
+
+ public void setScreen3G(ScreenSettings screen3G) {
+ this.screen3G = screen3G;
+ }
+
+ public PerformanceFlags getPerformance3G() {
+ return performance3G;
+ }
+
+ public void setPerformance3G(PerformanceFlags performance3G) {
+ this.performance3G = performance3G;
+ }
+
+ public void setSecurity(int security) {
+ this.security = security;
+ }
+
+ public int getSecurity() {
+ return security;
+ }
+
+ public void setConsoleMode(boolean consoleMode) {
+ this.consoleMode = consoleMode;
+ }
+
+ public boolean getConsoleMode() {
+ return consoleMode;
+ }
+
+ public void setRemoteProgram(String remoteProgram)
+ {
+ this.remoteProgram = remoteProgram;
+ }
+
+ public String getRemoteProgram()
+ {
+ return remoteProgram;
+ }
+
+ public void setWorkDir(String workDir)
+ {
+ this.workDir = workDir;
+ }
+
+ public String getWorkDir()
+ {
+ return workDir;
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator()
+ {
+ public AdvancedSettings createFromParcel(Parcel in) {
+ return new AdvancedSettings(in);
+ }
+
+ @Override
+ public AdvancedSettings[] newArray(int size) {
+ return new AdvancedSettings[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags)
+ {
+ out.writeInt(enable3GSettings ? 1 : 0);
+ out.writeParcelable(screen3G, flags);
+ out.writeParcelable(performance3G, flags);
+ out.writeInt(security);
+ out.writeInt(consoleMode ? 1 : 0);
+ out.writeString(remoteProgram);
+ out.writeString(workDir);
+ }
+ }
+
+ protected int type;
+ private long id;
+ private String label;
+ private String username;
+ private String password;
+ private String domain;
+
+ private ScreenSettings screenSettings;
+ private PerformanceFlags performanceFlags;
+ private AdvancedSettings advancedSettings;
+
+ private void init()
+ {
+ type = TYPE_INVALID;
+ id = -1;
+ label = "";
+ username = "";
+ password = "";
+ domain = "";
+
+ screenSettings = new ScreenSettings();
+ performanceFlags = new PerformanceFlags();
+ advancedSettings = new AdvancedSettings();
+ }
+
+ public BookmarkBase(Parcel parcel)
+ {
+ type = parcel.readInt();
+ id = parcel.readLong();
+ label = parcel.readString();
+ username = parcel.readString();
+ password = parcel.readString();
+ domain = parcel.readString();
+
+ screenSettings = parcel.readParcelable(ScreenSettings.class.getClassLoader());
+ performanceFlags = parcel.readParcelable(PerformanceFlags.class.getClassLoader());
+ advancedSettings = parcel.readParcelable(AdvancedSettings.class.getClassLoader());
+ }
+
+ public BookmarkBase() {
+ init();
+ }
+
+ @SuppressWarnings("unchecked")
+ public T get() { return (T)this; }
+
+ public int getType() {
+ return type;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setDomain(String domain) {
+ this.domain = domain;
+ }
+
+ public String getDomain() {
+ return domain;
+ }
+
+ public void setScreenSettings(ScreenSettings screenSettings) {
+ this.screenSettings = screenSettings;
+ }
+
+ public ScreenSettings getScreenSettings() {
+ return screenSettings;
+ }
+
+ public void setPerformanceFlags(PerformanceFlags performanceFlags) {
+ this.performanceFlags = performanceFlags;
+ }
+
+ public PerformanceFlags getPerformanceFlags() {
+ return performanceFlags;
+ }
+
+ public void setAdvancedSettings(AdvancedSettings advancedSettings) {
+ this.advancedSettings = advancedSettings;
+ }
+
+ public AdvancedSettings getAdvancedSettings() {
+ return advancedSettings;
+ }
+
+ public ScreenSettings getActiveScreenSettings()
+ {
+ return (GlobalApp.ConnectedTo3G && advancedSettings.getEnable3GSettings()) ? advancedSettings.getScreen3G() : screenSettings;
+ }
+
+ public PerformanceFlags getActivePerformanceFlags()
+ {
+ return (GlobalApp.ConnectedTo3G && advancedSettings.getEnable3GSettings()) ? advancedSettings.getPerformance3G() : performanceFlags;
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator()
+ {
+ public BookmarkBase createFromParcel(Parcel in) {
+ return new BookmarkBase(in);
+ }
+
+ @Override
+ public BookmarkBase[] newArray(int size) {
+ return new BookmarkBase[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags)
+ {
+ out.writeInt(type);
+ out.writeLong(id);
+ out.writeString(label);
+ out.writeString(username);
+ out.writeString(password);
+ out.writeString(domain);
+
+ out.writeParcelable(screenSettings, flags);
+ out.writeParcelable(performanceFlags, flags);
+ out.writeParcelable(advancedSettings, flags);
+ }
+
+ // write to shared preferences
+ public void writeToSharedPreferences(SharedPreferences sharedPrefs)
+ {
+ SharedPreferences.Editor editor = sharedPrefs.edit();
+ editor.clear();
+ editor.putString("bookmark.label", label);
+ editor.putString("bookmark.username", username);
+ editor.putString("bookmark.password", password);
+ editor.putString("bookmark.domain", domain);
+
+ editor.putInt("bookmark.colors", screenSettings.getColors());
+ editor.putString("bookmark.resolution", screenSettings.getResolutionString().toLowerCase());
+ editor.putInt("bookmark.width", screenSettings.getWidth());
+ editor.putInt("bookmark.height", screenSettings.getHeight());
+
+ editor.putBoolean("bookmark.perf_remotefx", performanceFlags.getRemoteFX());
+ editor.putBoolean("bookmark.perf_wallpaper", performanceFlags.getWallpaper());
+ editor.putBoolean("bookmark.perf_font_smoothing", performanceFlags.getFontSmoothing());
+ editor.putBoolean("bookmark.perf_desktop_composition", performanceFlags.getDesktopComposition());
+ editor.putBoolean("bookmark.perf_window_dragging", performanceFlags.getFullWindowDrag());
+ editor.putBoolean("bookmark.perf_menu_animation", performanceFlags.getMenuAnimations());
+ editor.putBoolean("bookmark.perf_themes", performanceFlags.getTheming());
+
+ editor.putBoolean("bookmark.enable_3g_settings", advancedSettings.getEnable3GSettings());
+
+ editor.putInt("bookmark.colors_3g", advancedSettings.getScreen3G().getColors());
+ editor.putString("bookmark.resolution_3g", advancedSettings.getScreen3G().getResolutionString().toLowerCase());
+ editor.putInt("bookmark.width_3g", advancedSettings.getScreen3G().getWidth());
+ editor.putInt("bookmark.height_3g", advancedSettings.getScreen3G().getHeight());
+
+ editor.putBoolean("bookmark.perf_remotefx_3g", advancedSettings.getPerformance3G().getRemoteFX());
+ editor.putBoolean("bookmark.perf_wallpaper_3g", advancedSettings.getPerformance3G().getWallpaper());
+ editor.putBoolean("bookmark.perf_font_smoothing_3g", advancedSettings.getPerformance3G().getFontSmoothing());
+ editor.putBoolean("bookmark.perf_desktop_composition_3g", advancedSettings.getPerformance3G().getDesktopComposition());
+ editor.putBoolean("bookmark.perf_window_dragging_3g", advancedSettings.getPerformance3G().getFullWindowDrag());
+ editor.putBoolean("bookmark.perf_menu_animation_3g", advancedSettings.getPerformance3G().getMenuAnimations());
+ editor.putBoolean("bookmark.perf_themes_3g", advancedSettings.getPerformance3G().getTheming());
+
+ editor.putInt("bookmark.security", advancedSettings.getSecurity());
+ editor.putString("bookmark.remote_program", advancedSettings.getRemoteProgram());
+ editor.putString("bookmark.work_dir", advancedSettings.getWorkDir());
+ editor.putBoolean("bookmark.console_mode", advancedSettings.getConsoleMode());
+
+ editor.commit();
+ }
+
+ // read from shared preferences
+ public void readFromSharedPreferences(SharedPreferences sharedPrefs)
+ {
+ label = sharedPrefs.getString("bookmark.label", "");
+ username = sharedPrefs.getString("bookmark.username", "");
+ password = sharedPrefs.getString("bookmark.password", "");
+ domain = sharedPrefs.getString("bookmark.domain", "");
+
+ screenSettings.setColors(sharedPrefs.getInt("bookmark.colors", 16));
+ screenSettings.setResolution(sharedPrefs.getString("bookmark.resolution", "automatic"), sharedPrefs.getInt("bookmark.width", 800), sharedPrefs.getInt("bookmark.height", 600));
+
+ performanceFlags.setRemoteFX(sharedPrefs.getBoolean("bookmark.perf_remotefx", false));
+ performanceFlags.setWallpaper(sharedPrefs.getBoolean("bookmark.perf_wallpaper", false));
+ performanceFlags.setFontSmoothing(sharedPrefs.getBoolean("bookmark.perf_font_smoothing", false));
+ performanceFlags.setDesktopComposition(sharedPrefs.getBoolean("bookmark.perf_desktop_composition", false));
+ performanceFlags.setFullWindowDrag(sharedPrefs.getBoolean("bookmark.perf_window_dragging", false));
+ performanceFlags.setMenuAnimations(sharedPrefs.getBoolean("bookmark.perf_menu_animation", false));
+ performanceFlags.setTheming(sharedPrefs.getBoolean("bookmark.perf_themes", false));
+
+ advancedSettings.setEnable3GSettings(sharedPrefs.getBoolean("bookmark.enable_3g_settings", false));
+
+ advancedSettings.getScreen3G().setColors(sharedPrefs.getInt("bookmark.colors_3g", 16));
+ advancedSettings.getScreen3G().setResolution(sharedPrefs.getString("bookmark.resolution_3g", "automatic"),
+ sharedPrefs.getInt("bookmark.width_3g", 800), sharedPrefs.getInt("bookmark.height_3g", 600));
+
+ advancedSettings.getPerformance3G().setRemoteFX(sharedPrefs.getBoolean("bookmark.perf_remotefx_3g", false));
+ advancedSettings.getPerformance3G().setWallpaper(sharedPrefs.getBoolean("bookmark.perf_wallpaper_3g", false));
+ advancedSettings.getPerformance3G().setFontSmoothing(sharedPrefs.getBoolean("bookmark.perf_font_smoothing_3g", false));
+ advancedSettings.getPerformance3G().setDesktopComposition(sharedPrefs.getBoolean("bookmark.perf_desktop_composition_3g", false));
+ advancedSettings.getPerformance3G().setFullWindowDrag(sharedPrefs.getBoolean("bookmark.perf_window_dragging_3g", false));
+ advancedSettings.getPerformance3G().setMenuAnimations(sharedPrefs.getBoolean("bookmark.perf_menu_animation_3g", false));
+ advancedSettings.getPerformance3G().setTheming(sharedPrefs.getBoolean("bookmark.perf_themes_3g", false));
+
+ advancedSettings.setSecurity(sharedPrefs.getInt("bookmark.security", 0));
+ advancedSettings.setRemoteProgram(sharedPrefs.getString("bookmark.remote_program", ""));
+ advancedSettings.setWorkDir(sharedPrefs.getString("bookmark.work_dir", ""));
+ advancedSettings.setConsoleMode(sharedPrefs.getBoolean("bookmark.console_mode", false));
+ }
+
+ // Cloneable
+ public Object clone()
+ {
+ try
+ {
+ return super.clone();
+ }
+ catch(CloneNotSupportedException e)
+ {
+ return null;
+ }
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/domain/ConnectionReference.java b/client/Android/src/com/freerdp/afreerdp/domain/ConnectionReference.java
new file mode 100644
index 000000000..7975f795e
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/domain/ConnectionReference.java
@@ -0,0 +1,57 @@
+/*
+ A RDP connection reference. References can use bookmark ids or hostnames to connect to a RDP server.
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.domain;
+
+public class ConnectionReference
+{
+ public static final String PATH_MANUAL_BOOKMARK_ID = "MBMID/";
+ public static final String PATH_HOSTNAME = "HOST/";
+ public static final String PATH_PLACEHOLDER = "PLCHLD/";
+
+ public static String getManualBookmarkReference(long bookmarkId) {
+ return (PATH_MANUAL_BOOKMARK_ID + bookmarkId);
+ }
+
+ public static String getHostnameReference(String hostname) {
+ return (PATH_HOSTNAME + hostname);
+ }
+
+ public static String getPlaceholderReference(String name) {
+ return (PATH_PLACEHOLDER + name);
+ }
+
+ public static boolean isBookmarkReference(String refStr) {
+ return refStr.startsWith(PATH_MANUAL_BOOKMARK_ID);
+ }
+
+ public static boolean isManualBookmarkReference(String refStr) {
+ return refStr.startsWith(PATH_MANUAL_BOOKMARK_ID);
+ }
+
+ public static boolean isHostnameReference(String refStr) {
+ return refStr.startsWith(PATH_HOSTNAME);
+ }
+
+ public static boolean isPlaceholderReference(String refStr) {
+ return refStr.startsWith(PATH_PLACEHOLDER);
+ }
+
+ public static long getManualBookmarkId(String refStr) {
+ return Integer.parseInt(refStr.substring(PATH_MANUAL_BOOKMARK_ID.length()));
+ }
+
+ public static String getHostname(String refStr) {
+ return refStr.substring(PATH_HOSTNAME.length());
+ }
+
+ public static String getPlaceholder(String refStr) {
+ return refStr.substring(PATH_PLACEHOLDER.length());
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/domain/ManualBookmark.java b/client/Android/src/com/freerdp/afreerdp/domain/ManualBookmark.java
new file mode 100644
index 000000000..4d749c5a1
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/domain/ManualBookmark.java
@@ -0,0 +1,107 @@
+/*
+ Manual Bookmark implementation
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.domain;
+
+import android.content.SharedPreferences;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class ManualBookmark extends BookmarkBase
+{
+ private String hostname;
+ private int port;
+
+ private void init()
+ {
+ type = TYPE_MANUAL;
+ hostname = "";
+ port = 3389;
+ }
+
+ public ManualBookmark(Parcel parcel)
+ {
+ super(parcel);
+ type = TYPE_MANUAL;
+ hostname = parcel.readString();
+ port = parcel.readInt();
+ }
+
+ public ManualBookmark() {
+ super();
+ init();
+ }
+
+ public void setHostname(String hostname) {
+ this.hostname = hostname;
+ }
+
+ public String getHostname() {
+ return hostname;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator()
+ {
+ public ManualBookmark createFromParcel(Parcel in) {
+ return new ManualBookmark(in);
+ }
+
+ @Override
+ public ManualBookmark[] newArray(int size) {
+ return new ManualBookmark[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags)
+ {
+ super.writeToParcel(out, flags);
+ out.writeString(hostname);
+ out.writeInt(port);
+ }
+
+ @Override
+ public void writeToSharedPreferences(SharedPreferences sharedPrefs)
+ {
+ super.writeToSharedPreferences(sharedPrefs);
+
+ SharedPreferences.Editor editor = sharedPrefs.edit();
+ editor.putString("bookmark.hostname", hostname);
+ editor.putInt("bookmark.port", port);
+ editor.commit();
+ }
+
+ @Override
+ public void readFromSharedPreferences(SharedPreferences sharedPrefs)
+ {
+ super.readFromSharedPreferences(sharedPrefs);
+
+ hostname = sharedPrefs.getString("bookmark.hostname", "");
+ port = sharedPrefs.getInt("bookmark.port", 3389);
+ }
+
+ // Cloneable
+ public Object clone()
+ {
+ return super.clone();
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/domain/PlaceholderBookmark.java b/client/Android/src/com/freerdp/afreerdp/domain/PlaceholderBookmark.java
new file mode 100644
index 000000000..54b08d431
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/domain/PlaceholderBookmark.java
@@ -0,0 +1,83 @@
+/*
+ Placeholder for bookmark items with a special purpose (i.e. just displaying some text)
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.domain;
+
+import android.content.SharedPreferences;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class PlaceholderBookmark extends BookmarkBase {
+
+ private String name;
+
+ public PlaceholderBookmark(Parcel parcel)
+ {
+ super(parcel);
+ type = TYPE_PLACEHOLDER;
+ name = parcel.readString();
+ }
+
+ public PlaceholderBookmark() {
+ super();
+ type = TYPE_PLACEHOLDER;
+ name = "";
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator()
+ {
+ public PlaceholderBookmark createFromParcel(Parcel in) {
+ return new PlaceholderBookmark(in);
+ }
+
+ @Override
+ public PlaceholderBookmark[] newArray(int size) {
+ return new PlaceholderBookmark[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags)
+ {
+ super.writeToParcel(out, flags);
+ out.writeString(name);
+ }
+
+ @Override
+ public void writeToSharedPreferences(SharedPreferences sharedPrefs)
+ {
+ super.writeToSharedPreferences(sharedPrefs);
+ }
+
+ @Override
+ public void readFromSharedPreferences(SharedPreferences sharedPrefs)
+ {
+ super.readFromSharedPreferences(sharedPrefs);
+ }
+
+ // Cloneable
+ public Object clone()
+ {
+ return super.clone();
+ }
+
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/domain/QuickConnectBookmark.java b/client/Android/src/com/freerdp/afreerdp/domain/QuickConnectBookmark.java
new file mode 100644
index 000000000..1f6780c26
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/domain/QuickConnectBookmark.java
@@ -0,0 +1,70 @@
+/*
+ Quick Connect bookmark (used for quick connects using just a hostname)
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.domain;
+
+import android.content.SharedPreferences;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class QuickConnectBookmark extends ManualBookmark {
+
+ public QuickConnectBookmark(Parcel parcel)
+ {
+ super(parcel);
+ type = TYPE_QUICKCONNECT;
+ }
+
+ public QuickConnectBookmark() {
+ super();
+ type = TYPE_QUICKCONNECT;
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator()
+ {
+ public QuickConnectBookmark createFromParcel(Parcel in) {
+ return new QuickConnectBookmark(in);
+ }
+
+ @Override
+ public QuickConnectBookmark[] newArray(int size) {
+ return new QuickConnectBookmark[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags)
+ {
+ super.writeToParcel(out, flags);
+ }
+
+ @Override
+ public void writeToSharedPreferences(SharedPreferences sharedPrefs)
+ {
+ super.writeToSharedPreferences(sharedPrefs);
+ }
+
+ @Override
+ public void readFromSharedPreferences(SharedPreferences sharedPrefs)
+ {
+ super.readFromSharedPreferences(sharedPrefs);
+ }
+
+ // Cloneable
+ public Object clone()
+ {
+ return super.clone();
+ }
+
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/AboutActivity.java b/client/Android/src/com/freerdp/afreerdp/presentation/AboutActivity.java
new file mode 100644
index 000000000..f5a525b37
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/presentation/AboutActivity.java
@@ -0,0 +1,75 @@
+/*
+ Activity showing information about aFreeRDP and FreeRDP build information
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.presentation;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.IllegalFormatException;
+
+import com.freerdp.afreerdp.services.LibFreeRDP;
+
+import android.app.Activity;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import android.webkit.WebView;
+
+public class AboutActivity extends Activity {
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ WebView webview = new WebView(this);
+ setContentView(webview);
+
+ // get app version
+ String version;
+ try
+ {
+ version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
+ }
+ catch(NameNotFoundException e)
+ {
+ version = "unknown";
+ }
+
+ StringBuilder total = new StringBuilder();
+ try
+ {
+ String filename = ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE) ? "about.html" : "about_phone.html";
+ BufferedReader r = new BufferedReader(new InputStreamReader(getAssets().open("about_page/" + filename)));
+ String line;
+ while ((line = r.readLine()) != null) {
+ total.append(line);
+ }
+ }
+ catch(IOException e)
+ {
+ }
+
+ // append FreeRDP core version to app version
+ version = version + " (" + LibFreeRDP.getVersion() + ")";
+
+ String about_html = "no about ;(";
+ try
+ {
+ about_html = String.format(total.toString(), version, Build.VERSION.RELEASE ,Build.MODEL);
+ }
+ catch(IllegalFormatException e)
+ {
+ about_html="Nothing here ;(";
+ }
+ webview.getSettings().setJavaScriptEnabled(true);
+ webview.loadDataWithBaseURL("file:///android_asset/about_page/", about_html, "text/html", null, "about:blank");
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/ApplicationSettingsActivity.java b/client/Android/src/com/freerdp/afreerdp/presentation/ApplicationSettingsActivity.java
new file mode 100644
index 000000000..6dd387de3
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/presentation/ApplicationSettingsActivity.java
@@ -0,0 +1,112 @@
+/*
+ Application Settings Activity
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.presentation;
+
+import java.io.File;
+
+import com.freerdp.afreerdp.R;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceActivity;
+import android.util.Log;
+import android.widget.Toast;
+
+public class ApplicationSettingsActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener {
+
+ private Preference prefEraseAllCertificates;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState)
+ {
+ Log.v("SettingsActivity", "onCreate");
+ super.onCreate(savedInstanceState);
+ addPreferencesFromResource(R.xml.application_settings);
+
+ prefEraseAllCertificates = (Preference) findPreference("security.clear_certificate_cache");
+
+ // erase certificate cache button
+ prefEraseAllCertificates.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(preference.getContext());
+ builder.setTitle(R.string.dlg_title_clear_cert_cache)
+ .setMessage(R.string.dlg_msg_clear_cert_cache)
+ .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which)
+ {
+ clearCertificateCache();
+ }
+ })
+ .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which)
+ {
+ dialog.dismiss();
+ }
+ })
+ .create()
+ .show();
+ return true;
+ }
+ });
+
+ // register for preferences changed notification
+ getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+ onSharedPreferenceChanged(getPreferenceManager().getSharedPreferences(), "power.disconnect_timeout");
+ }
+
+ @Override
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ if (key.equals("power.disconnect_timeout"))
+ {
+ int val = sharedPreferences.getInt(key, 5);
+ Preference pref = findPreference(key);
+ if (pref != null)
+ {
+ if (val == 0)
+ pref.setSummary(getResources().getString(R.string.settings_description_disabled));
+ else
+ pref.setSummary(String.format(getResources().getString(R.string.settings_description_after_minutes), val));
+ }
+ }
+ }
+
+ private boolean deleteDirectory(File dir)
+ {
+ if (dir.isDirectory())
+ {
+ String[] children = dir.list();
+ for(String file : children)
+ {
+ if(!deleteDirectory(new File(dir, file)))
+ return false;
+ }
+ }
+ return dir.delete();
+ }
+
+ private void clearCertificateCache()
+ {
+ if((new File(getFilesDir() + "/.freerdp")).exists())
+ {
+ if(deleteDirectory(new File(getFilesDir() + "/.freerdp")))
+ Toast.makeText(this, R.string.info_reset_success, Toast.LENGTH_LONG).show();
+ else
+ Toast.makeText(this, R.string.info_reset_failed, Toast.LENGTH_LONG).show();
+ }
+ else
+ Toast.makeText(this, R.string.info_reset_success, Toast.LENGTH_LONG).show();
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/BookmarkActivity.java b/client/Android/src/com/freerdp/afreerdp/presentation/BookmarkActivity.java
new file mode 100644
index 000000000..40ebeddfa
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/presentation/BookmarkActivity.java
@@ -0,0 +1,450 @@
+/*
+ Bookmark editing activity
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.presentation;
+
+import com.freerdp.afreerdp.R;
+import com.freerdp.afreerdp.application.GlobalApp;
+import com.freerdp.afreerdp.domain.BookmarkBase;
+import com.freerdp.afreerdp.domain.ConnectionReference;
+import com.freerdp.afreerdp.domain.ManualBookmark;
+import com.freerdp.afreerdp.services.BookmarkBaseGateway;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.PreferenceActivity;
+
+public class BookmarkActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener
+{
+ public static final String PARAM_CONNECTION_REFERENCE = "conRef";
+
+ private int current_preferences;
+ private static final int PREFERENCES_BOOKMARK = 1;
+ private static final int PREFERENCES_CREDENTIALS = 2;
+ private static final int PREFERENCES_SCREEN = 3;
+ private static final int PREFERENCES_PERFORMANCE = 4;
+ private static final int PREFERENCES_ADVANCED = 5;
+ private static final int PREFERENCES_SCREEN3G = 6;
+ private static final int PREFERENCES_PERFORMANCE3G = 7;
+
+ // bookmark needs to be static because the activity is started for each subview
+ // (we have to do this because Android has a bug where the style for Preferences
+ // is only applied to the first PreferenceScreen but not to subsequent ones)
+ private static BookmarkBase bookmark = null;
+
+ private static boolean settings_changed = false;
+ private static boolean new_bookmark = false;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate(savedInstanceState);
+
+ // init shared preferences for activity
+ getPreferenceManager().setSharedPreferencesName("TEMP");
+ getPreferenceManager().setSharedPreferencesMode(MODE_PRIVATE);
+
+ if (bookmark == null)
+ {
+ // if we have a bookmark id set in the extras we are in edit mode
+ Bundle bundle = getIntent().getExtras();
+ if(bundle != null)
+ {
+ // See if we got a connection reference to a bookmark
+ if(bundle.containsKey(PARAM_CONNECTION_REFERENCE))
+ {
+ String refStr = bundle.getString(PARAM_CONNECTION_REFERENCE);
+ if(ConnectionReference.isManualBookmarkReference(refStr))
+ {
+ bookmark = GlobalApp.getManualBookmarkGateway().findById(ConnectionReference.getManualBookmarkId(refStr));
+ new_bookmark = false;
+ }
+ else if(ConnectionReference.isHostnameReference(refStr))
+ {
+ bookmark = new ManualBookmark();
+ bookmark.get().setLabel(ConnectionReference.getHostname(refStr));
+ bookmark.get().setHostname(ConnectionReference.getHostname(refStr));
+ new_bookmark = true;
+ }
+ }
+ }
+
+ // last chance - ensure we really have a valid bookmark
+ if(bookmark == null)
+ bookmark = new ManualBookmark();
+
+ // update preferences from bookmark
+ bookmark.writeToSharedPreferences(getPreferenceManager().getSharedPreferences());
+
+ // no settings changed yet
+ settings_changed = false;
+ }
+
+ // load the requested settings resource
+ if (getIntent() == null || getIntent().getData() == null)
+ {
+ addPreferencesFromResource(R.xml.bookmark_settings);
+ current_preferences = PREFERENCES_BOOKMARK;
+ }
+ else if (getIntent().getData().toString().equals("preferences://screen_settings"))
+ {
+ addPreferencesFromResource(R.xml.screen_settings);
+ current_preferences = PREFERENCES_SCREEN;
+ }
+ else if (getIntent().getData().toString().equals("preferences://performance_flags"))
+ {
+ addPreferencesFromResource(R.xml.performance_flags);
+ current_preferences = PREFERENCES_PERFORMANCE;
+ }
+ else if (getIntent().getData().toString().equals("preferences://screen_settings_3g"))
+ {
+ addPreferencesFromResource(R.xml.screen_settings_3g);
+ current_preferences = PREFERENCES_SCREEN3G;
+ }
+ else if (getIntent().getData().toString().equals("preferences://performance_flags_3g"))
+ {
+ addPreferencesFromResource(R.xml.performance_flags_3g);
+ current_preferences = PREFERENCES_PERFORMANCE3G;
+ }
+ else if (getIntent().getData().toString().equals("preferences://advanced_settings"))
+ {
+ addPreferencesFromResource(R.xml.advanced_settings);
+ current_preferences = PREFERENCES_ADVANCED;
+ }
+ else if (getIntent().getData().toString().equals("preferences://credentials_settings"))
+ {
+ addPreferencesFromResource(R.xml.credentials_settings);
+ current_preferences = PREFERENCES_CREDENTIALS;
+ }
+ else
+ {
+ addPreferencesFromResource(R.xml.bookmark_settings);
+ current_preferences = PREFERENCES_BOOKMARK;
+ }
+
+ // update UI with bookmark data
+ initSettings(getPreferenceManager().getSharedPreferences());
+
+ // register for preferences changed notification
+ getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+ }
+
+ @Override
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ settings_changed = true;
+ switch (current_preferences)
+ {
+ case PREFERENCES_BOOKMARK:
+ bookmarkSettingsChanged(sharedPreferences, key);
+ break;
+
+ case PREFERENCES_ADVANCED:
+ advancedSettingsChanged(sharedPreferences, key);
+ break;
+
+ case PREFERENCES_CREDENTIALS:
+ credentialsSettingsChanged(sharedPreferences, key);
+ break;
+
+ case PREFERENCES_SCREEN:
+ case PREFERENCES_SCREEN3G:
+ screenSettingsChanged(sharedPreferences, key);
+ break;
+ }
+
+ }
+
+ private void initSettings(SharedPreferences sharedPreferences)
+ {
+ switch (current_preferences)
+ {
+ case PREFERENCES_BOOKMARK:
+ initBookmarkSettings(sharedPreferences);
+ break;
+
+ case PREFERENCES_ADVANCED:
+ initAdvancedSettings(sharedPreferences);
+ break;
+
+ case PREFERENCES_CREDENTIALS:
+ initCredentialsSettings(sharedPreferences);
+ break;
+
+ case PREFERENCES_SCREEN:
+ initScreenSettings(sharedPreferences);
+ break;
+
+ case PREFERENCES_SCREEN3G:
+ initScreenSettings3G(sharedPreferences);
+ break;
+ }
+ }
+
+ private void initBookmarkSettings(SharedPreferences sharedPreferences)
+ {
+ bookmarkSettingsChanged(sharedPreferences, "bookmark.label");
+ bookmarkSettingsChanged(sharedPreferences, "bookmark.hostname");
+ bookmarkSettingsChanged(sharedPreferences, "bookmark.port");
+ bookmarkSettingsChanged(sharedPreferences, "bookmark.username");
+ bookmarkSettingsChanged(sharedPreferences, "bookmark.resolution");
+ }
+
+ private void bookmarkSettingsChanged(SharedPreferences sharedPreferences, String key)
+ {
+ if (key.equals("bookmark.label") && findPreference(key) != null)
+ findPreference(key).setSummary(sharedPreferences.getString(key, ""));
+ else if (key.equals("bookmark.hostname") && findPreference(key) != null)
+ findPreference(key).setSummary(sharedPreferences.getString(key, ""));
+ else if (key.equals("bookmark.port") && findPreference(key) != null)
+ findPreference(key).setSummary(String.valueOf(sharedPreferences.getInt(key, -1)));
+ else if (key.equals("bookmark.username"))
+ {
+ String username = sharedPreferences.getString(key, "");
+ if (username.length() == 0)
+ username = "";
+ findPreference("bookmark.credentials").setSummary(username);
+ }
+ else if (key.equals("bookmark.resolution") || key.equals("bookmark.colors") || key.equals("bookmark.width") || key.equals("bookmark.height"))
+ {
+ String resolution = sharedPreferences.getString("bookmark.resolution", "800x600");
+ if (resolution.equals("automatic"))
+ resolution = getResources().getString(R.string.resolution_automatic);
+ else if (resolution.equals("custom"))
+ resolution = getResources().getString(R.string.resolution_custom);
+ resolution += "@" + sharedPreferences.getInt("bookmark.colors", 16);
+ findPreference("bookmark.screen").setSummary(resolution);
+ }
+ }
+
+ private void initAdvancedSettings(SharedPreferences sharedPreferences)
+ {
+ advancedSettingsChanged(sharedPreferences, "bookmark.enable_3g_settings");
+ advancedSettingsChanged(sharedPreferences, "bookmark.security");
+ advancedSettingsChanged(sharedPreferences, "bookmark.resolution_3g");
+ advancedSettingsChanged(sharedPreferences, "bookmark.remote_program");
+ advancedSettingsChanged(sharedPreferences, "bookmark.work_dir");
+ }
+
+ private void advancedSettingsChanged(SharedPreferences sharedPreferences, String key)
+ {
+ if (key.equals("bookmark.enable_3g_settings"))
+ {
+ boolean enabled = sharedPreferences.getBoolean(key, false);
+ findPreference("bookmark.screen_3g").setEnabled(enabled);
+ findPreference("bookmark.performance_3g").setEnabled(enabled);
+ }
+ else if (key.equals("bookmark.security"))
+ {
+ ListPreference listPreference = (ListPreference)findPreference(key);
+ CharSequence security = listPreference.getEntries()[sharedPreferences.getInt(key, 0)];
+ listPreference.setSummary(security);
+ }
+ else if (key.equals("bookmark.resolution_3g") || key.equals("bookmark.colors_3g") || key.equals("bookmark.width_3g") || key.equals("bookmark.height_3g"))
+ {
+ String resolution = sharedPreferences.getString("bookmark.resolution_3g", "800x600");
+ if (resolution.equals("automatic"))
+ resolution = getResources().getString(R.string.resolution_automatic);
+ else if (resolution.equals("custom"))
+ resolution = getResources().getString(R.string.resolution_custom);
+ resolution += "@" + sharedPreferences.getInt("bookmark.colors_3g", 16);
+ findPreference("bookmark.screen_3g").setSummary(resolution);
+ }
+ else if (key.equals("bookmark.remote_program"))
+ findPreference(key).setSummary(sharedPreferences.getString(key, ""));
+ else if (key.equals("bookmark.work_dir"))
+ findPreference(key).setSummary(sharedPreferences.getString(key, ""));
+ }
+
+ private void initCredentialsSettings(SharedPreferences sharedPreferences)
+ {
+ credentialsSettingsChanged(sharedPreferences, "bookmark.username");
+ credentialsSettingsChanged(sharedPreferences, "bookmark.password");
+ credentialsSettingsChanged(sharedPreferences, "bookmark.domain");
+ }
+
+ private void credentialsSettingsChanged(SharedPreferences sharedPreferences, String key)
+ {
+ if (key.equals("bookmark.username"))
+ findPreference(key).setSummary(sharedPreferences.getString(key, ""));
+ else if (key.equals("bookmark.password"))
+ {
+ if (sharedPreferences.getString(key, "").length() == 0)
+ findPreference(key).setSummary(getResources().getString(R.string.settings_password_empty));
+ else
+ findPreference(key).setSummary(getResources().getString(R.string.settings_password_present));
+ }
+ else if (key.equals("bookmark.domain"))
+ findPreference(key).setSummary(sharedPreferences.getString(key, ""));
+ }
+
+ private void initScreenSettings(SharedPreferences sharedPreferences)
+ {
+ screenSettingsChanged(sharedPreferences, "bookmark.colors");
+ screenSettingsChanged(sharedPreferences, "bookmark.resolution");
+ screenSettingsChanged(sharedPreferences, "bookmark.width");
+ screenSettingsChanged(sharedPreferences, "bookmark.height");
+ }
+
+ private void initScreenSettings3G(SharedPreferences sharedPreferences)
+ {
+ screenSettingsChanged(sharedPreferences, "bookmark.colors_3g");
+ screenSettingsChanged(sharedPreferences, "bookmark.resolution_3g");
+ screenSettingsChanged(sharedPreferences, "bookmark.width_3g");
+ screenSettingsChanged(sharedPreferences, "bookmark.height_3g");
+ }
+
+ private void screenSettingsChanged(SharedPreferences sharedPreferences, String key)
+ {
+ // could happen during initialization because 3g and non-3g settings share this routine - just skip
+ if (findPreference(key) == null)
+ return;
+
+ if (key.equals("bookmark.colors") || key.equals("bookmark.colors_3g"))
+ {
+ ListPreference listPreference = (ListPreference)findPreference(key);
+ listPreference.setSummary(listPreference.getEntry());
+ }
+ else if (key.equals("bookmark.resolution") || key.equals("bookmark.resolution_3g"))
+ {
+ ListPreference listPreference = (ListPreference)findPreference(key);
+ listPreference.setSummary(listPreference.getEntry());
+
+ boolean enabled = listPreference.getValue().equals("custom");
+ if (key.equals("bookmark.resolution"))
+ {
+ findPreference("bookmark.width").setEnabled(enabled);
+ findPreference("bookmark.height").setEnabled(enabled);
+ }
+ else
+ {
+ findPreference("bookmark.width_3g").setEnabled(enabled);
+ findPreference("bookmark.height_3g").setEnabled(enabled);
+ }
+ }
+ else if (key.equals("bookmark.width") || key.equals("bookmark.width_3g"))
+ findPreference(key).setSummary(String.valueOf(sharedPreferences.getInt(key, 800)));
+ else if (key.equals("bookmark.height") || key.equals("bookmark.height_3g"))
+ findPreference(key).setSummary(String.valueOf(sharedPreferences.getInt(key, 600)));
+ }
+
+ private boolean verifySettings(SharedPreferences sharedPreferences) {
+
+ boolean verifyFailed = false;
+ // perform sanity checks on settings
+ // Label set
+ if (sharedPreferences.getString("bookmark.label", "").length() == 0)
+ verifyFailed = true;
+
+ // Server and port specified
+ if (!verifyFailed && sharedPreferences.getString("bookmark.hostname", "").length() == 0)
+ verifyFailed = true;
+
+ // Server and port specified
+ if (!verifyFailed && sharedPreferences.getInt("bookmark.port", -1) <= 0)
+ verifyFailed = true;
+
+ // if an error occured - display toast and return false
+ return (!verifyFailed);
+ }
+
+ private void finishAndResetBookmark()
+ {
+ bookmark = null;
+ finish();
+ }
+
+ @Override
+ public void onBackPressed()
+ {
+ // only proceed if we are in the main preferences screen
+ if (current_preferences != PREFERENCES_BOOKMARK)
+ {
+ super.onBackPressed();
+ return;
+ }
+
+ SharedPreferences sharedPreferences = getPreferenceManager().getSharedPreferences();
+ if(!verifySettings(sharedPreferences))
+ {
+ // ask the user if he wants to cancel or continue editing
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(R.string.error_bookmark_incomplete_title)
+ .setMessage(R.string.error_bookmark_incomplete)
+ .setPositiveButton(R.string.cancel, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ finishAndResetBookmark();
+ }
+ })
+ .setNegativeButton(R.string.cont, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.cancel();
+ }
+ })
+ .show();
+
+ return;
+ }
+ else
+ {
+ // ask the user if he wants to save or cancel editing if a setting has changed
+ if (new_bookmark || settings_changed)
+ {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(R.string.dlg_title_save_bookmark)
+ .setMessage(R.string.dlg_save_bookmark)
+ .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ // read shared prefs back to bookmark
+ bookmark.readFromSharedPreferences(getPreferenceManager().getSharedPreferences());
+
+ BookmarkBaseGateway bookmarkGateway;
+ if(bookmark.getType() == BookmarkBase.TYPE_MANUAL)
+ {
+ bookmarkGateway = GlobalApp.getManualBookmarkGateway();
+ // remove any history entry for this bookmark
+ GlobalApp.getQuickConnectHistoryGateway().removeHistoryItem(bookmark.get().getHostname());
+ }
+ else
+ {
+ assert false;
+ return;
+ }
+
+ // insert or update bookmark and leave activity
+ if(bookmark.getId() > 0)
+ bookmarkGateway.update(bookmark);
+ else
+ bookmarkGateway.insert(bookmark);
+
+ finishAndResetBookmark();
+ }
+ })
+ .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ finishAndResetBookmark();
+ }
+ })
+ .show();
+ }
+ else
+ {
+ finishAndResetBookmark();
+ }
+ }
+ }
+
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/HelpActivity.java b/client/Android/src/com/freerdp/afreerdp/presentation/HelpActivity.java
new file mode 100644
index 000000000..07f6cc9d4
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/presentation/HelpActivity.java
@@ -0,0 +1,29 @@
+/*
+ Activity that displays the help pages
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.presentation;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.webkit.WebView;
+
+public class HelpActivity extends Activity {
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ WebView webview = new WebView(this);
+ setContentView(webview);
+
+ String filename = ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE) ? "gestures.html" : "gestures_phone.html";
+ webview.loadUrl("file:///android_asset/help_page/" + filename);
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/HomeActivity.java b/client/Android/src/com/freerdp/afreerdp/presentation/HomeActivity.java
new file mode 100644
index 000000000..62fff1d98
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/presentation/HomeActivity.java
@@ -0,0 +1,417 @@
+/*
+ Main/Home Activity
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.presentation;
+
+import java.util.ArrayList;
+
+import com.freerdp.afreerdp.R;
+import com.freerdp.afreerdp.application.GlobalApp;
+import com.freerdp.afreerdp.application.GlobalSettings;
+import com.freerdp.afreerdp.domain.BookmarkBase;
+import com.freerdp.afreerdp.domain.ConnectionReference;
+import com.freerdp.afreerdp.domain.PlaceholderBookmark;
+import com.freerdp.afreerdp.domain.QuickConnectBookmark;
+import com.freerdp.afreerdp.utils.BookmarkArrayAdapter;
+import com.freerdp.afreerdp.utils.SeparatedListAdapter;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu;
+import android.view.View.OnClickListener;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.View.OnCreateContextMenuListener;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+
+public class HomeActivity extends Activity
+{
+ private final static String ADD_BOOKMARK_PLACEHOLDER = "add_bookmark";
+
+ private ListView listViewBookmarks;
+ private WebView webViewGetStarted;
+
+ private Button clearTextButton;
+ private EditText superBarEditText;
+ private BookmarkArrayAdapter manualBookmarkAdapter;
+ private SeparatedListAdapter separatedListAdapter;
+
+ private PlaceholderBookmark addBookmarkPlaceholder;
+
+ private static final String TAG = "HomeActivity";
+
+ private static final String PARAM_SUPERBAR_TEXT = "superbar_text";
+
+ private String sectionLabelBookmarks;
+
+
+ @Override
+ public void onCreate(Bundle savedInstanceState)
+ {
+ setTitle(R.string.title_home);
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.home);
+
+ long heapSize = Runtime.getRuntime().maxMemory();
+ Log.i(TAG, "Max HeapSize: " + heapSize);
+ Log.i(TAG, "App data folder: " + getFilesDir().toString());
+
+ // load strings
+ sectionLabelBookmarks = getResources().getString(R.string.section_bookmarks);
+
+ // create add bookmark/quick connect bookmark placeholder
+ addBookmarkPlaceholder = new PlaceholderBookmark();
+ addBookmarkPlaceholder.setName(ADD_BOOKMARK_PLACEHOLDER);
+ addBookmarkPlaceholder.setLabel(getResources().getString(R.string.list_placeholder_add_bookmark));
+
+ // load views
+ clearTextButton = (Button) findViewById(R.id.clear_search_btn);
+ superBarEditText = (EditText) findViewById(R.id.superBarEditText);
+
+ listViewBookmarks = (ListView) findViewById(R.id.listViewBookmarks);
+ webViewGetStarted = (WebView) findViewById(R.id.webViewWelcome);
+
+ String filename = ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE) ? "welcome.html" : "welcome_phone.html";
+ webViewGetStarted.loadUrl("file:///android_asset/welcome_page/" + filename);
+
+ // set listeners for the list view
+ listViewBookmarks.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ public void onItemClick(AdapterView parent, View view, int position, long id)
+ {
+ String curSection = separatedListAdapter.getSectionForPosition(position);
+ Log.v(TAG, "Clicked on item id " + separatedListAdapter.getItemId(position) + " in section " + curSection);
+ if(curSection == sectionLabelBookmarks)
+ {
+ String refStr = view.getTag().toString();
+ if (ConnectionReference.isManualBookmarkReference(refStr) ||
+ ConnectionReference.isHostnameReference(refStr))
+ {
+ Bundle bundle = new Bundle();
+ bundle.putString(SessionActivity.PARAM_CONNECTION_REFERENCE, refStr);
+
+ Intent sessionIntent = new Intent(view.getContext(), SessionActivity.class);
+ sessionIntent.putExtras(bundle);
+ startActivity(sessionIntent);
+
+ // clear any search text
+ superBarEditText.setText("");
+ superBarEditText.clearFocus();
+ }
+ else if (ConnectionReference.isPlaceholderReference(refStr))
+ {
+ // is this the add bookmark placeholder?
+ if (ConnectionReference.getPlaceholder(refStr).equals(ADD_BOOKMARK_PLACEHOLDER))
+ {
+ Intent bookmarkIntent = new Intent(view.getContext(), BookmarkActivity.class);
+ startActivity(bookmarkIntent);
+ }
+ }
+ }
+ }
+ });
+
+ listViewBookmarks.setOnCreateContextMenuListener(new OnCreateContextMenuListener() {
+ @Override
+ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+ // if the selected item is not a session item (tag == null) and not a quick connect entry
+ // (not a hostname connection reference) inflate the context menu
+ View itemView = ((AdapterContextMenuInfo)menuInfo).targetView;
+ String refStr = itemView.getTag() != null ? itemView.getTag().toString() : null;
+ if (refStr != null && !ConnectionReference.isHostnameReference(refStr) && !ConnectionReference.isPlaceholderReference(refStr))
+ {
+ getMenuInflater().inflate(R.menu.bookmark_context_menu, menu);
+ menu.setHeaderTitle(getResources().getString(R.string.menu_title_bookmark));
+ }
+ }
+ });
+
+ superBarEditText.addTextChangedListener(new SuperBarTextWatcher());
+
+ clearTextButton.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ superBarEditText.setText("");
+ }
+ });
+
+ webViewGetStarted.setWebViewClient(new WebViewClient() {
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url)
+ {
+ if (url.endsWith("new_connection"))
+ {
+ Intent bookmarkIntent = new Intent(getApplicationContext(), BookmarkActivity.class);
+ startActivity(bookmarkIntent);
+ return true;
+ }
+
+ return false;
+ }
+ });
+ }
+
+ @Override
+ public boolean onSearchRequested() {
+ superBarEditText.requestFocus();
+ return true;
+ }
+
+ @Override
+ public boolean onContextItemSelected(MenuItem aItem) {
+
+ // get connection reference
+ AdapterContextMenuInfo menuInfo = (AdapterContextMenuInfo)aItem.getMenuInfo();
+ String refStr = menuInfo.targetView.getTag().toString();
+
+ switch(aItem.getItemId()) {
+
+ case R.id.bookmark_connect:
+ {
+ Bundle bundle = new Bundle();
+ bundle.putString(SessionActivity.PARAM_CONNECTION_REFERENCE, refStr);
+ Intent sessionIntent = new Intent(this, SessionActivity.class);
+ sessionIntent.putExtras(bundle);
+
+ startActivity(sessionIntent);
+ return true;
+ }
+
+ case R.id.bookmark_edit:
+ {
+ Bundle bundle = new Bundle();
+ bundle.putString(BookmarkActivity.PARAM_CONNECTION_REFERENCE, refStr);
+
+ Intent bookmarkIntent = new Intent(this.getApplicationContext(), BookmarkActivity.class);
+ bookmarkIntent.putExtras(bundle);
+ startActivity(bookmarkIntent);
+ return true;
+ }
+
+ case R.id.bookmark_delete:
+ {
+ if(ConnectionReference.isManualBookmarkReference(refStr))
+ {
+ long id = ConnectionReference.getManualBookmarkId(refStr);
+ GlobalApp.getManualBookmarkGateway().delete(id);
+ manualBookmarkAdapter.remove(id);
+ separatedListAdapter.notifyDataSetChanged();
+ }
+ else
+ {
+ assert false;
+ }
+
+ showWelcomeScreenOrBookmarkList();
+
+ // clear super bar text
+ superBarEditText.setText("");
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ Log.v(TAG, "HomeActivity.onResume");
+
+ // create bookmark cursor adapter
+ manualBookmarkAdapter = new BookmarkArrayAdapter(this, R.layout.bookmark_list_item, GlobalApp.getManualBookmarkGateway().findAll());
+
+ // add add bookmark item to manual adapter
+ manualBookmarkAdapter.insert(addBookmarkPlaceholder, 0);
+
+ // attach all adapters to the separatedListView adapter and assign it to the list view
+ separatedListAdapter = new SeparatedListAdapter(this);
+ separatedListAdapter.addSection(sectionLabelBookmarks, manualBookmarkAdapter);
+ listViewBookmarks.setAdapter(separatedListAdapter);
+
+ // show welcome screen in case we have a first-time user
+ showWelcomeScreenOrBookmarkList();
+
+ // if we have a filter text entered cause an update to be caused here
+ String filter = superBarEditText.getText().toString();
+ if (filter.length() > 0)
+ superBarEditText.setText(filter);
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ Log.v(TAG, "HomeActivity.onPause");
+
+ // reset adapters
+ listViewBookmarks.setAdapter(null);
+ separatedListAdapter = null;
+ manualBookmarkAdapter = null;
+ }
+
+ @Override
+ public void onBackPressed()
+ {
+ // if back was pressed - ask the user if he really wants to exit
+ if (GlobalSettings.getAskOnExit())
+ {
+ final CheckBox cb = new CheckBox(this);
+ cb.setTextAppearance(this, android.R.style.TextAppearance_Medium_Inverse);
+ cb.setChecked(!GlobalSettings.getAskOnExit());
+ cb.setText(R.string.dlg_dont_show_again);
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(R.string.dlg_title_exit)
+ .setMessage(R.string.dlg_msg_exit)
+ .setView(cb)
+ .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which)
+ {
+ GlobalSettings.setAskOnExit(!cb.isChecked());
+ finish();
+ }
+ })
+ .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which)
+ {
+ GlobalSettings.setAskOnExit(!cb.isChecked());
+ dialog.dismiss();
+ }
+ })
+ .create()
+ .show();
+ }
+ else
+ {
+ super.onBackPressed();
+ }
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState)
+ {
+ super.onSaveInstanceState(outState);
+ outState.putString(PARAM_SUPERBAR_TEXT, superBarEditText.getText().toString());
+ }
+
+ @Override
+ protected void onRestoreInstanceState(Bundle inState)
+ {
+ super.onRestoreInstanceState(inState);
+ superBarEditText.setText(inState.getString(PARAM_SUPERBAR_TEXT));
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.home_menu, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+
+ switch (item.getItemId()) {
+
+ case R.id.newBookmark:
+ {
+ Intent bookmarkIntent = new Intent(this, BookmarkActivity.class);
+ startActivity(bookmarkIntent);
+ break;
+ }
+
+ case R.id.appSettings:
+ {
+ Intent settingsIntent = new Intent(this, ApplicationSettingsActivity.class);
+ startActivity(settingsIntent);
+ break;
+ }
+
+ case R.id.help:
+ {
+ Intent helpIntent = new Intent(this, HelpActivity.class);
+ startActivity(helpIntent);
+ break;
+ }
+
+ case R.id.exit:
+ {
+ finish();
+ break;
+ }
+
+ case R.id.about:
+ {
+ Intent aboutIntent = new Intent(this, AboutActivity.class);
+ startActivity(aboutIntent);
+ break;
+ }
+ }
+
+ return true;
+ }
+
+ private void showWelcomeScreenOrBookmarkList()
+ {
+ listViewBookmarks.setVisibility(View.VISIBLE);
+ webViewGetStarted.setVisibility(View.GONE);
+ }
+
+ private class SuperBarTextWatcher implements TextWatcher
+ {
+ @Override
+ public void afterTextChanged(Editable s) {
+ if(separatedListAdapter != null)
+ {
+ String text = s.toString();
+ if(text.length() > 0)
+ {
+ ArrayList computers_list = GlobalApp.getQuickConnectHistoryGateway().findHistory(text);
+ computers_list.addAll(GlobalApp.getManualBookmarkGateway().findByLabelOrHostnameLike(text));
+ manualBookmarkAdapter.replaceItems(computers_list);
+ QuickConnectBookmark qcBm = new QuickConnectBookmark();
+ qcBm.setLabel(text);
+ qcBm.setHostname(text);
+ manualBookmarkAdapter.insert(qcBm, 0);
+ }
+ else
+ {
+ manualBookmarkAdapter.replaceItems(GlobalApp.getManualBookmarkGateway().findAll());
+ manualBookmarkAdapter.insert(addBookmarkPlaceholder, 0);
+ }
+
+ separatedListAdapter.notifyDataSetChanged();
+ }
+ }
+
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ }
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/ScrollView2D.java b/client/Android/src/com/freerdp/afreerdp/presentation/ScrollView2D.java
new file mode 100644
index 000000000..9150e5ccc
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/presentation/ScrollView2D.java
@@ -0,0 +1,1161 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * 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.
+ */
+/*
+ * Revised 5/19/2010 by GORGES
+ * Now supports two-dimensional view scrolling
+ * http://GORGES.us
+ */
+
+package com.freerdp.afreerdp.presentation;
+
+import java.util.List;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.FocusFinder;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.view.animation.AnimationUtils;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.Scroller;
+import android.widget.TextView;
+
+/**
+ * Layout container for a view hierarchy that can be scrolled by the user,
+ * allowing it to be larger than the physical display. A TwoDScrollView
+ * is a {@link FrameLayout}, meaning you should place one child in it
+ * containing the entire contents to scroll; this child may itself be a layout
+ * manager with a complex hierarchy of objects. A child that is often used
+ * is a {@link LinearLayout} in a vertical orientation, presenting a vertical
+ * array of top-level items that the user can scroll through.
+ *
+ * focusables = getFocusables(View.FOCUS_FORWARD);
+ View focusCandidate = null;
+
+ /*
+ * A fully contained focusable is one where its top is below the bound's
+ * top, and its bottom is above the bound's bottom. A partially
+ * contained focusable is one where some part of it is within the
+ * bounds, but it also has some part that is not within bounds. A fully contained
+ * focusable is preferred to a partially contained focusable.
+ */
+ boolean foundFullyContainedFocusable = false;
+
+ int count = focusables.size();
+ for (int i = 0; i < count; i++) {
+ View view = focusables.get(i);
+ int viewTop = view.getTop();
+ int viewBottom = view.getBottom();
+ int viewLeft = view.getLeft();
+ int viewRight = view.getRight();
+
+ if (top < viewBottom && viewTop < bottom && left < viewRight && viewLeft < right) {
+ /*
+ * the focusable is in the target area, it is a candidate for
+ * focusing
+ */
+ final boolean viewIsFullyContained = (top < viewTop) && (viewBottom < bottom) && (left < viewLeft) && (viewRight < right);
+ if (focusCandidate == null) {
+ /* No candidate, take this one */
+ focusCandidate = view;
+ foundFullyContainedFocusable = viewIsFullyContained;
+ } else {
+ final boolean viewIsCloserToVerticalBoundary =
+ (topFocus && viewTop < focusCandidate.getTop()) ||
+ (!topFocus && viewBottom > focusCandidate.getBottom());
+ final boolean viewIsCloserToHorizontalBoundary =
+ (leftFocus && viewLeft < focusCandidate.getLeft()) ||
+ (!leftFocus && viewRight > focusCandidate.getRight());
+ if (foundFullyContainedFocusable) {
+ if (viewIsFullyContained && viewIsCloserToVerticalBoundary && viewIsCloserToHorizontalBoundary) {
+ /*
+ * We're dealing with only fully contained views, so
+ * it has to be closer to the boundary to beat our
+ * candidate
+ */
+ focusCandidate = view;
+ }
+ } else {
+ if (viewIsFullyContained) {
+ /* Any fully contained view beats a partially contained view */
+ focusCandidate = view;
+ foundFullyContainedFocusable = true;
+ } else if (viewIsCloserToVerticalBoundary && viewIsCloserToHorizontalBoundary) {
+ /*
+ * Partially contained view beats another partially
+ * contained view if it's closer
+ */
+ focusCandidate = view;
+ }
+ }
+ }
+ }
+ }
+ return focusCandidate;
+ }
+
+ /**
+ *
+
+ aFreeRDP Remote Desktop Client
+
+ 
+
+ aFreeRDP is an open source client
+ capable of natively using Remote Desktop Protocol (RDP) in order to remotely access your Windows desktop.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ aFreeRDP is a part of FreeRDP
+
+Credits
+
+
+
+
diff --git a/client/Android/assets/about_page/about_phone.html b/client/Android/assets/about_page/about_phone.html
new file mode 100644
index 000000000..3eafceb4e
--- /dev/null
+++ b/client/Android/assets/about_page/about_phone.html
@@ -0,0 +1,200 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This program is free software; you can redistribute it and/or modify it under the terms of the Mozilla Public License, v. 2.0.
+ You can obtain an online version of the License from http://mozilla.org/MPL/2.0/.
+
+ License
++ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +
+
+ A copy of the product's source code can be obtained from the FreeRDP GitHub repository at https://github.com/FreeRDP/FreeRDP.
+
+
+
+
+
+
diff --git a/client/Android/assets/about_page/back.jpg b/client/Android/assets/about_page/back.jpg
new file mode 100644
index 000000000..3bf3455bf
Binary files /dev/null and b/client/Android/assets/about_page/back.jpg differ
diff --git a/client/Android/assets/about_page/background_transparent.png b/client/Android/assets/about_page/background_transparent.png
new file mode 100644
index 000000000..0eba5b5d2
Binary files /dev/null and b/client/Android/assets/about_page/background_transparent.png differ
diff --git a/client/Android/assets/help_page/back.jpg b/client/Android/assets/help_page/back.jpg
new file mode 100644
index 000000000..3bf3455bf
Binary files /dev/null and b/client/Android/assets/help_page/back.jpg differ
diff --git a/client/Android/assets/help_page/gestures.html b/client/Android/assets/help_page/gestures.html
new file mode 100644
index 000000000..858387773
--- /dev/null
+++ b/client/Android/assets/help_page/gestures.html
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+ aFreeRDPRemote Desktop Client
+
+
+
+ aFreeRDP is an open source client for Windows Remote Services using Remote Desktop Protocol (RDP) in order to remotely access your Windows desktop.
+
+
+
+
+
+
+
+
+Version Information
+
| aFreerdp Version | %1$s |
| System Version | %2$s |
| Model | %3$s |
+
+
+
+
+ aFreeRDP is part of FreeRDP
+Credits
+
+
+
+
+
+ This program is free software; you can redistribute it and/or modify it under the terms of the Mozilla Public License, v. 2.0.
+ You can obtain an online version of the License from http://mozilla.org/MPL/2.0/.
+
+ License
++ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +
+
+ A copy of the product's source code can be obtained from the FreeRDP GitHub repository at https://github.com/FreeRDP/FreeRDP.
+
+
+
+
+
+
diff --git a/client/Android/assets/help_page/gestures.png b/client/Android/assets/help_page/gestures.png
new file mode 100644
index 000000000..e49a45b8f
Binary files /dev/null and b/client/Android/assets/help_page/gestures.png differ
diff --git a/client/Android/assets/help_page/gestures_phone.html b/client/Android/assets/help_page/gestures_phone.html
new file mode 100644
index 000000000..156d7c94d
--- /dev/null
+++ b/client/Android/assets/help_page/gestures_phone.html
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/assets/help_page/gestures_phone.png b/client/Android/assets/help_page/gestures_phone.png
new file mode 100644
index 000000000..1b90a1f65
Binary files /dev/null and b/client/Android/assets/help_page/gestures_phone.png differ
diff --git a/client/Android/assets/help_page/nav_gestures.png b/client/Android/assets/help_page/nav_gestures.png
new file mode 100644
index 000000000..ab1b36fba
Binary files /dev/null and b/client/Android/assets/help_page/nav_gestures.png differ
diff --git a/client/Android/assets/help_page/nav_toolbar.png b/client/Android/assets/help_page/nav_toolbar.png
new file mode 100644
index 000000000..703c0013a
Binary files /dev/null and b/client/Android/assets/help_page/nav_toolbar.png differ
diff --git a/client/Android/assets/help_page/nav_touch_pointer.png b/client/Android/assets/help_page/nav_touch_pointer.png
new file mode 100644
index 000000000..30e04568e
Binary files /dev/null and b/client/Android/assets/help_page/nav_touch_pointer.png differ
diff --git a/client/Android/assets/help_page/toolbar.html b/client/Android/assets/help_page/toolbar.html
new file mode 100644
index 000000000..e9ea27ab5
--- /dev/null
+++ b/client/Android/assets/help_page/toolbar.html
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Gestures
++aFreeRDP is designed for touch sensitive devices. +These gestures let you do the most usual operations with your fingers.
+ 
+
+
+
+
+
+
+
+
diff --git a/client/Android/assets/help_page/toolbar.png b/client/Android/assets/help_page/toolbar.png
new file mode 100644
index 000000000..10c23b62b
Binary files /dev/null and b/client/Android/assets/help_page/toolbar.png differ
diff --git a/client/Android/assets/help_page/toolbar_phone.html b/client/Android/assets/help_page/toolbar_phone.html
new file mode 100644
index 000000000..f810d4b08
--- /dev/null
+++ b/client/Android/assets/help_page/toolbar_phone.html
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Toolbar
++With the toolbar you'll be able to display and hide the main tools in your session. This allows together with the touch pointer and the gestures an intuitiv workflow for remote computing on touch sensitive screens. +
+
+
+
+
+Display/hide the default keyboard as well as an extended keyboard with function keysKeyboards
+
+Display/hide the gesture controlled cursor
+Touch Pointer
+
+Disconnect your current session. Please be aware that a disconnect is not the same as a log out.
+
+Disconnect
+
+
+
+
+
+
+
+
diff --git a/client/Android/assets/help_page/toolbar_phone.png b/client/Android/assets/help_page/toolbar_phone.png
new file mode 100644
index 000000000..a01279ce0
Binary files /dev/null and b/client/Android/assets/help_page/toolbar_phone.png differ
diff --git a/client/Android/assets/help_page/touch_pointer.html b/client/Android/assets/help_page/touch_pointer.html
new file mode 100644
index 000000000..8072a1bac
--- /dev/null
+++ b/client/Android/assets/help_page/touch_pointer.html
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Toolbar
++With the toolbar you'll be able to display and hide the main tools in your session. This allows together with the touch pointer and the gestures an intuitiv workflow for remote computing on touch sensitive screens. +
+
+
+
+
+Display/hide the default keyboard as well as an extended keyboard with function keysKeyboards
+
+Display/hide the gesture controlled cursor
+Touch Pointer
+
+Disconnect your current session. Please be aware that a disconnect is not the same as a log out.
+
+Disconnect
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/assets/help_page/touch_pointer.png b/client/Android/assets/help_page/touch_pointer.png
new file mode 100644
index 000000000..f06e3889f
Binary files /dev/null and b/client/Android/assets/help_page/touch_pointer.png differ
diff --git a/client/Android/assets/help_page/touch_pointer_phone.html b/client/Android/assets/help_page/touch_pointer_phone.html
new file mode 100644
index 000000000..89d2e8de0
--- /dev/null
+++ b/client/Android/assets/help_page/touch_pointer_phone.html
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Touch Pointer
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/Android/assets/help_page/touch_pointer_phone.png b/client/Android/assets/help_page/touch_pointer_phone.png
new file mode 100644
index 000000000..168749fd0
Binary files /dev/null and b/client/Android/assets/help_page/touch_pointer_phone.png differ
diff --git a/client/Android/assets/welcome_page/1.png b/client/Android/assets/welcome_page/1.png
new file mode 100644
index 000000000..30025d81a
Binary files /dev/null and b/client/Android/assets/welcome_page/1.png differ
diff --git a/client/Android/assets/welcome_page/2.png b/client/Android/assets/welcome_page/2.png
new file mode 100644
index 000000000..43d3a7fe5
Binary files /dev/null and b/client/Android/assets/welcome_page/2.png differ
diff --git a/client/Android/assets/welcome_page/back.jpg b/client/Android/assets/welcome_page/back.jpg
new file mode 100644
index 000000000..3bf3455bf
Binary files /dev/null and b/client/Android/assets/welcome_page/back.jpg differ
diff --git a/client/Android/assets/welcome_page/new_connection.png b/client/Android/assets/welcome_page/new_connection.png
new file mode 100644
index 000000000..dede2a28a
Binary files /dev/null and b/client/Android/assets/welcome_page/new_connection.png differ
diff --git a/client/Android/assets/welcome_page/welcome.html b/client/Android/assets/welcome_page/welcome.html
new file mode 100644
index 000000000..70df41a14
--- /dev/null
+++ b/client/Android/assets/welcome_page/welcome.html
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Touch Pointer
+
+
+
+
+
diff --git a/client/Android/assets/welcome_page/welcome_phone.html b/client/Android/assets/welcome_page/welcome_phone.html
new file mode 100644
index 000000000..fd5ddc434
--- /dev/null
+++ b/client/Android/assets/welcome_page/welcome_phone.html
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
New Connection
+
+ You can specify your own connection settings - just hit the button below or choose "New Connection" from the application menu.
+
+ 
+
+
+
+
+
diff --git a/client/Android/build.xml b/client/Android/build.xml
new file mode 100644
index 000000000..1a230ae00
--- /dev/null
+++ b/client/Android/build.xml
@@ -0,0 +1,91 @@
+
+
+
+
+
New Connection
+
+ You can specify your own connection settings - just hit the button below or choose "New Connection" from the application menu.
+
+
+
+ The {@link TextView} class also + * takes care of its own scrolling, so does not require a TwoDScrollView, but + * using the two together is possible to achieve the effect of a text view + * within a larger container. + */ +public class ScrollView2D extends FrameLayout { + + // interface to receive notifications when the view is scrolled + public interface ScrollView2DListener { + abstract void onScrollChanged(ScrollView2D scrollView, int x, int y, int oldx, int oldy); + } + + private ScrollView2DListener scrollView2DListener = null; + + static final int ANIMATED_SCROLL_GAP = 250; + static final float MAX_SCROLL_FACTOR = 0.5f; + + private long mLastScroll; + + private final Rect mTempRect = new Rect(); + private Scroller mScroller; + + private boolean scrollEnabled = true; + + /** + * Flag to indicate that we are moving focus ourselves. This is so the + * code that watches for focus changes initiated outside this TwoDScrollView + * knows that it does not have to do anything. + */ + private boolean mTwoDScrollViewMovedFocus; + + /** + * Position of the last motion event. + */ + private float mLastMotionY; + private float mLastMotionX; + + /** + * True when the layout has changed but the traversal has not come through yet. + * Ideally the view hierarchy would keep track of this for us. + */ + private boolean mIsLayoutDirty = true; + + /** + * The child to give focus to in the event that a child has requested focus while the + * layout is dirty. This prevents the scroll from being wrong if the child has not been + * laid out before requesting focus. + */ + private View mChildToScrollTo = null; + + /** + * True if the user is currently dragging this TwoDScrollView around. This is + * not the same as 'is being flinged', which can be checked by + * mScroller.isFinished() (flinging begins when the user lifts his finger). + */ + private boolean mIsBeingDragged = false; + + /** + * Determines speed during touch scrolling + */ + private VelocityTracker mVelocityTracker; + + /** + * Whether arrow scrolling is animated. + */ + private int mTouchSlop; + private int mMinimumVelocity; + private int mMaximumVelocity; + + public ScrollView2D(Context context) { + super(context); + initTwoDScrollView(); + } + + public ScrollView2D(Context context, AttributeSet attrs) { + super(context, attrs); + initTwoDScrollView(); + } + + public ScrollView2D(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + initTwoDScrollView(); + } + + @Override + protected float getTopFadingEdgeStrength() { + if (getChildCount() == 0) { + return 0.0f; + } + final int length = getVerticalFadingEdgeLength(); + if (getScrollY() < length) { + return getScrollY() / (float) length; + } + return 1.0f; + } + + @Override + protected float getBottomFadingEdgeStrength() { + if (getChildCount() == 0) { + return 0.0f; + } + final int length = getVerticalFadingEdgeLength(); + final int bottomEdge = getHeight() - getPaddingBottom(); + final int span = getChildAt(0).getBottom() - getScrollY() - bottomEdge; + if (span < length) { + return span / (float) length; + } + return 1.0f; + } + + @Override + protected float getLeftFadingEdgeStrength() { + if (getChildCount() == 0) { + return 0.0f; + } + final int length = getHorizontalFadingEdgeLength(); + if (getScrollX() < length) { + return getScrollX() / (float) length; + } + return 1.0f; + } + + @Override + protected float getRightFadingEdgeStrength() { + if (getChildCount() == 0) { + return 0.0f; + } + final int length = getHorizontalFadingEdgeLength(); + final int rightEdge = getWidth() - getPaddingRight(); + final int span = getChildAt(0).getRight() - getScrollX() - rightEdge; + if (span < length) { + return span / (float) length; + } + return 1.0f; + } + + /** + * Disable/Enable scrolling + */ + public void setScrollEnabled(boolean enable) + { + scrollEnabled = enable; + } + + /** + * @return The maximum amount this scroll view will scroll in response to + * an arrow event. + */ + public int getMaxScrollAmountVertical() { + return (int) (MAX_SCROLL_FACTOR * getHeight()); + } + public int getMaxScrollAmountHorizontal() { + return (int) (MAX_SCROLL_FACTOR * getWidth()); + } + + private void initTwoDScrollView() { + mScroller = new Scroller(getContext()); + setFocusable(true); + setDescendantFocusability(FOCUS_AFTER_DESCENDANTS); + setWillNotDraw(false); + final ViewConfiguration configuration = ViewConfiguration.get(getContext()); + mTouchSlop = configuration.getScaledTouchSlop(); + mMinimumVelocity = configuration.getScaledMinimumFlingVelocity(); + mMaximumVelocity = configuration.getScaledMaximumFlingVelocity(); + } + + @Override + public void addView(View child) { + if (getChildCount() > 0) { + throw new IllegalStateException("TwoDScrollView can host only one direct child"); + } + super.addView(child); + } + + @Override + public void addView(View child, int index) { + if (getChildCount() > 0) { + throw new IllegalStateException("TwoDScrollView can host only one direct child"); + } + super.addView(child, index); + } + + @Override + public void addView(View child, ViewGroup.LayoutParams params) { + if (getChildCount() > 0) { + throw new IllegalStateException("TwoDScrollView can host only one direct child"); + } + super.addView(child, params); + } + + @Override + public void addView(View child, int index, ViewGroup.LayoutParams params) { + if (getChildCount() > 0) { + throw new IllegalStateException("TwoDScrollView can host only one direct child"); + } + super.addView(child, index, params); + } + + /** + * @return Returns true this TwoDScrollView can be scrolled + */ + private boolean canScroll() { + if(!scrollEnabled) + return false; + View child = getChildAt(0); + if (child != null) { + int childHeight = child.getHeight(); + int childWidth = child.getWidth(); + return (getHeight() < childHeight + getPaddingTop() + getPaddingBottom()) || + (getWidth() < childWidth + getPaddingLeft() + getPaddingRight()); + } + return false; + } + + @Override + public boolean dispatchKeyEvent(KeyEvent event) { + // Let the focused view and/or our descendants get the key first + boolean handled = super.dispatchKeyEvent(event); + if (handled) { + return true; + } + return executeKeyEvent(event); + } + + /** + * You can call this function yourself to have the scroll view perform + * scrolling from a key event, just as if the event had been dispatched to + * it by the view hierarchy. + * + * @param event The key event to execute. + * @return Return true if the event was handled, else false. + */ + public boolean executeKeyEvent(KeyEvent event) { + mTempRect.setEmpty(); + if (!canScroll()) { + if (isFocused()) { + View currentFocused = findFocus(); + if (currentFocused == this) currentFocused = null; + View nextFocused = FocusFinder.getInstance().findNextFocus(this, currentFocused, View.FOCUS_DOWN); + return nextFocused != null && nextFocused != this && nextFocused.requestFocus(View.FOCUS_DOWN); + } + return false; + } + boolean handled = false; + if (event.getAction() == KeyEvent.ACTION_DOWN) { + switch (event.getKeyCode()) { + case KeyEvent.KEYCODE_DPAD_UP: + if (!event.isAltPressed()) { + handled = arrowScroll(View.FOCUS_UP, false); + } else { + handled = fullScroll(View.FOCUS_UP, false); + } + break; + case KeyEvent.KEYCODE_DPAD_DOWN: + if (!event.isAltPressed()) { + handled = arrowScroll(View.FOCUS_DOWN, false); + } else { + handled = fullScroll(View.FOCUS_DOWN, false); + } + break; + case KeyEvent.KEYCODE_DPAD_LEFT: + if (!event.isAltPressed()) { + handled = arrowScroll(View.FOCUS_LEFT, true); + } else { + handled = fullScroll(View.FOCUS_LEFT, true); + } + break; + case KeyEvent.KEYCODE_DPAD_RIGHT: + if (!event.isAltPressed()) { + handled = arrowScroll(View.FOCUS_RIGHT, true); + } else { + handled = fullScroll(View.FOCUS_RIGHT, true); + } + break; + } + } + return handled; + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent ev) { + /* + * This method JUST determines whether we want to intercept the motion. + * If we return true, onMotionEvent will be called and we do the actual + * scrolling there. + * + * Shortcut the most recurring case: the user is in the dragging + * state and he is moving his finger. We want to intercept this + * motion. + */ + final int action = ev.getAction(); + if ((action == MotionEvent.ACTION_MOVE) && (mIsBeingDragged)) { + return true; + } + if (!canScroll()) { + mIsBeingDragged = false; + return false; + } + final float y = ev.getY(); + final float x = ev.getX(); + switch (action) { + case MotionEvent.ACTION_MOVE: + /* + * mIsBeingDragged == false, otherwise the shortcut would have caught it. Check + * whether the user has moved far enough from his original down touch. + */ + /* + * Locally do absolute value. mLastMotionY is set to the y value + * of the down event. + */ + final int yDiff = (int) Math.abs(y - mLastMotionY); + final int xDiff = (int) Math.abs(x - mLastMotionX); + if (yDiff > mTouchSlop || xDiff > mTouchSlop) { + mIsBeingDragged = true; + } + break; + + case MotionEvent.ACTION_DOWN: + /* Remember location of down touch */ + mLastMotionY = y; + mLastMotionX = x; + + /* + * If being flinged and user touches the screen, initiate drag; + * otherwise don't. mScroller.isFinished should be false when + * being flinged. + */ + mIsBeingDragged = !mScroller.isFinished(); + break; + + case MotionEvent.ACTION_CANCEL: + case MotionEvent.ACTION_UP: + /* Release the drag */ + mIsBeingDragged = false; + break; + } + + /* + * The only time we want to intercept motion events is if we are in the + * drag mode. + */ + return mIsBeingDragged; + } + + @Override + public boolean onTouchEvent(MotionEvent ev) { + + if (ev.getAction() == MotionEvent.ACTION_DOWN && ev.getEdgeFlags() != 0) { + // Don't handle edge touches immediately -- they may actually belong to one of our + // descendants. + return false; + } + + if (!canScroll()) { + return false; + } + + if (mVelocityTracker == null) { + mVelocityTracker = VelocityTracker.obtain(); + } + mVelocityTracker.addMovement(ev); + + final int action = ev.getAction(); + final float y = ev.getY(); + final float x = ev.getX(); + + switch (action) { + case MotionEvent.ACTION_DOWN: + /* + * If being flinged and user touches, stop the fling. isFinished + * will be false if being flinged. + */ + if (!mScroller.isFinished()) { + mScroller.abortAnimation(); + } + + // Remember where the motion event started + mLastMotionY = y; + mLastMotionX = x; + break; + case MotionEvent.ACTION_MOVE: + // Scroll to follow the motion event + int deltaX = (int) (mLastMotionX - x); + int deltaY = (int) (mLastMotionY - y); + mLastMotionX = x; + mLastMotionY = y; + + if (deltaX < 0) { + if (getScrollX() < 0) { + deltaX = 0; + } + } else if (deltaX > 0) { + final int rightEdge = getWidth() - getPaddingRight(); + final int availableToScroll = getChildAt(0).getRight() - getScrollX() - rightEdge; + if (availableToScroll > 0) { + deltaX = Math.min(availableToScroll, deltaX); + } else { + deltaX = 0; + } + } + if (deltaY < 0) { + if (getScrollY() < 0) { + deltaY = 0; + } + } else if (deltaY > 0) { + final int bottomEdge = getHeight() - getPaddingBottom(); + final int availableToScroll = getChildAt(0).getBottom() - getScrollY() - bottomEdge; + if (availableToScroll > 0) { + deltaY = Math.min(availableToScroll, deltaY); + } else { + deltaY = 0; + } + } + if (deltaY != 0 || deltaX != 0) + scrollBy(deltaX, deltaY); + break; + case MotionEvent.ACTION_UP: + final VelocityTracker velocityTracker = mVelocityTracker; + velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity); + int initialXVelocity = (int) velocityTracker.getXVelocity(); + int initialYVelocity = (int) velocityTracker.getYVelocity(); + if ((Math.abs(initialXVelocity) + Math.abs(initialYVelocity) > mMinimumVelocity) && getChildCount() > 0) { + fling(-initialXVelocity, -initialYVelocity); + } + if (mVelocityTracker != null) { + mVelocityTracker.recycle(); + mVelocityTracker = null; + } + } + return true; + } + + /** + * Finds the next focusable component that fits in this View's bounds + * (excluding fading edges) pretending that this View's top is located at + * the parameter top. + * + * @param topFocus look for a candidate is the one at the top of the bounds + * if topFocus is true, or at the bottom of the bounds if topFocus is + * false + * @param top the top offset of the bounds in which a focusable must be + * found (the fading edge is assumed to start at this position) + * @param preferredFocusable the View that has highest priority and will be + * returned if it is within my bounds (null is valid) + * @return the next focusable component in the bounds or null if none can be + * found + */ + private View findFocusableViewInMyBounds(final boolean topFocus, final int top, final boolean leftFocus, final int left, View preferredFocusable) { + /* + * The fading edge's transparent side should be considered for focus + * since it's mostly visible, so we divide the actual fading edge length + * by 2. + */ + final int verticalFadingEdgeLength = getVerticalFadingEdgeLength() / 2; + final int topWithoutFadingEdge = top + verticalFadingEdgeLength; + final int bottomWithoutFadingEdge = top + getHeight() - verticalFadingEdgeLength; + final int horizontalFadingEdgeLength = getHorizontalFadingEdgeLength() / 2; + final int leftWithoutFadingEdge = left + horizontalFadingEdgeLength; + final int rightWithoutFadingEdge = left + getWidth() - horizontalFadingEdgeLength; + + if ((preferredFocusable != null) + && (preferredFocusable.getTop() < bottomWithoutFadingEdge) + && (preferredFocusable.getBottom() > topWithoutFadingEdge) + && (preferredFocusable.getLeft() < rightWithoutFadingEdge) + && (preferredFocusable.getRight() > leftWithoutFadingEdge)) { + return preferredFocusable; + } + return findFocusableViewInBounds(topFocus, topWithoutFadingEdge, bottomWithoutFadingEdge, leftFocus, leftWithoutFadingEdge, rightWithoutFadingEdge); + } + + /** + * Finds the next focusable component that fits in the specified bounds. + *
+ * + * @param topFocus look for a candidate is the one at the top of the bounds + * if topFocus is true, or at the bottom of the bounds if topFocus is + * false + * @param top the top offset of the bounds in which a focusable must be + * found + * @param bottom the bottom offset of the bounds in which a focusable must + * be found + * @return the next focusable component in the bounds or null if none can + * be found + */ + private View findFocusableViewInBounds(boolean topFocus, int top, int bottom, boolean leftFocus, int left, int right) { + ListHandles scrolling in response to a "home/end" shortcut press. This + * method will scroll the view to the top or bottom and give the focus + * to the topmost/bottommost component in the new visible area. If no + * component is a good candidate for focus, this scrollview reclaims the + * focus.
+ * + * @param direction the scroll direction: {@link android.view.View#FOCUS_UP} + * to go the top of the view or + * {@link android.view.View#FOCUS_DOWN} to go the bottom + * @return true if the key event is consumed by this method, false otherwise + */ + public boolean fullScroll(int direction, boolean horizontal) { + if (!horizontal) { + boolean down = direction == View.FOCUS_DOWN; + int height = getHeight(); + mTempRect.top = 0; + mTempRect.bottom = height; + if (down) { + int count = getChildCount(); + if (count > 0) { + View view = getChildAt(count - 1); + mTempRect.bottom = view.getBottom(); + mTempRect.top = mTempRect.bottom - height; + } + } + return scrollAndFocus(direction, mTempRect.top, mTempRect.bottom, 0, 0, 0); + } else { + boolean right = direction == View.FOCUS_DOWN; + int width = getWidth(); + mTempRect.left = 0; + mTempRect.right = width; + if (right) { + int count = getChildCount(); + if (count > 0) { + View view = getChildAt(count - 1); + mTempRect.right = view.getBottom(); + mTempRect.left = mTempRect.right - width; + } + } + return scrollAndFocus(0, 0, 0, direction, mTempRect.top, mTempRect.bottom); + } + } + + /** + *Scrolls the view to make the area defined by top and
+ * bottom visible. This method attempts to give the focus
+ * to a component visible in this area. If no component can be focused in
+ * the new visible area, the focus is reclaimed by this scrollview.
The scroll range of a scroll view is the overall height of all of its + * children.
+ */ + @Override + protected int computeVerticalScrollRange() { + int count = getChildCount(); + return count == 0 ? getHeight() : (getChildAt(0)).getBottom(); + } + @Override + protected int computeHorizontalScrollRange() { + int count = getChildCount(); + return count == 0 ? getWidth() : (getChildAt(0)).getRight(); + } + + @Override + protected void measureChild(View child, int parentWidthMeasureSpec, int parentHeightMeasureSpec) { + ViewGroup.LayoutParams lp = child.getLayoutParams(); + int childWidthMeasureSpec; + int childHeightMeasureSpec; + + childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec, getPaddingLeft() + getPaddingRight(), lp.width); + childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); + + child.measure(childWidthMeasureSpec, childHeightMeasureSpec); + } + + @Override + protected void measureChildWithMargins(View child, int parentWidthMeasureSpec, int widthUsed, int parentHeightMeasureSpec, int heightUsed) { + final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams(); + final int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(lp.leftMargin + lp.rightMargin, MeasureSpec.UNSPECIFIED); + final int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(lp.topMargin + lp.bottomMargin, MeasureSpec.UNSPECIFIED); + + child.measure(childWidthMeasureSpec, childHeightMeasureSpec); + } + + @Override + public void computeScroll() { + if (mScroller.computeScrollOffset()) { + // This is called at drawing time by ViewGroup. We don't want to + // re-show the scrollbars at this point, which scrollTo will do, + // so we replicate most of scrollTo here. + // + // It's a little odd to call onScrollChanged from inside the drawing. + // + // It is, except when you remember that computeScroll() is used to + // animate scrolling. So unless we want to defer the onScrollChanged() + // until the end of the animated scrolling, we don't really have a + // choice here. + // + // I agree. The alternative, which I think would be worse, is to post + // something and tell the subclasses later. This is bad because there + // will be a window where mScrollX/Y is different from what the app + // thinks it is. + // + int oldX = getScrollX(); + int oldY = getScrollY(); + int x = mScroller.getCurrX(); + int y = mScroller.getCurrY(); + if (getChildCount() > 0) { + View child = getChildAt(0); + scrollTo(clamp(x, getWidth() - getPaddingRight() - getPaddingLeft(), child.getWidth()), + clamp(y, getHeight() - getPaddingBottom() - getPaddingTop(), child.getHeight())); + } else { + scrollTo(x, y); + } + if (oldX != getScrollX() || oldY != getScrollY()) { + onScrollChanged(getScrollX(), getScrollY(), oldX, oldY); + } + + // Keep on drawing until the animation has finished. + postInvalidate(); + } + } + + /** + * Scrolls the view to the given child. + * + * @param child the View to scroll to + */ + private void scrollToChild(View child) { + child.getDrawingRect(mTempRect); + /* Offset from child's local coordinates to TwoDScrollView coordinates */ + offsetDescendantRectToMyCoords(child, mTempRect); + int scrollDelta = computeScrollDeltaToGetChildRectOnScreen(mTempRect); + if (scrollDelta != 0) { + scrollBy(0, scrollDelta); + } + } + + /** + * If rect is off screen, scroll just enough to get it (or at least the + * first screen size chunk of it) on screen. + * + * @param rect The rectangle. + * @param immediate True to scroll immediately without animation + * @return true if scrolling was performed + */ + private boolean scrollToChildRect(Rect rect, boolean immediate) { + final int delta = computeScrollDeltaToGetChildRectOnScreen(rect); + final boolean scroll = delta != 0; + if (scroll) { + if (immediate) { + scrollBy(0, delta); + } else { + smoothScrollBy(0, delta); + } + } + return scroll; + } + + /** + * Compute the amount to scroll in the Y direction in order to get + * a rectangle completely on the screen (or, if taller than the screen, + * at least the first screen size chunk of it). + * + * @param rect The rect. + * @return The scroll delta. + */ + protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) { + if (getChildCount() == 0) return 0; + int height = getHeight(); + int screenTop = getScrollY(); + int screenBottom = screenTop + height; + int fadingEdge = getVerticalFadingEdgeLength(); + // leave room for top fading edge as long as rect isn't at very top + if (rect.top > 0) { + screenTop += fadingEdge; + } + + // leave room for bottom fading edge as long as rect isn't at very bottom + if (rect.bottom < getChildAt(0).getHeight()) { + screenBottom -= fadingEdge; + } + int scrollYDelta = 0; + if (rect.bottom > screenBottom && rect.top > screenTop) { + // need to move down to get it in view: move down just enough so + // that the entire rectangle is in view (or at least the first + // screen size chunk). + if (rect.height() > height) { + // just enough to get screen size chunk on + scrollYDelta += (rect.top - screenTop); + } else { + // get entire rect at bottom of screen + scrollYDelta += (rect.bottom - screenBottom); + } + + // make sure we aren't scrolling beyond the end of our content + int bottom = getChildAt(0).getBottom(); + int distanceToBottom = bottom - screenBottom; + scrollYDelta = Math.min(scrollYDelta, distanceToBottom); + + } else if (rect.top < screenTop && rect.bottom < screenBottom) { + // need to move up to get it in view: move up just enough so that + // entire rectangle is in view (or at least the first screen + // size chunk of it). + + if (rect.height() > height) { + // screen size chunk + scrollYDelta -= (screenBottom - rect.bottom); + } else { + // entire rect at top + scrollYDelta -= (screenTop - rect.top); + } + + // make sure we aren't scrolling any further than the top our content + scrollYDelta = Math.max(scrollYDelta, -getScrollY()); + } + return scrollYDelta; + } + + @Override + public void requestChildFocus(View child, View focused) { + if (!mTwoDScrollViewMovedFocus) { + if (!mIsLayoutDirty) { + scrollToChild(focused); + } else { + // The child may not be laid out yet, we can't compute the scroll yet + mChildToScrollTo = focused; + } + } + super.requestChildFocus(child, focused); + } + + /** + * When looking for focus in children of a scroll view, need to be a little + * more careful not to give focus to something that is scrolled off screen. + * + * This is more expensive than the default {@link android.view.ViewGroup} + * implementation, otherwise this behavior might have been made the default. + */ + @Override + protected boolean onRequestFocusInDescendants(int direction, Rect previouslyFocusedRect) { + // convert from forward / backward notation to up / down / left / right + // (ugh). + if (direction == View.FOCUS_FORWARD) { + direction = View.FOCUS_DOWN; + } else if (direction == View.FOCUS_BACKWARD) { + direction = View.FOCUS_UP; + } + + final View nextFocus = previouslyFocusedRect == null ? + FocusFinder.getInstance().findNextFocus(this, null, direction) : + FocusFinder.getInstance().findNextFocusFromRect(this, + previouslyFocusedRect, direction); + + if (nextFocus == null) { + return false; + } + + return nextFocus.requestFocus(direction, previouslyFocusedRect); + } + + @Override + public boolean requestChildRectangleOnScreen(View child, Rect rectangle, boolean immediate) { + // offset into coordinate space of this scroll view + rectangle.offset(child.getLeft() - child.getScrollX(), child.getTop() - child.getScrollY()); + return scrollToChildRect(rectangle, immediate); + } + + @Override + public void requestLayout() { + mIsLayoutDirty = true; + super.requestLayout(); + } + + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + super.onLayout(changed, l, t, r, b); + mIsLayoutDirty = false; + // Give a child focus if it needs it + if (mChildToScrollTo != null && isViewDescendantOf(mChildToScrollTo, this)) { + scrollToChild(mChildToScrollTo); + } + mChildToScrollTo = null; + + // Calling this with the present values causes it to re-clam them + scrollTo(getScrollX(), getScrollY()); + } + + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + + View currentFocused = findFocus(); + if (null == currentFocused || this == currentFocused) + return; + + // If the currently-focused view was visible on the screen when the + // screen was at the old height, then scroll the screen to make that + // view visible with the new screen height. + currentFocused.getDrawingRect(mTempRect); + offsetDescendantRectToMyCoords(currentFocused, mTempRect); + int scrollDeltaX = computeScrollDeltaToGetChildRectOnScreen(mTempRect); + int scrollDeltaY = computeScrollDeltaToGetChildRectOnScreen(mTempRect); + doScroll(scrollDeltaX, scrollDeltaY); + } + + /** + * Return true if child is an descendant of parent, (or equal to the parent). + */ + private boolean isViewDescendantOf(View child, View parent) { + if (child == parent) { + return true; + } + + final ViewParent theParent = child.getParent(); + return (theParent instanceof ViewGroup) && isViewDescendantOf((View) theParent, parent); + } + + /** + * Fling the scroll view + * + * @param velocityY The initial velocity in the Y direction. Positive + * numbers mean that the finger/curor is moving down the screen, + * which means we want to scroll towards the top. + */ + public void fling(int velocityX, int velocityY) { + if (getChildCount() > 0) { + int height = getHeight() - getPaddingBottom() - getPaddingTop(); + int bottom = getChildAt(0).getHeight(); + int width = getWidth() - getPaddingRight() - getPaddingLeft(); + int right = getChildAt(0).getWidth(); + + mScroller.fling(getScrollX(), getScrollY(), velocityX, velocityY, 0, right - width, 0, bottom - height); + + final boolean movingDown = velocityY > 0; + final boolean movingRight = velocityX > 0; + + View newFocused = findFocusableViewInMyBounds(movingRight, mScroller.getFinalX(), movingDown, mScroller.getFinalY(), findFocus()); + if (newFocused == null) { + newFocused = this; + } + + if (newFocused != findFocus() && newFocused.requestFocus(movingDown ? View.FOCUS_DOWN : View.FOCUS_UP)) { + mTwoDScrollViewMovedFocus = true; + mTwoDScrollViewMovedFocus = false; + } + + awakenScrollBars(mScroller.getDuration()); + invalidate(); + } + } + + /** + * {@inheritDoc} + * + *This version also clamps the scrolling to the bounds of our child.
+ */
+ public void scrollTo(int x, int y) {
+ // we rely on the fact the View.scrollBy calls scrollTo.
+ if (getChildCount() > 0) {
+ View child = getChildAt(0);
+ x = clamp(x, getWidth() - getPaddingRight() - getPaddingLeft(), child.getWidth());
+ y = clamp(y, getHeight() - getPaddingBottom() - getPaddingTop(), child.getHeight());
+ if (x != getScrollX() || y != getScrollY()) {
+ super.scrollTo(x, y);
+ }
+ }
+ }
+
+ private int clamp(int n, int my, int child) {
+ if (my >= child || n < 0) {
+ /* my >= child is this case:
+ * |--------------- me ---------------|
+ * |------ child ------|
+ * or
+ * |--------------- me ---------------|
+ * |------ child ------|
+ * or
+ * |--------------- me ---------------|
+ * |------ child ------|
+ *
+ * n < 0 is this case:
+ * |------ me ------|
+ * |-------- child --------|
+ * |-- mScrollX --|
+ */
+ return 0;
+ }
+ if ((my+n) > child) {
+ /* this case:
+ * |------ me ------|
+ * |------ child ------|
+ * |-- mScrollX --|
+ */
+ return child-my;
+ }
+ return n;
+ }
+
+ public void setScrollViewListener(ScrollView2DListener scrollViewListener) {
+ this.scrollView2DListener = scrollViewListener;
+ }
+
+ @Override
+ protected void onScrollChanged(int x, int y, int oldx, int oldy) {
+ super.onScrollChanged(x, y, oldx, oldy);
+ if(scrollView2DListener != null) {
+ scrollView2DListener.onScrollChanged(this, x, y, oldx, oldy);
+ }
+ }
+
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/SessionActivity.java b/client/Android/src/com/freerdp/afreerdp/presentation/SessionActivity.java
new file mode 100644
index 000000000..eef2c3d65
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/presentation/SessionActivity.java
@@ -0,0 +1,1137 @@
+/*
+ Android Session Activity
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.presentation;
+
+import java.util.Iterator;
+import java.util.List;
+
+import com.freerdp.afreerdp.R;
+import com.freerdp.afreerdp.application.GlobalApp;
+import com.freerdp.afreerdp.application.GlobalSettings;
+import com.freerdp.afreerdp.application.SessionState;
+import com.freerdp.afreerdp.domain.BookmarkBase;
+import com.freerdp.afreerdp.domain.ConnectionReference;
+import com.freerdp.afreerdp.domain.ManualBookmark;
+import com.freerdp.afreerdp.services.LibFreeRDP;
+import com.freerdp.afreerdp.utils.KeyboardMapper;
+import com.freerdp.afreerdp.utils.Mouse;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.ScaleGestureDetector;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.Toast;
+import android.widget.ZoomControls;
+import android.inputmethodservice.Keyboard;
+import android.inputmethodservice.KeyboardView;
+
+
+public class SessionActivity extends Activity
+ implements LibFreeRDP.UIEventListener, KeyboardView.OnKeyboardActionListener, ScrollView2D.ScrollView2DListener,
+ KeyboardMapper.KeyProcessingListener, SessionView.SessionViewListener, TouchPointerView.TouchPointerListener
+{
+ private class UIHandler extends Handler {
+
+ public static final int REFRESH_SESSIONVIEW = 1;
+ public static final int DISPLAY_TOAST = 2;
+ public static final int HIDE_ZOOMCONTROLS = 3;
+ public static final int SEND_MOVE_EVENT = 4;
+ public static final int SHOW_DIALOG = 5;
+ public static final int GRAPHICS_CHANGED = 6;
+ public static final int SCROLLING_REQUESTED = 7;
+
+ UIHandler() {
+ super();
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ switch(msg.what)
+ {
+ case GRAPHICS_CHANGED:
+ {
+ sessionView.onSurfaceChange(session);
+ scrollView.requestLayout();
+ break;
+ }
+ case REFRESH_SESSIONVIEW:
+ {
+ sessionView.invalidateRegion();
+ break;
+ }
+ case DISPLAY_TOAST:
+ {
+ Toast errorToast = Toast.makeText(getApplicationContext(), msg.obj.toString(), Toast.LENGTH_LONG);
+ errorToast.show();
+ break;
+ }
+ case HIDE_ZOOMCONTROLS:
+ {
+ zoomControls.hide();
+ break;
+ }
+ case SEND_MOVE_EVENT:
+ {
+ LibFreeRDP.sendCursorEvent(session.getInstance(), msg.arg1, msg.arg2, Mouse.getMoveEvent());
+ break;
+ }
+ case SHOW_DIALOG:
+ {
+ // create and show the dialog
+ ((Dialog)msg.obj).show();
+ break;
+ }
+ case SCROLLING_REQUESTED:
+ {
+ int scrollX = 0;
+ int scrollY = 0;
+ float[] pointerPos = touchPointerView.getPointerPosition();
+
+ if (pointerPos[0] > (screen_width - touchPointerView.getPointerWidth()))
+ scrollX = SCROLLING_DISTANCE;
+ else if (pointerPos[0] < 0)
+ scrollX = -SCROLLING_DISTANCE;
+
+ if (pointerPos[1] > (screen_height - touchPointerView.getPointerHeight()))
+ scrollY = SCROLLING_DISTANCE;
+ else if (pointerPos[1] < 0)
+ scrollY = -SCROLLING_DISTANCE;
+
+ scrollView.scrollBy(scrollX, scrollY);
+
+ // see if we reached the min/max scroll positions
+ if (scrollView.getScrollX() == 0 || scrollView.getScrollX() == (sessionView.getWidth() - scrollView.getWidth()))
+ scrollX = 0;
+ if (scrollView.getScrollY() == 0 || scrollView.getScrollY() == (sessionView.getHeight() - scrollView.getHeight()))
+ scrollY = 0;
+
+ if (scrollX != 0 || scrollY != 0)
+ uiHandler.sendEmptyMessageDelayed(SCROLLING_REQUESTED, SCROLLING_TIMEOUT);
+ else
+ Log.v(TAG, "Stopping auto-scroll");
+ break;
+ }
+ }
+ }
+ }
+
+ private class PinchZoomListener extends ScaleGestureDetector.SimpleOnScaleGestureListener
+ {
+ private float scaleFactor = 1.0f;
+
+ @Override
+ public boolean onScaleBegin(ScaleGestureDetector detector) {
+ scrollView.setScrollEnabled(false);
+ return true;
+ }
+
+ @Override
+ public boolean onScale(ScaleGestureDetector detector) {
+
+ // calc scale factor
+ scaleFactor *= detector.getScaleFactor();
+ scaleFactor = Math.max(SessionView.MIN_SCALE_FACTOR, Math.min(scaleFactor, SessionView.MAX_SCALE_FACTOR));
+ sessionView.setZoom(scaleFactor);
+
+ if(!sessionView.isAtMinZoom() && !sessionView.isAtMaxZoom())
+ {
+ // transform scroll origin to the new zoom space
+ float transOriginX = scrollView.getScrollX() * detector.getScaleFactor();
+ float transOriginY = scrollView.getScrollY() * detector.getScaleFactor();
+
+ // transform center point to the zoomed space
+ float transCenterX = (scrollView.getScrollX() + detector.getFocusX()) * detector.getScaleFactor();
+ float transCenterY = (scrollView.getScrollY() + detector.getFocusY()) * detector.getScaleFactor();
+
+ // scroll by the difference between the distance of the transformed center/origin point and their old distance (focusX/Y)
+ scrollView.scrollBy((int)((transCenterX - transOriginX) - detector.getFocusX()), (int)((transCenterY - transOriginY) - detector.getFocusY()));
+ }
+
+ return true;
+ }
+
+ @Override
+ public void onScaleEnd(ScaleGestureDetector de)
+ {
+ scrollView.setScrollEnabled(true);
+ }
+ }
+
+ private class LibFreeRDPBroadcastReceiver extends BroadcastReceiver
+ {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ // still got a valid session?
+ if (session == null)
+ return;
+
+ // is this event for the current session?
+ if (session.getInstance() != intent.getExtras().getInt(GlobalApp.EVENT_PARAM, -1))
+ return;
+
+ switch(intent.getExtras().getInt(GlobalApp.EVENT_TYPE, -1))
+ {
+ case GlobalApp.FREERDP_EVENT_CONNECTION_SUCCESS:
+ OnConnectionSuccess(context);
+ break;
+
+ case GlobalApp.FREERDP_EVENT_CONNECTION_FAILURE:
+ OnConnectionFailure(context);
+ break;
+ case GlobalApp.FREERDP_EVENT_DISCONNECTED:
+ OnDisconnected(context);
+ break;
+ }
+ }
+
+ private void OnConnectionSuccess(Context context)
+ {
+ Log.v(TAG, "OnConnectionSuccess");
+
+ // bind session
+ bindSession();
+
+ if(progressDialog != null)
+ {
+ progressDialog.dismiss();
+ progressDialog = null;
+ }
+
+ // add hostname to history if quick connect was used
+ Bundle bundle = getIntent().getExtras();
+ if(bundle != null && bundle.containsKey(PARAM_CONNECTION_REFERENCE))
+ {
+ if(ConnectionReference.isHostnameReference(bundle.getString(PARAM_CONNECTION_REFERENCE)))
+ {
+ assert session.getBookmark().getType() == BookmarkBase.TYPE_MANUAL;
+ String item = session.getBookmark().
+ * Unlike {@link OnGestureListener#onSingleTapUp(MotionEvent)}, this
+ * will only be called after the detector is confident that the user's
+ * first tap is not followed by a second tap leading to a double-tap
+ * gesture.
+ *
+ * @param e The down motion event of the single-tap.
+ * @return true if the event is consumed, else false
+ */
+ boolean onSingleTapConfirmed(MotionEvent e);
+
+ /**
+ * Notified when a double-tap occurs.
+ *
+ * @param e The down motion event of the first tap of the double-tap.
+ * @return true if the event is consumed, else false
+ */
+ boolean onDoubleTap(MotionEvent e);
+
+ /**
+ * Notified when an event within a double-tap gesture occurs, including
+ * the down, move, and up events.
+ *
+ * @param e The motion event that occurred during the double-tap gesture.
+ * @return true if the event is consumed, else false
+ */
+ boolean onDoubleTapEvent(MotionEvent e);
+ }
+
+ /**
+ * A convenience class to extend when you only want to listen for a subset
+ * of all the gestures. This implements all methods in the
+ * {@link OnGestureListener} and {@link OnDoubleTapListener} but does
+ * nothing and return {@code false} for all applicable methods.
+ */
+ public static class SimpleOnGestureListener implements OnGestureListener, OnDoubleTapListener {
+ public boolean onSingleTapUp(MotionEvent e) {
+ return false;
+ }
+
+ public void onLongPress(MotionEvent e) {
+ }
+
+ public void onLongPressUp(MotionEvent e) {
+ }
+
+ public boolean onScroll(MotionEvent e1, MotionEvent e2,
+ float distanceX, float distanceY) {
+ return false;
+ }
+
+ public void onShowPress(MotionEvent e) {
+ }
+
+ public boolean onDown(MotionEvent e) {
+ return false;
+ }
+
+ public boolean onUp(MotionEvent e) {
+ return false;
+ }
+
+ public boolean onDoubleTap(MotionEvent e) {
+ return false;
+ }
+
+ public boolean onDoubleTapEvent(MotionEvent e) {
+ return false;
+ }
+
+ public boolean onSingleTapConfirmed(MotionEvent e) {
+ return false;
+ }
+ }
+
+ private int mTouchSlopSquare;
+ private int mLargeTouchSlopSquare;
+ private int mDoubleTapSlopSquare;
+
+ private int mLongpressTimeout = 100;
+ private static final int TAP_TIMEOUT = 100;
+ private static final int DOUBLE_TAP_TIMEOUT = 200;
+
+ // Distance a touch can wander before we think the user is the first touch in a sequence of double tap
+ private static final int LARGE_TOUCH_SLOP = 18;
+
+ // Distance between the first touch and second touch to still be considered a double tap
+ private static final int DOUBLE_TAP_SLOP = 100;
+
+ // constants for Message.what used by GestureHandler below
+ private static final int SHOW_PRESS = 1;
+ private static final int LONG_PRESS = 2;
+ private static final int TAP = 3;
+
+ private final Handler mHandler;
+ private final OnGestureListener mListener;
+ private OnDoubleTapListener mDoubleTapListener;
+
+ private boolean mStillDown;
+ private boolean mInLongPress;
+ private boolean mAlwaysInTapRegion;
+ private boolean mAlwaysInBiggerTapRegion;
+
+ private MotionEvent mCurrentDownEvent;
+ private MotionEvent mPreviousUpEvent;
+
+ /**
+ * True when the user is still touching for the second tap (down, move, and
+ * up events). Can only be true if there is a double tap listener attached.
+ */
+ private boolean mIsDoubleTapping;
+
+ private float mLastMotionY;
+ private float mLastMotionX;
+
+ private boolean mIsLongpressEnabled;
+
+ /**
+ * True if we are at a target API level of >= Froyo or the developer can
+ * explicitly set it. If true, input events with > 1 pointer will be ignored
+ * so we can work side by side with multitouch gesture detectors.
+ */
+ private boolean mIgnoreMultitouch;
+
+ private class GestureHandler extends Handler {
+ GestureHandler() {
+ super();
+ }
+
+ GestureHandler(Handler handler) {
+ super(handler.getLooper());
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case SHOW_PRESS:
+ mListener.onShowPress(mCurrentDownEvent);
+ break;
+
+ case LONG_PRESS:
+ dispatchLongPress();
+ break;
+
+ case TAP:
+ // If the user's finger is still down, do not count it as a tap
+ if (mDoubleTapListener != null && !mStillDown) {
+ mDoubleTapListener.onSingleTapConfirmed(mCurrentDownEvent);
+ }
+ break;
+
+ default:
+ throw new RuntimeException("Unknown message " + msg); //never
+ }
+ }
+ }
+
+ /**
+ * Creates a GestureDetector with the supplied listener.
+ * You may only use this constructor from a UI thread (this is the usual situation).
+ * @see android.os.Handler#Handler()
+ *
+ * @param context the application's context
+ * @param listener the listener invoked for all the callbacks, this must
+ * not be null.
+ *
+ * @throws NullPointerException if {@code listener} is null.
+ */
+ public GestureDetector(Context context, OnGestureListener listener) {
+ this(context, listener, null);
+ }
+
+ /**
+ * Creates a GestureDetector with the supplied listener.
+ * You may only use this constructor from a UI thread (this is the usual situation).
+ * @see android.os.Handler#Handler()
+ *
+ * @param context the application's context
+ * @param listener the listener invoked for all the callbacks, this must
+ * not be null.
+ * @param handler the handler to use
+ *
+ * @throws NullPointerException if {@code listener} is null.
+ */
+ public GestureDetector(Context context, OnGestureListener listener, Handler handler) {
+ this(context, listener, handler, context != null &&
+ context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.FROYO);
+ }
+
+ /**
+ * Creates a GestureDetector with the supplied listener.
+ * You may only use this constructor from a UI thread (this is the usual situation).
+ * @see android.os.Handler#Handler()
+ *
+ * @param context the application's context
+ * @param listener the listener invoked for all the callbacks, this must
+ * not be null.
+ * @param handler the handler to use
+ * @param ignoreMultitouch whether events involving more than one pointer should
+ * be ignored.
+ *
+ * @throws NullPointerException if {@code listener} is null.
+ */
+ public GestureDetector(Context context, OnGestureListener listener, Handler handler,
+ boolean ignoreMultitouch) {
+ if (handler != null) {
+ mHandler = new GestureHandler(handler);
+ } else {
+ mHandler = new GestureHandler();
+ }
+ mListener = listener;
+ if (listener instanceof OnDoubleTapListener) {
+ setOnDoubleTapListener((OnDoubleTapListener) listener);
+ }
+ init(context, ignoreMultitouch);
+ }
+
+ private void init(Context context, boolean ignoreMultitouch) {
+ if (mListener == null) {
+ throw new NullPointerException("OnGestureListener must not be null");
+ }
+ mIsLongpressEnabled = true;
+ mIgnoreMultitouch = ignoreMultitouch;
+
+ // Fallback to support pre-donuts releases
+ int touchSlop, largeTouchSlop, doubleTapSlop;
+ if (context == null) {
+ //noinspection deprecation
+ touchSlop = ViewConfiguration.getTouchSlop();
+ largeTouchSlop = touchSlop + 2;
+ doubleTapSlop = DOUBLE_TAP_SLOP;
+ } else {
+ final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+ final float density = metrics.density;
+ final ViewConfiguration configuration = ViewConfiguration.get(context);
+ touchSlop = configuration.getScaledTouchSlop();
+ largeTouchSlop = (int) (density * LARGE_TOUCH_SLOP + 0.5f);
+ doubleTapSlop = configuration.getScaledDoubleTapSlop();
+ }
+ mTouchSlopSquare = touchSlop * touchSlop;
+ mLargeTouchSlopSquare = largeTouchSlop * largeTouchSlop;
+ mDoubleTapSlopSquare = doubleTapSlop * doubleTapSlop;
+ }
+
+ /**
+ * Sets the listener which will be called for double-tap and related
+ * gestures.
+ *
+ * @param onDoubleTapListener the listener invoked for all the callbacks, or
+ * null to stop listening for double-tap gestures.
+ */
+ public void setOnDoubleTapListener(OnDoubleTapListener onDoubleTapListener) {
+ mDoubleTapListener = onDoubleTapListener;
+ }
+
+ /**
+ * Set whether longpress is enabled, if this is enabled when a user
+ * presses and holds down you get a longpress event and nothing further.
+ * If it's disabled the user can press and hold down and then later
+ * moved their finger and you will get scroll events. By default
+ * longpress is enabled.
+ *
+ * @param isLongpressEnabled whether longpress should be enabled.
+ */
+ public void setIsLongpressEnabled(boolean isLongpressEnabled) {
+ mIsLongpressEnabled = isLongpressEnabled;
+ }
+
+ /**
+ * @return true if longpress is enabled, else false.
+ */
+ public boolean isLongpressEnabled() {
+ return mIsLongpressEnabled;
+ }
+
+ public void setLongPressTimeout(int timeout) {
+ mLongpressTimeout = timeout;
+ }
+
+ /**
+ * Analyzes the given motion event and if applicable triggers the
+ * appropriate callbacks on the {@link OnGestureListener} supplied.
+ *
+ * @param ev The current motion event.
+ * @return true if the {@link OnGestureListener} consumed the event,
+ * else false.
+ */
+ public boolean onTouchEvent(MotionEvent ev) {
+ final int action = ev.getAction();
+ final float y = ev.getY();
+ final float x = ev.getX();
+
+ boolean handled = false;
+
+ switch (action & MotionEvent.ACTION_MASK) {
+ case MotionEvent.ACTION_POINTER_DOWN:
+ if (mIgnoreMultitouch) {
+ // Multitouch event - abort.
+ cancel();
+ }
+ break;
+
+ case MotionEvent.ACTION_POINTER_UP:
+ // Ending a multitouch gesture and going back to 1 finger
+ if (mIgnoreMultitouch && ev.getPointerCount() == 2) {
+ int index = (((action & MotionEvent.ACTION_POINTER_INDEX_MASK)
+ >> MotionEvent.ACTION_POINTER_INDEX_SHIFT) == 0) ? 1 : 0;
+ mLastMotionX = ev.getX(index);
+ mLastMotionY = ev.getY(index);
+ }
+ break;
+
+ case MotionEvent.ACTION_DOWN:
+ if (mDoubleTapListener != null) {
+ boolean hadTapMessage = mHandler.hasMessages(TAP);
+ if (hadTapMessage) mHandler.removeMessages(TAP);
+ if ((mCurrentDownEvent != null) && (mPreviousUpEvent != null) && hadTapMessage &&
+ isConsideredDoubleTap(mCurrentDownEvent, mPreviousUpEvent, ev)) {
+ // This is a second tap
+ mIsDoubleTapping = true;
+ // Give a callback with the first tap of the double-tap
+ handled |= mDoubleTapListener.onDoubleTap(mCurrentDownEvent);
+ // Give a callback with down event of the double-tap
+ handled |= mDoubleTapListener.onDoubleTapEvent(ev);
+ } else {
+ // This is a first tap
+ mHandler.sendEmptyMessageDelayed(TAP, DOUBLE_TAP_TIMEOUT);
+ }
+ }
+
+ mLastMotionX = x;
+ mLastMotionY = y;
+ if (mCurrentDownEvent != null) {
+ mCurrentDownEvent.recycle();
+ }
+ mCurrentDownEvent = MotionEvent.obtain(ev);
+ mAlwaysInTapRegion = true;
+ mAlwaysInBiggerTapRegion = true;
+ mStillDown = true;
+ mInLongPress = false;
+
+ if (mIsLongpressEnabled) {
+ mHandler.removeMessages(LONG_PRESS);
+ mHandler.sendEmptyMessageAtTime(LONG_PRESS, mCurrentDownEvent.getDownTime()
+ + TAP_TIMEOUT + mLongpressTimeout);
+ }
+ mHandler.sendEmptyMessageAtTime(SHOW_PRESS, mCurrentDownEvent.getDownTime() + TAP_TIMEOUT);
+ handled |= mListener.onDown(ev);
+ break;
+
+ case MotionEvent.ACTION_MOVE:
+ if (mIgnoreMultitouch && ev.getPointerCount() > 1) {
+ break;
+ }
+ final float scrollX = mLastMotionX - x;
+ final float scrollY = mLastMotionY - y;
+ if (mIsDoubleTapping) {
+ // Give the move events of the double-tap
+ handled |= mDoubleTapListener.onDoubleTapEvent(ev);
+ } else if (mAlwaysInTapRegion) {
+ final int deltaX = (int) (x - mCurrentDownEvent.getX());
+ final int deltaY = (int) (y - mCurrentDownEvent.getY());
+ int distance = (deltaX * deltaX) + (deltaY * deltaY);
+ if (distance > mTouchSlopSquare) {
+ mLastMotionX = x;
+ mLastMotionY = y;
+ mAlwaysInTapRegion = false;
+ mHandler.removeMessages(TAP);
+ mHandler.removeMessages(SHOW_PRESS);
+ mHandler.removeMessages(LONG_PRESS);
+ }
+ if (distance > mLargeTouchSlopSquare) {
+ mAlwaysInBiggerTapRegion = false;
+ }
+ handled = mListener.onScroll(mCurrentDownEvent, ev, scrollX, scrollY);
+ } else if ((Math.abs(scrollX) >= 1) || (Math.abs(scrollY) >= 1)) {
+ handled = mListener.onScroll(mCurrentDownEvent, ev, scrollX, scrollY);
+ mLastMotionX = x;
+ mLastMotionY = y;
+ }
+ break;
+
+ case MotionEvent.ACTION_UP:
+ mStillDown = false;
+ MotionEvent currentUpEvent = MotionEvent.obtain(ev);
+ if (mIsDoubleTapping) {
+ // Finally, give the up event of the double-tap
+ handled |= mDoubleTapListener.onDoubleTapEvent(ev);
+ } else if (mInLongPress) {
+ mHandler.removeMessages(TAP);
+ mListener.onLongPressUp(ev);
+ mInLongPress = false;
+ } else if (mAlwaysInTapRegion) {
+ handled = mListener.onSingleTapUp(mCurrentDownEvent);
+ } else {
+ // A fling must travel the minimum tap distance
+ }
+ if (mPreviousUpEvent != null) {
+ mPreviousUpEvent.recycle();
+ }
+ // Hold the event we obtained above - listeners may have changed the original.
+ mPreviousUpEvent = currentUpEvent;
+ mIsDoubleTapping = false;
+ mHandler.removeMessages(SHOW_PRESS);
+ mHandler.removeMessages(LONG_PRESS);
+ handled |= mListener.onUp(ev);
+ break;
+ case MotionEvent.ACTION_CANCEL:
+ cancel();
+ break;
+ }
+ return handled;
+ }
+
+ private void cancel() {
+ mHandler.removeMessages(SHOW_PRESS);
+ mHandler.removeMessages(LONG_PRESS);
+ mHandler.removeMessages(TAP);
+ mAlwaysInTapRegion = false; // ensures that we won't receive an OnSingleTap notification when a 2-Finger tap is performed
+ mIsDoubleTapping = false;
+ mStillDown = false;
+ if (mInLongPress) {
+ mInLongPress = false;
+ }
+ }
+
+ private boolean isConsideredDoubleTap(MotionEvent firstDown, MotionEvent firstUp,
+ MotionEvent secondDown) {
+ if (!mAlwaysInBiggerTapRegion) {
+ return false;
+ }
+
+ if (secondDown.getEventTime() - firstUp.getEventTime() > DOUBLE_TAP_TIMEOUT) {
+ return false;
+ }
+
+ int deltaX = (int) firstDown.getX() - (int) secondDown.getX();
+ int deltaY = (int) firstDown.getY() - (int) secondDown.getY();
+ return (deltaX * deltaX + deltaY * deltaY < mDoubleTapSlopSquare);
+ }
+
+ private void dispatchLongPress() {
+ mHandler.removeMessages(TAP);
+ mInLongPress = true;
+ mListener.onLongPress(mCurrentDownEvent);
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/utils/IntEditTextPreference.java b/client/Android/src/com/freerdp/afreerdp/utils/IntEditTextPreference.java
new file mode 100644
index 000000000..4ce494467
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/utils/IntEditTextPreference.java
@@ -0,0 +1,97 @@
+/*
+ EditTextPreference to store/load integer values
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.utils;
+
+import com.freerdp.afreerdp.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.preference.EditTextPreference;
+import android.util.AttributeSet;
+
+public class IntEditTextPreference extends EditTextPreference {
+
+ private int bounds_min, bounds_max, bounds_default;
+
+ public IntEditTextPreference(Context context)
+ {
+ super(context);
+ init(context, null);
+ }
+
+ public IntEditTextPreference(Context context, AttributeSet attrs)
+ {
+ super(context, attrs);
+ init(context, attrs);
+ }
+
+ public IntEditTextPreference(Context context, AttributeSet attrs, int defStyle)
+ {
+ super(context, attrs, defStyle);
+ init(context, attrs);
+ }
+
+ private void init(Context context, AttributeSet attrs)
+ {
+ if (attrs != null)
+ {
+ TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.IntEditTextPreference, 0, 0);
+ bounds_min = array.getInt(R.styleable.IntEditTextPreference_bounds_min, Integer.MIN_VALUE);
+ bounds_max = array.getInt(R.styleable.IntEditTextPreference_bounds_max, Integer.MAX_VALUE);
+ bounds_default = array.getInt(R.styleable.IntEditTextPreference_bounds_default, 0);
+ array.recycle();
+ }
+ else
+ {
+ bounds_min = Integer.MIN_VALUE;
+ bounds_max = Integer.MAX_VALUE;
+ bounds_default = 0;
+ }
+ }
+
+ public void setBounds(int min, int max, int defaultValue)
+ {
+ bounds_min = min;
+ bounds_max = max;
+ bounds_default = defaultValue;
+ }
+
+ @Override
+ protected String getPersistedString(String defaultReturnValue) {
+ int value = getPersistedInt(-1);
+ if (value > bounds_max || value < bounds_min)
+ value = bounds_default;
+ return String.valueOf(value);
+ }
+
+ @Override
+ protected boolean persistString(String value) {
+ return persistInt(Integer.valueOf(value));
+ }
+
+ @Override
+ protected void onDialogClosed(boolean positiveResult)
+ {
+ if (positiveResult)
+ {
+ // prevent exception when an empty value is persisted
+ if (getEditText().getText().length() == 0)
+ getEditText().setText("0");
+
+ // check bounds
+ int value = Integer.valueOf(getEditText().getText().toString());
+ if (value > bounds_max || value < bounds_min)
+ value = bounds_default;
+ getEditText().setText(String.valueOf(value));
+ }
+
+ super.onDialogClosed(positiveResult);
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/utils/IntListPreference.java b/client/Android/src/com/freerdp/afreerdp/utils/IntListPreference.java
new file mode 100644
index 000000000..718a69ae7
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/utils/IntListPreference.java
@@ -0,0 +1,37 @@
+/*
+ ListPreference to store/load integer values
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.utils;
+
+import android.content.Context;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+
+public class IntListPreference extends ListPreference {
+
+ public IntListPreference(Context context)
+ {
+ super(context);
+ }
+
+ public IntListPreference(Context context, AttributeSet attrs)
+ {
+ super(context, attrs);
+ }
+
+ @Override
+ protected String getPersistedString(String defaultReturnValue) {
+ return String.valueOf(getPersistedInt(-1));
+ }
+
+ @Override
+ protected boolean persistString(String value) {
+ return persistInt(Integer.valueOf(value));
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/utils/KeyboardMapper.java b/client/Android/src/com/freerdp/afreerdp/utils/KeyboardMapper.java
new file mode 100644
index 000000000..ae72de873
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/utils/KeyboardMapper.java
@@ -0,0 +1,690 @@
+/*
+ Android Keyboard Mapping
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+
+package com.freerdp.afreerdp.utils;
+
+import com.freerdp.afreerdp.R;
+
+import android.content.Context;
+import android.view.KeyEvent;
+
+public class KeyboardMapper
+{
+ public static final int KEYBOARD_TYPE_FUNCTIONKEYS = 1;
+ public static final int KEYBOARD_TYPE_NUMPAD = 2;
+ public static final int KEYBOARD_TYPE_CURSOR = 3;
+
+ // defines key states for modifier keys - locked means on and no auto-release if an other key is pressed
+ public static final int KEYSTATE_ON = 1;
+ public static final int KEYSTATE_LOCKED = 2;
+ public static final int KEYSTATE_OFF = 3;
+
+ // interface that gets called for input handling
+ public interface KeyProcessingListener {
+ abstract void processVirtualKey(int virtualKeyCode, boolean down);
+ abstract void processUnicodeKey(int unicodeKey);
+ abstract void switchKeyboard(int keyboardType);
+ abstract void modifiersChanged();
+ }
+
+ private KeyProcessingListener listener = null;
+
+ private static int[] keymapAndroid;
+ private static int[] keymapExt;
+ private static boolean initialized = false;
+
+ final static int VK_LBUTTON = 0x01;
+ final static int VK_RBUTTON = 0x02;
+ final static int VK_CANCEL = 0x03;
+ final static int VK_MBUTTON = 0x04;
+ final static int VK_XBUTTON1 = 0x05;
+ final static int VK_XBUTTON2 = 0x06;
+ final static int VK_BACK = 0x08;
+ final static int VK_TAB = 0x09;
+ final static int VK_CLEAR = 0x0C;
+ final static int VK_RETURN = 0x0D;
+ final static int VK_SHIFT = 0x10;
+ final static int VK_CONTROL = 0x11;
+ final static int VK_MENU = 0x12;
+ final static int VK_PAUSE = 0x13;
+ final static int VK_CAPITAL = 0x14;
+ final static int VK_KANA = 0x15;
+ final static int VK_HANGUEL = 0x15;
+ final static int VK_HANGUL = 0x15;
+ final static int VK_JUNJA = 0x17;
+ final static int VK_FINAL = 0x18;
+ final static int VK_HANJA = 0x19;
+ final static int VK_KANJI = 0x19;
+ final static int VK_ESCAPE = 0x1B;
+ final static int VK_CONVERT = 0x1C;
+ final static int VK_NONCONVERT = 0x1D;
+ final static int VK_ACCEPT = 0x1E;
+ final static int VK_MODECHANGE = 0x1F;
+ final static int VK_SPACE = 0x20;
+ final static int VK_PRIOR = 0x21;
+ final static int VK_NEXT = 0x22;
+ final static int VK_END = 0x23;
+ final static int VK_HOME = 0x24;
+ final static int VK_LEFT = 0x25;
+ final static int VK_UP = 0x26;
+ final static int VK_RIGHT = 0x27;
+ final static int VK_DOWN = 0x28;
+ final static int VK_SELECT = 0x29;
+ final static int VK_PRINT = 0x2A;
+ final static int VK_EXECUTE = 0x2B;
+ final static int VK_SNAPSHOT = 0x2C;
+ final static int VK_INSERT = 0x2D;
+ final static int VK_DELETE = 0x2E;
+ final static int VK_HELP = 0x2F;
+ final static int VK_KEY_0 = 0x30;
+ final static int VK_KEY_1 = 0x31;
+ final static int VK_KEY_2 = 0x32;
+ final static int VK_KEY_3 = 0x33;
+ final static int VK_KEY_4 = 0x34;
+ final static int VK_KEY_5 = 0x35;
+ final static int VK_KEY_6 = 0x36;
+ final static int VK_KEY_7 = 0x37;
+ final static int VK_KEY_8 = 0x38;
+ final static int VK_KEY_9 = 0x39;
+ final static int VK_KEY_A = 0x41;
+ final static int VK_KEY_B = 0x42;
+ final static int VK_KEY_C = 0x43;
+ final static int VK_KEY_D = 0x44;
+ final static int VK_KEY_E = 0x45;
+ final static int VK_KEY_F = 0x46;
+ final static int VK_KEY_G = 0x47;
+ final static int VK_KEY_H = 0x48;
+ final static int VK_KEY_I = 0x49;
+ final static int VK_KEY_J = 0x4A;
+ final static int VK_KEY_K = 0x4B;
+ final static int VK_KEY_L = 0x4C;
+ final static int VK_KEY_M = 0x4D;
+ final static int VK_KEY_N = 0x4E;
+ final static int VK_KEY_O = 0x4F;
+ final static int VK_KEY_P = 0x50;
+ final static int VK_KEY_Q = 0x51;
+ final static int VK_KEY_R = 0x52;
+ final static int VK_KEY_S = 0x53;
+ final static int VK_KEY_T = 0x54;
+ final static int VK_KEY_U = 0x55;
+ final static int VK_KEY_V = 0x56;
+ final static int VK_KEY_W = 0x57;
+ final static int VK_KEY_X = 0x58;
+ final static int VK_KEY_Y = 0x59;
+ final static int VK_KEY_Z = 0x5A;
+ final static int VK_LWIN = 0x5B;
+ final static int VK_RWIN = 0x5C;
+ final static int VK_APPS = 0x5D;
+ final static int VK_SLEEP = 0x5F;
+ final static int VK_NUMPAD0 = 0x60;
+ final static int VK_NUMPAD1 = 0x61;
+ final static int VK_NUMPAD2 = 0x62;
+ final static int VK_NUMPAD3 = 0x63;
+ final static int VK_NUMPAD4 = 0x64;
+ final static int VK_NUMPAD5 = 0x65;
+ final static int VK_NUMPAD6 = 0x66;
+ final static int VK_NUMPAD7 = 0x67;
+ final static int VK_NUMPAD8 = 0x68;
+ final static int VK_NUMPAD9 = 0x69;
+ final static int VK_MULTIPLY = 0x6A;
+ final static int VK_ADD = 0x6B;
+ final static int VK_SEPARATOR = 0x6C;
+ final static int VK_SUBTRACT = 0x6D;
+ final static int VK_DECIMAL = 0x6E;
+ final static int VK_DIVIDE = 0x6F;
+ final static int VK_F1 = 0x70;
+ final static int VK_F2 = 0x71;
+ final static int VK_F3 = 0x72;
+ final static int VK_F4 = 0x73;
+ final static int VK_F5 = 0x74;
+ final static int VK_F6 = 0x75;
+ final static int VK_F7 = 0x76;
+ final static int VK_F8 = 0x77;
+ final static int VK_F9 = 0x78;
+ final static int VK_F10 = 0x79;
+ final static int VK_F11 = 0x7A;
+ final static int VK_F12 = 0x7B;
+ final static int VK_F13 = 0x7C;
+ final static int VK_F14 = 0x7D;
+ final static int VK_F15 = 0x7E;
+ final static int VK_F16 = 0x7F;
+ final static int VK_F17 = 0x80;
+ final static int VK_F18 = 0x81;
+ final static int VK_F19 = 0x82;
+ final static int VK_F20 = 0x83;
+ final static int VK_F21 = 0x84;
+ final static int VK_F22 = 0x85;
+ final static int VK_F23 = 0x86;
+ final static int VK_F24 = 0x87;
+ final static int VK_NUMLOCK = 0x90;
+ final static int VK_SCROLL = 0x91;
+ final static int VK_LSHIFT = 0xA0;
+ final static int VK_RSHIFT = 0xA1;
+ final static int VK_LCONTROL = 0xA2;
+ final static int VK_RCONTROL = 0xA3;
+ final static int VK_LMENU = 0xA4;
+ final static int VK_RMENU = 0xA5;
+ final static int VK_BROWSER_BACK = 0xA6;
+ final static int VK_BROWSER_FORWARD = 0xA7;
+ final static int VK_BROWSER_REFRESH = 0xA8;
+ final static int VK_BROWSER_STOP = 0xA9;
+ final static int VK_BROWSER_SEARCH = 0xAA;
+ final static int VK_BROWSER_FAVORITES = 0xAB;
+ final static int VK_BROWSER_HOME = 0xAC;
+ final static int VK_VOLUME_MUTE = 0xAD;
+ final static int VK_VOLUME_DOWN = 0xAE;
+ final static int VK_VOLUME_UP = 0xAF;
+ final static int VK_MEDIA_NEXT_TRACK = 0xB0;
+ final static int VK_MEDIA_PREV_TRACK = 0xB1;
+ final static int VK_MEDIA_STOP = 0xB2;
+ final static int VK_MEDIA_PLAY_PAUSE = 0xB3;
+ final static int VK_LAUNCH_MAIL = 0xB4;
+ final static int VK_LAUNCH_MEDIA_SELECT = 0xB5;
+ final static int VK_LAUNCH_APP1 = 0xB6;
+ final static int VK_LAUNCH_APP2 = 0xB7;
+ final static int VK_OEM_1 = 0xBA;
+ final static int VK_OEM_PLUS = 0xBB;
+ final static int VK_OEM_COMMA = 0xBC;
+ final static int VK_OEM_MINUS = 0xBD;
+ final static int VK_OEM_PERIOD = 0xBE;
+ final static int VK_OEM_2 = 0xBF;
+ final static int VK_OEM_3 = 0xC0;
+ final static int VK_ABNT_C1 = 0xC1;
+ final static int VK_ABNT_C2 = 0xC2;
+ final static int VK_OEM_4 = 0xDB;
+ final static int VK_OEM_5 = 0xDC;
+ final static int VK_OEM_6 = 0xDD;
+ final static int VK_OEM_7 = 0xDE;
+ final static int VK_OEM_8 = 0xDF;
+ final static int VK_OEM_102 = 0xE2;
+ final static int VK_PROCESSKEY = 0xE5;
+ final static int VK_PACKET = 0xE7;
+ final static int VK_ATTN = 0xF6;
+ final static int VK_CRSEL = 0xF7;
+ final static int VK_EXSEL = 0xF8;
+ final static int VK_EREOF = 0xF9;
+ final static int VK_PLAY = 0xFA;
+ final static int VK_ZOOM = 0xFB;
+ final static int VK_NONAME = 0xFC;
+ final static int VK_PA1 = 0xFD;
+ final static int VK_OEM_CLEAR = 0xFE;
+ final static int VK_UNICODE = 0x80000000;
+
+ // key codes to switch between custom keyboard
+ private final static int EXTKEY_KBFUNCTIONKEYS = 0x1100;
+ private final static int EXTKEY_KBNUMPAD = 0x1101;
+ private final static int EXTKEY_KBCURSOR = 0x1102;
+
+ // this flag indicates if we got a VK or a unicode character in our translation map
+ private static final int KEY_FLAG_UNICODE = 0x80000000;
+
+ // this flag indicates if the key is a toggle key (remains down when pressed and goes up if pressed again)
+ private static final int KEY_FLAG_TOGGLE = 0x40000000;
+
+ private boolean shiftPressed = false;
+ private boolean ctrlPressed = false;
+ private boolean altPressed = false;
+ private boolean winPressed = false;
+
+ private long lastModifierTime;
+ private int lastModifierKeyCode = -1;
+
+ private boolean isShiftLocked = false;
+ private boolean isCtrlLocked = false;
+ private boolean isAltLocked = false;
+ private boolean isWinLocked = false;
+
+ public void init(Context context)
+ {
+ if(initialized == true)
+ return;
+
+ keymapAndroid = new int[256];
+
+ keymapAndroid[KeyEvent.KEYCODE_0] = VK_KEY_0;
+ keymapAndroid[KeyEvent.KEYCODE_1] = VK_KEY_1;
+ keymapAndroid[KeyEvent.KEYCODE_2] = VK_KEY_2;
+ keymapAndroid[KeyEvent.KEYCODE_3] = VK_KEY_3;
+ keymapAndroid[KeyEvent.KEYCODE_4] = VK_KEY_4;
+ keymapAndroid[KeyEvent.KEYCODE_5] = VK_KEY_5;
+ keymapAndroid[KeyEvent.KEYCODE_6] = VK_KEY_6;
+ keymapAndroid[KeyEvent.KEYCODE_7] = VK_KEY_7;
+ keymapAndroid[KeyEvent.KEYCODE_8] = VK_KEY_8;
+ keymapAndroid[KeyEvent.KEYCODE_9] = VK_KEY_9;
+
+ keymapAndroid[KeyEvent.KEYCODE_A] = VK_KEY_A;
+ keymapAndroid[KeyEvent.KEYCODE_B] = VK_KEY_B;
+ keymapAndroid[KeyEvent.KEYCODE_C] = VK_KEY_C;
+ keymapAndroid[KeyEvent.KEYCODE_D] = VK_KEY_D;
+ keymapAndroid[KeyEvent.KEYCODE_E] = VK_KEY_E;
+ keymapAndroid[KeyEvent.KEYCODE_F] = VK_KEY_F;
+ keymapAndroid[KeyEvent.KEYCODE_G] = VK_KEY_G;
+ keymapAndroid[KeyEvent.KEYCODE_H] = VK_KEY_H;
+ keymapAndroid[KeyEvent.KEYCODE_I] = VK_KEY_I;
+ keymapAndroid[KeyEvent.KEYCODE_J] = VK_KEY_J;
+ keymapAndroid[KeyEvent.KEYCODE_K] = VK_KEY_K;
+ keymapAndroid[KeyEvent.KEYCODE_L] = VK_KEY_L;
+ keymapAndroid[KeyEvent.KEYCODE_M] = VK_KEY_M;
+ keymapAndroid[KeyEvent.KEYCODE_N] = VK_KEY_N;
+ keymapAndroid[KeyEvent.KEYCODE_O] = VK_KEY_O;
+ keymapAndroid[KeyEvent.KEYCODE_P] = VK_KEY_P;
+ keymapAndroid[KeyEvent.KEYCODE_Q] = VK_KEY_Q;
+ keymapAndroid[KeyEvent.KEYCODE_R] = VK_KEY_R;
+ keymapAndroid[KeyEvent.KEYCODE_S] = VK_KEY_S;
+ keymapAndroid[KeyEvent.KEYCODE_T] = VK_KEY_T;
+ keymapAndroid[KeyEvent.KEYCODE_U] = VK_KEY_U;
+ keymapAndroid[KeyEvent.KEYCODE_V] = VK_KEY_V;
+ keymapAndroid[KeyEvent.KEYCODE_W] = VK_KEY_W;
+ keymapAndroid[KeyEvent.KEYCODE_X] = VK_KEY_X;
+ keymapAndroid[KeyEvent.KEYCODE_Y] = VK_KEY_Y;
+ keymapAndroid[KeyEvent.KEYCODE_Z] = VK_KEY_Z;
+
+ keymapAndroid[KeyEvent.KEYCODE_DEL] = VK_BACK;
+ keymapAndroid[KeyEvent.KEYCODE_ENTER] = VK_RETURN;
+ keymapAndroid[KeyEvent.KEYCODE_SPACE] = VK_SPACE;
+// keymapAndroid[KeyEvent.KEYCODE_SHIFT_LEFT] = VK_LSHIFT;
+// keymapAndroid[KeyEvent.KEYCODE_SHIFT_RIGHT] = VK_RSHIFT;
+
+// keymapAndroid[KeyEvent.KEYCODE_DPAD_DOWN] = VK_DOWN;
+// keymapAndroid[KeyEvent.KEYCODE_DPAD_LEFT] = VK_LEFT;
+// keymapAndroid[KeyEvent.KEYCODE_DPAD_RIGHT] = VK_RIGHT;
+// keymapAndroid[KeyEvent.KEYCODE_DPAD_UP] = VK_UP;
+
+// keymapAndroid[KeyEvent.KEYCODE_COMMA] = VK_OEM_COMMA;
+// keymapAndroid[KeyEvent.KEYCODE_PERIOD] = VK_OEM_PERIOD;
+// keymapAndroid[KeyEvent.KEYCODE_MINUS] = VK_OEM_MINUS;
+// keymapAndroid[KeyEvent.KEYCODE_PLUS] = VK_OEM_PLUS;
+
+// keymapAndroid[KeyEvent.KEYCODE_ALT_LEFT] = VK_LMENU;
+// keymapAndroid[KeyEvent.KEYCODE_ALT_RIGHT] = VK_RMENU;
+
+// keymapAndroid[KeyEvent.KEYCODE_AT] = (KEY_FLAG_UNICODE | 64);
+// keymapAndroid[KeyEvent.KEYCODE_APOSTROPHE] = (KEY_FLAG_UNICODE | 39);
+// keymapAndroid[KeyEvent.KEYCODE_BACKSLASH] = (KEY_FLAG_UNICODE | 92);
+// keymapAndroid[KeyEvent.KEYCODE_COMMA] = (KEY_FLAG_UNICODE | 44);
+// keymapAndroid[KeyEvent.KEYCODE_EQUALS] = (KEY_FLAG_UNICODE | 61);
+// keymapAndroid[KeyEvent.KEYCODE_GRAVE] = (KEY_FLAG_UNICODE | 96);
+// keymapAndroid[KeyEvent.KEYCODE_LEFT_BRACKET] = (KEY_FLAG_UNICODE | 91);
+// keymapAndroid[KeyEvent.KEYCODE_RIGHT_BRACKET] = (KEY_FLAG_UNICODE | 93);
+// keymapAndroid[KeyEvent.KEYCODE_MINUS] = (KEY_FLAG_UNICODE | 45);
+// keymapAndroid[KeyEvent.KEYCODE_PERIOD] = (KEY_FLAG_UNICODE | 46);
+// keymapAndroid[KeyEvent.KEYCODE_PLUS] = (KEY_FLAG_UNICODE | 43);
+// keymapAndroid[KeyEvent.KEYCODE_POUND] = (KEY_FLAG_UNICODE | 35);
+// keymapAndroid[KeyEvent.KEYCODE_SEMICOLON] = (KEY_FLAG_UNICODE | 59);
+// keymapAndroid[KeyEvent.KEYCODE_SLASH] = (KEY_FLAG_UNICODE | 47);
+// keymapAndroid[KeyEvent.KEYCODE_STAR] = (KEY_FLAG_UNICODE | 42);
+
+ // special keys mapping
+ keymapExt = new int[256];
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F1)] = VK_F1;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F2)] = VK_F2;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F3)] = VK_F3;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F4)] = VK_F4;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F5)] = VK_F5;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F6)] = VK_F6;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F7)] = VK_F7;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F8)] = VK_F8;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F9)] = VK_F9;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F10)] = VK_F10;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F11)] = VK_F11;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_F12)] = VK_F12;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_tab)] = VK_TAB;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_print)] = VK_PRINT;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_insert)] = VK_INSERT;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_delete)] = VK_DELETE;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_home)] = VK_HOME;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_end)] = VK_END;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_pgup)] = VK_PRIOR;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_pgdn)] = VK_NEXT;
+
+ // numpad mapping
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_0)] = VK_NUMPAD0;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_1)] = VK_NUMPAD1;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_2)] = VK_NUMPAD2;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_3)] = VK_NUMPAD3;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_4)] = VK_NUMPAD4;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_5)] = VK_NUMPAD5;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_6)] = VK_NUMPAD6;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_7)] = VK_NUMPAD7;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_8)] = VK_NUMPAD8;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_9)] = VK_NUMPAD9;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_numlock)] = VK_NUMLOCK;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_add)] = VK_ADD;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_comma)] = VK_DECIMAL;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_divide)] = VK_DIVIDE;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_enter)] = VK_RETURN;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_multiply)] = VK_MULTIPLY;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_subtract)] = VK_SUBTRACT;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_equals)] = (KEY_FLAG_UNICODE | 61);
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_left_paren)] = (KEY_FLAG_UNICODE | 40);
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_right_paren)] = (KEY_FLAG_UNICODE | 41);
+
+ // cursor key codes
+ keymapExt[context.getResources().getInteger(R.integer.keycode_up)] = VK_UP;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_down)] = VK_DOWN;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_left)] = VK_LEFT;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_right)] = VK_RIGHT;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_enter)] = VK_RETURN;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_backspace)] = VK_BACK;
+
+ // shared keys
+ keymapExt[context.getResources().getInteger(R.integer.keycode_win)] = VK_LWIN;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_menu)] = VK_APPS;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_esc)] = VK_ESCAPE;
+
+/* keymapExt[context.getResources().getInteger(R.integer.keycode_modifier_ctrl)] = VK_LCONTROL;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_modifier_alt)] = VK_LMENU;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_modifier_shift)] = VK_LSHIFT;
+*/
+ // get custom keyboard key codes
+ keymapExt[context.getResources().getInteger(R.integer.keycode_specialkeys_keyboard)] = EXTKEY_KBFUNCTIONKEYS;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_numpad_keyboard)] = EXTKEY_KBNUMPAD;
+ keymapExt[context.getResources().getInteger(R.integer.keycode_cursor_keyboard)] = EXTKEY_KBCURSOR;
+
+ keymapExt[context.getResources().getInteger(R.integer.keycode_toggle_shift)] = (KEY_FLAG_TOGGLE | VK_LSHIFT);
+ keymapExt[context.getResources().getInteger(R.integer.keycode_toggle_ctrl)] = (KEY_FLAG_TOGGLE | VK_LCONTROL);
+ keymapExt[context.getResources().getInteger(R.integer.keycode_toggle_alt)] = (KEY_FLAG_TOGGLE | VK_LMENU);
+ keymapExt[context.getResources().getInteger(R.integer.keycode_toggle_win)] = (KEY_FLAG_TOGGLE | VK_LWIN);
+
+ initialized = true;
+ }
+
+ public void reset(KeyProcessingListener listener) {
+ shiftPressed = false;
+ ctrlPressed = false;
+ altPressed = false;
+ winPressed = false;
+ setKeyProcessingListener(listener);
+ }
+
+ public void setKeyProcessingListener(KeyProcessingListener listener) {
+ this.listener = listener;
+ }
+
+ public boolean processAndroidKeyEvent(KeyEvent event) {
+ switch(event.getAction())
+ {
+ // we only process down events
+ case KeyEvent.ACTION_UP:
+ {
+ return false;
+ }
+
+ case KeyEvent.ACTION_DOWN:
+ {
+ boolean modifierActive = isModifierPressed();
+ // if a modifier is pressed we will send a VK event (if possible) so that key combinations will be
+ // recognized correctly. Otherwise we will send the unicode key. At the end we will reset all modifiers
+ // and notifiy our listener.
+ int vkcode = getVirtualKeyCode(event.getKeyCode());
+ if((vkcode & KEY_FLAG_UNICODE) != 0)
+ listener.processUnicodeKey(vkcode & (~KEY_FLAG_UNICODE));
+ // if we got a valid vkcode send it - except for letters/numbers if a modifier is active
+ else if (vkcode > 0 && (event.getMetaState() & (KeyEvent.META_ALT_ON | KeyEvent.META_SHIFT_ON | KeyEvent.META_SYM_ON)) == 0)
+ {
+ listener.processVirtualKey(vkcode, true);
+ listener.processVirtualKey(vkcode, false);
+ }
+ else if(Character.isUpperCase((char)event.getUnicodeChar()))
+ {
+ listener.processVirtualKey(VK_SHIFT, true);
+ listener.processVirtualKey(vkcode, true);
+ listener.processVirtualKey(vkcode, false);
+ listener.processVirtualKey(VK_SHIFT, false);
+ }
+ else if(event.getUnicodeChar() != 0)
+ listener.processUnicodeKey(event.getUnicodeChar());
+ else
+ return false;
+
+ // reset any pending toggle states if a modifier was pressed
+ if(modifierActive)
+ resetModifierKeysAfterInput(false);
+ return true;
+ }
+
+ case KeyEvent.ACTION_MULTIPLE:
+ {
+ String str = event.getCharacters();
+ for(int i = 0; i < str.length(); i++)
+ listener.processUnicodeKey(str.charAt(i));
+ return true;
+ }
+
+ default:
+ break;
+ }
+ return false;
+ }
+
+ public void processCustomKeyEvent(int keycode) {
+ int extCode = getExtendedKeyCode(keycode);
+ if(extCode == 0)
+ return;
+
+ // toggle button pressed?
+ if((extCode & KEY_FLAG_TOGGLE) != 0)
+ {
+ processToggleButton(extCode & (~KEY_FLAG_TOGGLE));
+ return;
+ }
+
+ // keyboard switch button pressed?
+ if(extCode == EXTKEY_KBFUNCTIONKEYS || extCode == EXTKEY_KBNUMPAD || extCode == EXTKEY_KBCURSOR)
+ {
+ switchKeyboard(extCode);
+ return;
+ }
+
+ // nope - see if we got a unicode or vk
+ if((extCode & KEY_FLAG_UNICODE) != 0)
+ listener.processUnicodeKey(extCode & (~KEY_FLAG_UNICODE));
+ else
+ {
+ listener.processVirtualKey(extCode, true);
+ listener.processVirtualKey(extCode, false);
+ }
+
+ resetModifierKeysAfterInput(false);
+ }
+
+ public void sendAltF4()
+ {
+ listener.processVirtualKey(VK_LMENU, true);
+ listener.processVirtualKey(VK_F4, true);
+ listener.processVirtualKey(VK_F4, false);
+ listener.processVirtualKey(VK_LMENU, false);
+ }
+
+ private boolean isModifierPressed() {
+ return (shiftPressed || ctrlPressed || altPressed || winPressed);
+ }
+
+ public int getModifierState(int keycode) {
+ int modifierCode = getExtendedKeyCode(keycode);
+
+ // check and get real modifier keycode
+ if((modifierCode & KEY_FLAG_TOGGLE) == 0)
+ return -1;
+ modifierCode = modifierCode & (~KEY_FLAG_TOGGLE);
+
+ switch(modifierCode)
+ {
+ case VK_LSHIFT:
+ {
+ return (shiftPressed ? (isShiftLocked ? KEYSTATE_LOCKED : KEYSTATE_ON) : KEYSTATE_OFF);
+ }
+ case VK_LCONTROL:
+ {
+ return (ctrlPressed ? (isCtrlLocked ? KEYSTATE_LOCKED : KEYSTATE_ON) : KEYSTATE_OFF);
+ }
+ case VK_LMENU:
+ {
+ return (altPressed ? (isAltLocked ? KEYSTATE_LOCKED : KEYSTATE_ON) : KEYSTATE_OFF);
+ }
+ case VK_LWIN:
+ {
+ return (winPressed ? (isWinLocked ? KEYSTATE_LOCKED : KEYSTATE_ON) : KEYSTATE_OFF);
+ }
+ }
+
+ return -1;
+ }
+
+ private int getVirtualKeyCode(int keycode) {
+ if(keycode >= 0 && keycode <= 0xFF)
+ return keymapAndroid[keycode];
+ return 0;
+ }
+
+ private int getExtendedKeyCode(int keycode) {
+ if(keycode >= 0 && keycode <= 0xFF)
+ return keymapExt[keycode];
+ return 0;
+ }
+
+ private void processToggleButton(int keycode) {
+ switch(keycode)
+ {
+ case VK_LSHIFT:
+ {
+ if(!checkToggleModifierLock(VK_LSHIFT))
+ {
+ isShiftLocked = false;
+ shiftPressed = !shiftPressed;
+ listener.processVirtualKey(VK_LSHIFT, shiftPressed);
+ }
+ else
+ isShiftLocked = true;
+ break;
+ }
+ case VK_LCONTROL:
+ {
+ if(!checkToggleModifierLock(VK_LCONTROL))
+ {
+ isCtrlLocked = false;
+ ctrlPressed = !ctrlPressed;
+ listener.processVirtualKey(VK_LCONTROL, ctrlPressed);
+ }
+ else
+ isCtrlLocked = true;
+ break;
+ }
+ case VK_LMENU:
+ {
+ if(!checkToggleModifierLock(VK_LMENU))
+ {
+ isAltLocked = false;
+ altPressed = !altPressed;
+ listener.processVirtualKey(VK_LMENU, altPressed);
+ }
+ else
+ isAltLocked = true;
+ break;
+ }
+ case VK_LWIN:
+ {
+ if(!checkToggleModifierLock(VK_LMENU))
+ {
+ isWinLocked = false;
+ winPressed = !winPressed;
+ listener.processVirtualKey(VK_LWIN, winPressed);
+ }
+ else
+ isWinLocked = true;
+ break;
+ }
+ }
+ listener.modifiersChanged();
+ }
+
+ public void clearlAllModifiers()
+ {
+ resetModifierKeysAfterInput(true);
+ }
+
+ private void resetModifierKeysAfterInput(boolean force) {
+ if(shiftPressed && (!isShiftLocked || force))
+ {
+ listener.processVirtualKey(VK_LSHIFT, false);
+ shiftPressed = false;
+ }
+ if(ctrlPressed && (!isCtrlLocked || force))
+ {
+ listener.processVirtualKey(VK_LCONTROL, false);
+ ctrlPressed = false;
+ }
+ if(altPressed && (!isAltLocked || force))
+ {
+ listener.processVirtualKey(VK_LMENU, false);
+ altPressed = false;
+ }
+ if(winPressed && (!isWinLocked || force))
+ {
+ listener.processVirtualKey(VK_LWIN, false);
+ winPressed = false;
+ }
+
+ if(listener != null)
+ listener.modifiersChanged();
+ }
+
+ private void switchKeyboard(int keycode) {
+ switch(keycode)
+ {
+ case EXTKEY_KBFUNCTIONKEYS:
+ {
+ listener.switchKeyboard(KEYBOARD_TYPE_FUNCTIONKEYS);
+ break;
+ }
+
+ case EXTKEY_KBNUMPAD:
+ {
+ listener.switchKeyboard(KEYBOARD_TYPE_NUMPAD);
+ break;
+ }
+
+ case EXTKEY_KBCURSOR:
+ {
+ listener.switchKeyboard(KEYBOARD_TYPE_CURSOR);
+ break;
+ }
+
+ default:
+ break;
+ }
+ }
+
+ private boolean checkToggleModifierLock(int keycode) {
+ long now = System.currentTimeMillis();
+
+ // was the same modifier hit?
+ if(lastModifierKeyCode != keycode)
+ {
+ lastModifierKeyCode = keycode;
+ lastModifierTime = now;
+ return false;
+ }
+
+ // within a certain time interval?
+ if(lastModifierTime + 800 > now)
+ {
+ lastModifierTime = 0;
+ return true;
+ }
+ else
+ {
+ lastModifierTime = now;
+ return false;
+ }
+ }
+
+}
+
diff --git a/client/Android/src/com/freerdp/afreerdp/utils/Mouse.java b/client/Android/src/com/freerdp/afreerdp/utils/Mouse.java
new file mode 100644
index 000000000..202c4d5de
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/utils/Mouse.java
@@ -0,0 +1,57 @@
+/*
+ Android Mouse Input Mapping
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.utils;
+
+import com.freerdp.afreerdp.application.GlobalSettings;
+
+public class Mouse {
+
+ private final static int PTRFLAGS_LBUTTON = 0x1000;
+ private final static int PTRFLAGS_RBUTTON = 0x2000;
+
+ private final static int PTRFLAGS_DOWN = 0x8000;
+ private final static int PTRFLAGS_MOVE = 0x0800;
+
+ private final static int PTRFLAGS_WHEEL = 0x0200;
+ private final static int PTRFLAGS_WHEEL_NEGATIVE = 0x0100;
+
+ public static int getLeftButtonEvent(boolean down) {
+ if(GlobalSettings.getSwapMouseButtons())
+ return (PTRFLAGS_RBUTTON | (down ? PTRFLAGS_DOWN : 0));
+ else
+ return (PTRFLAGS_LBUTTON | (down ? PTRFLAGS_DOWN : 0));
+ }
+
+ public static int getRightButtonEvent(boolean down) {
+ if(GlobalSettings.getSwapMouseButtons())
+ return (PTRFLAGS_LBUTTON | (down ? PTRFLAGS_DOWN : 0));
+ else
+ return (PTRFLAGS_RBUTTON | (down ? PTRFLAGS_DOWN : 0));
+ }
+
+ public static int getMoveEvent() {
+ return PTRFLAGS_MOVE;
+ }
+
+ public static int getScrollEvent(boolean down) {
+ int flags = PTRFLAGS_WHEEL;
+
+ // invert scrolling?
+ if(GlobalSettings.getInvertScrolling())
+ down = !down;
+
+ if(down)
+ flags |= (PTRFLAGS_WHEEL_NEGATIVE | 0x0088);
+ else
+ flags |= 0x0078;
+ return flags;
+ }
+
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/utils/SeparatedListAdapter.java b/client/Android/src/com/freerdp/afreerdp/utils/SeparatedListAdapter.java
new file mode 100644
index 000000000..9ee8894c1
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/utils/SeparatedListAdapter.java
@@ -0,0 +1,185 @@
+/*
+ Separated List Adapter
+ Taken from http://jsharkey.org/blog/2008/08/18/separating-lists-with-headers-in-android-09/
+
+ Copyright Jeff Sharkey
+
+ 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/.
+*/
+
+package com.freerdp.afreerdp.utils;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.freerdp.afreerdp.R;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Adapter;
+import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+
+public class SeparatedListAdapter extends BaseAdapter {
+
+ public final Map
+ *
+ *
+ * If you use a simple drawable resource, note that you must wrapper it using
+ * {@link android.content.Intent.ShortcutIconResource}, as shown below. This is required so
+ * that the launcher can access resources that are stored in your application's .apk file. If
+ * you return a bitmap, such as a thumbnail, you can simply put the bitmap into the extras
+ * bundle using {@link android.content.Intent#EXTRA_SHORTCUT_ICON}.
+ *
+ * The shortcut intent can be any intent that you wish the launcher to send, when the user
+ * clicks on the shortcut. Typically this will be {@link android.content.Intent#ACTION_VIEW}
+ * with an appropriate Uri for your content, but any Intent will work here as long as it
+ * triggers the desired action within your Activity.
+ */
+
+ private void setupShortcut(String strRef, String defaultLabel) {
+ final String paramStrRef = strRef;
+ final String paramDefaultLabel = defaultLabel;
+ final Context paramContext = this;
+
+ // display edit dialog to the user so he can specify the shortcut name
+ final EditText input = new EditText(this);
+ input.setText(defaultLabel);
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(R.string.dlg_title_create_shortcut)
+ .setMessage(R.string.dlg_msg_create_shortcut)
+ .setView(input)
+ .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener()
+ {
+ @Override
+ public void onClick(DialogInterface dialog, int which)
+ {
+ String label = input.getText().toString();
+ if(label.length() == 0)
+ label = paramDefaultLabel;
+
+ Intent shortcutIntent = new Intent(Intent.ACTION_VIEW);
+ shortcutIntent.setClassName(paramContext, SessionRequestHandlerActivity.class.getName());
+ shortcutIntent.setData(Uri.parse(paramStrRef));
+
+ // Then, set up the container intent (the response to the caller)
+ Intent intent = new Intent();
+ intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+ intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);
+ Parcelable iconResource = Intent.ShortcutIconResource.fromContext(paramContext, R.drawable.icon_launcher_freerdp);
+ intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
+
+ // Now, return the result to the launcher
+ setResult(RESULT_OK, intent);
+ finish();
+ }
+ })
+ .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener()
+ {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.dismiss();
+ }
+ })
+ .create().show();
+
+ }
+
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/presentation/TouchPointerView.java b/client/Android/src/com/freerdp/afreerdp/presentation/TouchPointerView.java
new file mode 100644
index 000000000..7850f9fdf
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/presentation/TouchPointerView.java
@@ -0,0 +1,360 @@
+/*
+ Android Touch Pointer view
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.presentation;
+
+import com.freerdp.afreerdp.R;
+import com.freerdp.afreerdp.utils.GestureDetector;
+
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.RectF;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.ImageView;
+
+public class TouchPointerView extends ImageView {
+
+ // touch pointer listener - is triggered if an action field is
+ public interface TouchPointerListener {
+ abstract void onTouchPointerClose();
+ abstract void onTouchPointerLeftClick(int x, int y, boolean down);
+ abstract void onTouchPointerRightClick(int x, int y, boolean down);
+ abstract void onTouchPointerMove(int x, int y);
+ abstract void onTouchPointerScroll(boolean down);
+ abstract void onTouchPointerToggleKeyboard();
+ abstract void onTouchPointerToggleExtKeyboard();
+ abstract void onTouchPointerResetScrollZoom();
+ }
+
+
+ private class UIHandler extends Handler {
+
+ UIHandler() {
+ super();
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ setPointerImage(R.drawable.touch_pointer_default);
+ }
+ }
+
+
+
+ // the touch pointer consists of 9 quadrants with the following functionality:
+ //
+ // -------------
+ // | 0 | 1 | 2 |
+ // -------------
+ // | 3 | 4 | 5 |
+ // -------------
+ // | 6 | 7 | 8 |
+ // -------------
+ //
+ // 0 ... contains the actual pointer (the tip must be centered in the quadrant)
+ // 1 ... is left empty
+ // 2, 3, 5, 6, 7, 8 ... function quadrants that issue a callback
+ // 4 ... pointer center used for left clicks and to drag the pointer
+
+ private static final int POINTER_ACTION_CURSOR = 0;
+ private static final int POINTER_ACTION_CLOSE = 3;
+ private static final int POINTER_ACTION_RCLICK = 2;
+ private static final int POINTER_ACTION_LCLICK = 4;
+ private static final int POINTER_ACTION_MOVE = 4;
+ private static final int POINTER_ACTION_SCROLL = 5;
+ private static final int POINTER_ACTION_RESET = 6;
+ private static final int POINTER_ACTION_KEYBOARD = 7;
+ private static final int POINTER_ACTION_EXTKEYBOARD = 8;
+
+ private static final float SCROLL_DELTA = 10.0f;
+
+ private static final int DEFAULT_TOUCH_POINTER_RESTORE_DELAY = 150;
+
+ private RectF pointerRect;
+ private RectF pointerAreaRects[] = new RectF[9];
+ private Matrix translationMatrix;
+ private boolean pointerMoving = false;
+ private boolean pointerScrolling = false;
+ private TouchPointerListener listener = null;
+ private UIHandler uiHandler = new UIHandler();
+
+ // gesture detection
+ private GestureDetector gestureDetector;
+
+ private class TouchPointerGestureListener extends GestureDetector.SimpleOnGestureListener {
+
+ private MotionEvent prevEvent = null;
+
+ public boolean onDown(MotionEvent e) {
+ if(pointerAreaTouched(e, POINTER_ACTION_MOVE))
+ {
+ prevEvent = MotionEvent.obtain(e);
+ pointerMoving = true;
+ }
+ else if(pointerAreaTouched(e, POINTER_ACTION_SCROLL))
+ {
+ prevEvent = MotionEvent.obtain(e);
+ pointerScrolling = true;
+ setPointerImage(R.drawable.touch_pointer_scroll);
+ }
+
+ return true;
+ }
+
+ public boolean onUp(MotionEvent e) {
+ if(prevEvent != null)
+ {
+ prevEvent.recycle();
+ prevEvent = null;
+ }
+
+ if(pointerScrolling)
+ setPointerImage(R.drawable.touch_pointer_default);
+
+ pointerMoving = false;
+ pointerScrolling = false;
+ return true;
+ }
+
+ public void onLongPress(MotionEvent e) {
+ if(pointerAreaTouched(e, POINTER_ACTION_LCLICK))
+ {
+ setPointerImage(R.drawable.touch_pointer_active);
+ pointerMoving = true;
+ RectF rect = getCurrentPointerArea(POINTER_ACTION_CURSOR);
+ listener.onTouchPointerLeftClick((int)rect.centerX(), (int)rect.centerY(), true);
+ }
+ }
+
+ public void onLongPressUp(MotionEvent e) {
+ if(pointerMoving)
+ {
+ setPointerImage(R.drawable.touch_pointer_default);
+ pointerMoving = false;
+ RectF rect = getCurrentPointerArea(POINTER_ACTION_CURSOR);
+ listener.onTouchPointerLeftClick((int)rect.centerX(), (int)rect.centerY(), false);
+ }
+ }
+
+ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+ if(pointerMoving)
+ {
+ // move pointer graphics
+ movePointer((int)(e2.getX() - prevEvent.getX()), (int)(e2.getY() - prevEvent.getY()));
+ prevEvent.recycle();
+ prevEvent = MotionEvent.obtain(e2);
+
+ // send move notification
+ RectF rect = getCurrentPointerArea(POINTER_ACTION_CURSOR);
+ listener.onTouchPointerMove((int)rect.centerX(), (int)rect.centerY());
+ return true;
+ }
+ else if(pointerScrolling)
+ {
+ // calc if user scrolled up or down (or if any scrolling happened at all)
+ float deltaY = e2.getY() - prevEvent.getY();
+ if(deltaY > SCROLL_DELTA)
+ {
+ listener.onTouchPointerScroll(true);
+ prevEvent.recycle();
+ prevEvent = MotionEvent.obtain(e2);
+ }
+ else if(deltaY < -SCROLL_DELTA)
+ {
+ listener.onTouchPointerScroll(false);
+ prevEvent.recycle();
+ prevEvent = MotionEvent.obtain(e2);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public boolean onSingleTapUp(MotionEvent e) {
+ // look what area got touched and fire actions accordingly
+ if(pointerAreaTouched(e, POINTER_ACTION_CLOSE))
+ listener.onTouchPointerClose();
+ else if(pointerAreaTouched(e, POINTER_ACTION_LCLICK))
+ {
+ displayPointerImageAction(R.drawable.touch_pointer_lclick);
+ RectF rect = getCurrentPointerArea(POINTER_ACTION_CURSOR);
+ listener.onTouchPointerLeftClick((int)rect.centerX(), (int)rect.centerY(), true);
+ listener.onTouchPointerLeftClick((int)rect.centerX(), (int)rect.centerY(), false);
+ }
+ else if(pointerAreaTouched(e, POINTER_ACTION_RCLICK))
+ {
+ displayPointerImageAction(R.drawable.touch_pointer_rclick);
+ RectF rect = getCurrentPointerArea(POINTER_ACTION_CURSOR);
+ listener.onTouchPointerRightClick((int)rect.centerX(), (int)rect.centerY(), true);
+ listener.onTouchPointerRightClick((int)rect.centerX(), (int)rect.centerY(), false);
+ }
+ else if(pointerAreaTouched(e, POINTER_ACTION_KEYBOARD))
+ {
+ displayPointerImageAction(R.drawable.touch_pointer_keyboard);
+ listener.onTouchPointerToggleKeyboard();
+ }
+ else if(pointerAreaTouched(e, POINTER_ACTION_EXTKEYBOARD))
+ {
+ displayPointerImageAction(R.drawable.touch_pointer_extkeyboard);
+ listener.onTouchPointerToggleExtKeyboard();
+ }
+ else if(pointerAreaTouched(e, POINTER_ACTION_RESET))
+ {
+ displayPointerImageAction(R.drawable.touch_pointer_reset);
+ listener.onTouchPointerResetScrollZoom();
+ }
+
+ return true;
+ }
+
+ public boolean onDoubleTap(MotionEvent e) {
+ // issue a double click notification if performed in center quadrant
+ if(pointerAreaTouched(e, POINTER_ACTION_LCLICK))
+ {
+ RectF rect = getCurrentPointerArea(POINTER_ACTION_CURSOR);
+ listener.onTouchPointerLeftClick((int)rect.centerX(), (int)rect.centerY(), true);
+ listener.onTouchPointerLeftClick((int)rect.centerX(), (int)rect.centerY(), false);
+ }
+ return true;
+ }
+ }
+
+ public TouchPointerView(Context context) {
+ super(context);
+ initTouchPointer(context);
+ }
+
+ public TouchPointerView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ initTouchPointer(context);
+ }
+
+ public TouchPointerView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ initTouchPointer(context);
+ }
+
+ private void initTouchPointer(Context context) {
+ gestureDetector = new GestureDetector(context, new TouchPointerGestureListener(), null, true);
+ gestureDetector.setLongPressTimeout(500);
+ translationMatrix = new Matrix();
+ setScaleType(ScaleType.MATRIX);
+ setImageMatrix(translationMatrix);
+
+ // init rects
+ final float rectSizeWidth = (float)getDrawable().getIntrinsicWidth() / 3.0f;
+ final float rectSizeHeight = (float)getDrawable().getIntrinsicWidth() / 3.0f;
+ for(int i = 0; i < 3; i++)
+ {
+ for(int j = 0; j < 3; j++)
+ {
+ int left = (int)(j * rectSizeWidth);
+ int top = (int)(i * rectSizeHeight);
+ int right = left + (int)rectSizeWidth;
+ int bottom = top + (int)rectSizeHeight;
+ pointerAreaRects[i * 3 + j] = new RectF(left, top, right, bottom);
+ }
+ }
+ pointerRect = new RectF(0, 0, getDrawable().getIntrinsicWidth(), getDrawable().getIntrinsicHeight());
+ }
+
+ public void setTouchPointerListener(TouchPointerListener listener) {
+ this.listener = listener;
+ }
+
+ public int getPointerWidth() {
+ return getDrawable().getIntrinsicWidth();
+ }
+
+ public int getPointerHeight() {
+ return getDrawable().getIntrinsicHeight();
+ }
+
+ public float[] getPointerPosition() {
+ float []curPos = new float[2];
+ translationMatrix.mapPoints(curPos);
+ return curPos;
+ }
+
+ private void movePointer(float deltaX, float deltaY) {
+ translationMatrix.postTranslate(deltaX, deltaY);
+ setImageMatrix(translationMatrix);
+ }
+
+ private void ensureVisibility(int screen_width, int screen_height)
+ {
+ float []curPos = new float[2];
+ translationMatrix.mapPoints(curPos);
+
+ if (curPos[0] > (screen_width - pointerRect.width()))
+ curPos[0] = screen_width - pointerRect.width();
+ if (curPos[0] < 0)
+ curPos[0] = 0;
+ if (curPos[1] > (screen_height - pointerRect.height()))
+ curPos[1] = screen_height - pointerRect.height();
+ if (curPos[1] < 0)
+ curPos[1] = 0;
+
+ translationMatrix.setTranslate(curPos[0], curPos[1]);
+ setImageMatrix(translationMatrix);
+ }
+
+ private void displayPointerImageAction(int resId)
+ {
+ setPointerImage(resId);
+ uiHandler.sendEmptyMessageDelayed(0, DEFAULT_TOUCH_POINTER_RESTORE_DELAY);
+ }
+
+ private void setPointerImage(int resId)
+ {
+ setImageResource(resId);
+ }
+
+ // returns the pointer area with the current translation matrix applied
+ private RectF getCurrentPointerArea(int area) {
+ RectF transRect = new RectF(pointerAreaRects[area]);
+ translationMatrix.mapRect(transRect);
+ return transRect;
+ }
+
+ private boolean pointerAreaTouched(MotionEvent event, int area) {
+ RectF transRect = new RectF(pointerAreaRects[area]);
+ translationMatrix.mapRect(transRect);
+ if(transRect.contains(event.getX(), event.getY()))
+ return true;
+ return false;
+ }
+
+ private boolean pointerTouched(MotionEvent event) {
+ RectF transRect = new RectF(pointerRect);
+ translationMatrix.mapRect(transRect);
+ if(transRect.contains(event.getX(), event.getY()))
+ return true;
+ return false;
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ // check if pointer is being moved or if we are in scroll mode or if the pointer is touched
+ if(!pointerMoving && !pointerScrolling && !pointerTouched(event))
+ return false;
+ return gestureDetector.onTouchEvent(event);
+ }
+
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom)
+ {
+ // ensure touch pointer is visible
+ if (changed)
+ ensureVisibility(right - left, bottom - top);
+ }
+}
diff --git a/client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java b/client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java
new file mode 100644
index 000000000..e600b36e0
--- /dev/null
+++ b/client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java
@@ -0,0 +1,407 @@
+/*
+ Helper class to access bookmark database
+
+ Copyright 2013 Thinstuff 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/.
+*/
+
+package com.freerdp.afreerdp.services;
+
+
+import java.util.ArrayList;
+
+import com.freerdp.afreerdp.domain.BookmarkBase;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.util.Log;
+
+public abstract class BookmarkBaseGateway
+{
+ private final static String TAG = "BookmarkBaseGateway";
+ private BookmarkDB bookmarkDB;
+
+ protected abstract BookmarkBase createBookmark();
+ protected abstract String getBookmarkTableName();
+ protected abstract void addBookmarkSpecificColumns(ArrayList