Skip to content

Commit

Permalink
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Browse files Browse the repository at this point in the history
  • Loading branch information
@awakecoding
awakecoding committed Mar 19, 2013
2 parents 21a1070 + c01a934 commit 0b6872a
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 25 deletions.
6 changes: 3 additions & 3 deletions client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/utils/KeyboardMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,12 +433,12 @@ else if (vkcode > 0 && (event.getMetaState() & (KeyEvent.META_ALT_ON | KeyEvent.
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());
Expand Down
17 changes: 5 additions & 12 deletions client/Android/aFreeRDP/AndroidManifest.xml.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
14 changes: 8 additions & 6 deletions client/iOS/Controllers/RDPSessionViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,8 @@ - (void)loadView
// 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];
Expand Down Expand Up @@ -325,6 +321,12 @@ - (void)sessionWillConnect:(RDPSession*)session

- (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];
Expand Down Expand Up @@ -383,7 +385,7 @@ - (void)sessionBitmapContextDidChange:(RDPSession*)session

- (void)session:(RDPSession*)session needsRedrawInRect:(CGRect)rect
{
[_session_view setNeedsDisplayInRect:rect];
[_session_view setNeedsDisplayInRect:rect];
}

- (void)session:(RDPSession *)session requestsAuthenticationWithParams:(NSMutableDictionary *)params
Expand Down
8 changes: 4 additions & 4 deletions client/iOS/iFreeRDP.xcodeproj/project.pbxproj.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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\"",
Expand All @@ -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\"",
Expand Down
8 changes: 8 additions & 0 deletions include/freerdp/channels/wtsvc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -127,4 +131,8 @@ FREERDP_API BOOL WTSVirtualChannelWrite(
FREERDP_API BOOL WTSVirtualChannelClose(
/* __in */ void* hChannelHandle);

#ifdef __cplusplus
}
#endif

#endif /* FREERDP_WTSVC_H */

0 comments on commit 0b6872a

Please sign in to comment.