ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac: Allow Command to be mapped to Ctrl. 

Adds the following registry options, which configure the Mac driver to
map Command to Ctrl:

HKEY_CURRENT_USER\Software\Wine\Mac Driver\LeftCommandIsCtrl
HKEY_CURRENT_USER\Software\Wine\Mac Driver\RightCommandIsCtrl

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35351
Signed-off-by: Ricky Zhou <ricky@rzhou.org>
Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ricky Zhou 2018-09-12 02:35:30 -07:00 committed by Alexandre Julliard
parent 64d9f309b7
commit f621baa00f
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/winemac.drv/cocoa_window.m
View File

@ -140,22 +140,27 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
*modifiers &= ~NX_ALTERNATEMASK; *modifiers &= ~NX_ALTERNATEMASK;
} }
static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modifiers) static inline NSUInteger adjusted_modifiers_for_settings(NSUInteger modifiers)
{ {
fix_device_modifiers_by_generic(&modifiers); fix_device_modifiers_by_generic(&modifiers);
if (left_option_is_alt && (modifiers & NX_DEVICELALTKEYMASK)) NSUInteger new_modifiers = modifiers & ~(NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK |
{ NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK);
modifiers |= NX_DEVICELCMDKEYMASK;
modifiers &= ~NX_DEVICELALTKEYMASK;
}
if (right_option_is_alt && (modifiers & NX_DEVICERALTKEYMASK))
{
modifiers |= NX_DEVICERCMDKEYMASK;
modifiers &= ~NX_DEVICERALTKEYMASK;
}
fix_generic_modifiers_by_device(&modifiers);
return modifiers; // The MACDRV keyboard driver translates Command keys to Alt. If the
// Option key (NX_DEVICE[LR]ALTKEYMASK) should behave like Alt in
// Windows, rewrite it to Command (NX_DEVICE[LR]CMDKEYMASK).
if (modifiers & NX_DEVICELALTKEYMASK)
new_modifiers |= left_option_is_alt ? NX_DEVICELCMDKEYMASK : NX_DEVICELALTKEYMASK;
if (modifiers & NX_DEVICERALTKEYMASK)
new_modifiers |= right_option_is_alt ? NX_DEVICERCMDKEYMASK : NX_DEVICERALTKEYMASK;
if (modifiers & NX_DEVICELCMDKEYMASK)
new_modifiers |= left_command_is_ctrl ? NX_DEVICELCTLKEYMASK : NX_DEVICELCMDKEYMASK;
if (modifiers & NX_DEVICERCMDKEYMASK)
new_modifiers |= right_command_is_ctrl ? NX_DEVICERCTLKEYMASK : NX_DEVICERCMDKEYMASK;
fix_generic_modifiers_by_device(&new_modifiers);
return new_modifiers;
} }
@ -2059,7 +2064,7 @@ - (void) postKeyEvent:(NSEvent *)theEvent
[self flagsChanged:theEvent]; [self flagsChanged:theEvent];
[self postKey:[theEvent keyCode] [self postKey:[theEvent keyCode]
pressed:[theEvent type] == NSKeyDown pressed:[theEvent type] == NSKeyDown
modifiers:adjusted_modifiers_for_option_behavior([theEvent modifierFlags]) modifiers:adjusted_modifiers_for_settings([theEvent modifierFlags])
event:theEvent]; event:theEvent];
} }
@ -2679,7 +2684,7 @@ - (void) flagsChanged:(NSEvent *)theEvent
{ NX_DEVICERCMDKEYMASK, kVK_RightCommand }, { NX_DEVICERCMDKEYMASK, kVK_RightCommand },
}; };
NSUInteger modifierFlags = adjusted_modifiers_for_option_behavior([theEvent modifierFlags]); NSUInteger modifierFlags = adjusted_modifiers_for_settings([theEvent modifierFlags]);
NSUInteger changed; NSUInteger changed;
int i, last_changed; int i, last_changed;

2
dlls/winemac.drv/macdrv_cocoa.h
View File

@ -159,6 +159,8 @@
extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN;
extern int left_option_is_alt DECLSPEC_HIDDEN; extern int left_option_is_alt DECLSPEC_HIDDEN;
extern int right_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN;
extern int left_command_is_ctrl DECLSPEC_HIDDEN;
extern int right_command_is_ctrl DECLSPEC_HIDDEN;
extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN;
extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN;
extern int use_precise_scrolling DECLSPEC_HIDDEN; extern int use_precise_scrolling DECLSPEC_HIDDEN;

12
dlls/winemac.drv/macdrv_main.c
View File

@ -52,6 +52,8 @@ BOOL allow_vsync = TRUE;
BOOL allow_set_gamma = TRUE; BOOL allow_set_gamma = TRUE;
int left_option_is_alt = 0; int left_option_is_alt = 0;
int right_option_is_alt = 0; int right_option_is_alt = 0;
int left_command_is_ctrl = 0;
int right_command_is_ctrl = 0;
BOOL allow_software_rendering = FALSE; BOOL allow_software_rendering = FALSE;
BOOL disable_window_decorations = FALSE; BOOL disable_window_decorations = FALSE;
int allow_immovable_windows = TRUE; int allow_immovable_windows = TRUE;
@ -172,6 +174,16 @@ static void setup_options(void)
if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer)))
right_option_is_alt = IS_OPTION_TRUE(buffer[0]); right_option_is_alt = IS_OPTION_TRUE(buffer[0]);
if (!get_config_key(hkey, appkey, "LeftCommandIsCtrl", buffer, sizeof(buffer)))
left_command_is_ctrl = IS_OPTION_TRUE(buffer[0]);
if (!get_config_key(hkey, appkey, "RightCommandIsCtrl", buffer, sizeof(buffer)))
right_command_is_ctrl = IS_OPTION_TRUE(buffer[0]);
if (left_command_is_ctrl && right_command_is_ctrl && !left_option_is_alt && !right_option_is_alt)
WARN("Both Command keys have been mapped to Control. There is no way to "
"send an Alt key to Windows applications. Consider enabling "
"LeftOptionIsAlt or RightOptionIsAlt.\n");
if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer)))
allow_software_rendering = IS_OPTION_TRUE(buffer[0]); allow_software_rendering = IS_OPTION_TRUE(buffer[0]);