mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeRDP/FreeRDP

This commit is contained in:
Marc-André Moreau 2013-03-19 15:54:16 -04:00
parent 21a107015a c01a934450
commit 0b6872a1d3
5 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/KeyboardMapper.java
View File

@ -433,12 +433,12 @@ public class KeyboardMapper
listener.processVirtualKey(vkcode, true);
listener.processVirtualKey(vkcode, false);
}
else if(Character.isUpperCase((char)event.getUnicodeChar()))
else if(event.isShiftPressed() && vkcode != 0)
{
listener.processVirtualKey(VK_SHIFT, true);
listener.processVirtualKey(VK_LSHIFT, true);
listener.processVirtualKey(vkcode, true);
listener.processVirtualKey(vkcode, false);
listener.processVirtualKey(VK_SHIFT, false);
listener.processVirtualKey(VK_LSHIFT, false);
}
else if(event.getUnicodeChar() != 0)
listener.processUnicodeKey(event.getUnicodeChar());

17
client/Android/aFreeRDP/AndroidManifest.xml.cmake
View File

@ -25,18 +25,11 @@
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:scheme="file"
android:mimeType="application/x-rdp" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:scheme="file"
android:pathPattern=".*\\.rdp"
android:mimeType="*/*" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" android:host="*" android:pathPattern=".*\\.rdp" />
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.rdp" />
<data android:mimeType="*/*" />
</intent-filter>
</activity>

14
client/iOS/Controllers/RDPSessionViewController.m
View File

@ -71,12 +71,8 @@
// load default view and set background color and resizing mask
[super loadView];
// init keyboard handling vars and register required notification handlers
// init keyboard handling vars
_keyboard_visible = NO;
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name: UIKeyboardWillShowNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidShow:) name: UIKeyboardDidShowNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name: UIKeyboardWillHideNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidHide:) name: UIKeyboardDidHideNotification object:nil];
// init keyboard toolbar
_keyboard_toolbar = [[self keyboardToolbar] retain];
@ -325,6 +321,12 @@
- (void)sessionDidConnect:(RDPSession*)session
{
// register keyboard notification handlers
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name: UIKeyboardWillShowNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidShow:) name: UIKeyboardDidShowNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name: UIKeyboardWillHideNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidHide:) name: UIKeyboardDidHideNotification object:nil];
// remove and release connecting view
[_connecting_indicator_view stopAnimating];
[_connecting_view removeFromSuperview];
@ -383,7 +385,7 @@
- (void)session:(RDPSession*)session needsRedrawInRect:(CGRect)rect
{
[_session_view setNeedsDisplayInRect:rect];
[_session_view setNeedsDisplayInRect:rect];
}
- (void)session:(RDPSession *)session requestsAuthenticationWithParams:(NSMutableDictionary *)params

8
client/iOS/iFreeRDP.xcodeproj/project.pbxproj.cmake
View File

@ -751,7 +751,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
@ -775,7 +775,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
@ -798,7 +798,7 @@
"\"@FREERDP_IOS_EXTERNAL_SSL_PATH@/include\"",
);
INFOPLIST_FILE = "$(SRCROOT)/iFreeRDP.plist";
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)/../../libfreerdp\"",
"\"$(SRCROOT)/../../winpr/libwinpr\"",
@ -824,7 +824,7 @@
"\"@FREERDP_IOS_EXTERNAL_SSL_PATH@/include\"",
);
INFOPLIST_FILE = "$(SRCROOT)/iFreeRDP.plist";
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)/../../libfreerdp\"",
"\"$(SRCROOT)/../../winpr/libwinpr\"",

8
include/freerdp/channels/wtsvc.h
View File

@ -46,6 +46,10 @@ typedef enum _WTS_VIRTUAL_CLASS
WTSVirtualChannelReady
} WTS_VIRTUAL_CLASS;
#ifdef __cplusplus
extern "C" {
#endif
/**
* WTSVirtualChannelManager functions are FreeRDP extensions to the API.
*/
@ -127,4 +131,8 @@ FREERDP_API BOOL WTSVirtualChannelWrite(
FREERDP_API BOOL WTSVirtualChannelClose(
/* __in */ void* hChannelHandle);
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_WTSVC_H */