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

Merge pull request #1107 from mfleisz/iosfix 

iOS: Fixed keyboard issues
This commit is contained in:
Marc-André Moreau 2013-03-18 06:22:27 -07:00
parent 39e024fc71 212673d7e9
commit e530b04585
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/iOS/Misc/Utils.m
View File

@ -223,8 +223,7 @@ NSMutableArray* FilterHistory(NSArray* history, NSString* filterStr)
#pragma mark Version Info
NSString* TSXAppFullVersion()
{
NSDictionary* info_dict = [[NSBundle mainBundle] infoDictionary];
return [NSString stringWithFormat:@"%@.%@ (%@)", [info_dict objectForKey:@"CFBundleShortVersionString"], [info_dict objectForKey:@"CFBundleVersion"], [NSString stringWithUTF8String:GIT_REVISION]];
return [NSString stringWithUTF8String:GIT_REVISION];
}
#pragma mark iPad/iPhone detection

4
client/iOS/Models/RDPKeyboard.m
View File

@ -204,7 +204,7 @@
// toggle windows key, returns true if pressed, otherwise false
- (void)toggleWinKey
{
[self sendVirtualKey:VK_LWIN up:_win_pressed];
[self sendVirtualKey:(VK_LWIN | KBDEXT) up:_win_pressed];
_win_pressed = !_win_pressed;
[self notifyDelegateModifiersChanged];
}
@ -213,7 +213,7 @@
- (void)sendEnterKeyStroke
{
[self sendVirtualKeyCode:VK_RETURN];
[self sendVirtualKeyCode:(VK_RETURN | KBDEXT)];
}
- (void)sendEscapeKeyStroke

30
client/iOS/Views/AdvancedKeyboardView.m
View File

@ -52,17 +52,17 @@ struct ButtonItem functionKeysItems[24] =
{ @"img:icon_key_arrows", KEY_SHOW_CURSORVIEW },
{ @"Tab", VK_TAB },
{ @"Ins", VK_INSERT },
{ @"Home", VK_HOME },
{ @"PgUp", VK_PRIOR },
{ @"img:icon_key_win", VK_LWIN },
{ @"Ins", VK_INSERT | KBDEXT },
{ @"Home", VK_HOME | KBDEXT },
{ @"PgUp", VK_PRIOR | KBDEXT },
{ @"img:icon_key_win", VK_LWIN | KBDEXT },
{ @"123", KEY_SHOW_NUMPADVIEW },
{ @"Print", VK_PRINT },
{ @"Del", VK_DELETE },
{ @"End", VK_END },
{ @"PgDn", VK_NEXT },
{ @"img:icon_key_menu", VK_APPS }
{ @"Del", VK_DELETE | KBDEXT },
{ @"End", VK_END | KBDEXT },
{ @"PgDn", VK_NEXT | KBDEXT },
{ @"img:icon_key_menu", VK_APPS | KBDEXT }
};
@ -75,7 +75,7 @@ struct ButtonItem numPadKeysItems[24] =
{ @"9", VK_NUMPAD9 },
{ @"-", VK_SUBTRACT },
{ @"/", VK_DIVIDE },
{ @"/", VK_DIVIDE | KBDEXT },
{ @"*", VK_MULTIPLY },
{ @"4", VK_NUMPAD4 },
{ @"5", VK_NUMPAD5 },
@ -94,7 +94,7 @@ struct ButtonItem numPadKeysItems[24] =
{ @"", KEY_MERGE_COLUMN },
{ @"0", VK_NUMPAD0 },
{ @".", VK_DECIMAL },
{ @"img:icon_key_return", VK_RETURN }
{ @"img:icon_key_return", VK_RETURN | KBDEXT }
};
@ -110,23 +110,23 @@ struct ButtonItem cursorKeysItems[24] =
{ @"", KEY_SKIP },
{ @"", KEY_SKIP },
{ @"", KEY_SKIP },
{ @"img:icon_key_arrow_up", VK_UP },
{ @"img:icon_key_arrow_up", VK_UP | KBDEXT },
{ @"", KEY_SKIP },
{ @"", KEY_SKIP },
{ @"Fn", KEY_SHOW_FUNCVIEW },
{ @"", KEY_SKIP },
{ @"img:icon_key_arrow_left", VK_LEFT },
{ @"img:icon_key_arrow_left", VK_LEFT | KBDEXT },
{ @"", KEY_SKIP },
{ @"img:icon_key_arrow_right", VK_RIGHT },
{ @"img:icon_key_arrow_right", VK_RIGHT | KBDEXT },
{ @"img:icon_key_backspace", VK_BACK },
{ @"123", KEY_SHOW_NUMPADVIEW },
{ @"", KEY_SKIP },
{ @"", KEY_SKIP },
{ @"img:icon_key_arrow_down", VK_DOWN },
{ @"img:icon_key_arrow_down", VK_DOWN | KBDEXT },
{ @"", KEY_SKIP },
{ @"img:icon_key_return", VK_RETURN }
{ @"img:icon_key_return", VK_RETURN | KBDEXT }
};

2
client/iOS/iFreeRDP.plist
View File

@ -24,7 +24,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>