mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-30 05:06:15 +00:00
winemac.drv: Resolve symbol vkeys first without modifiers.
This commit is contained in:
parent
c9d9ff6129
commit
c579dcc471
|
@ -874,15 +874,15 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data)
|
||||||
|
|
||||||
/* Now try to match key codes for certain common punctuation characters to
|
/* Now try to match key codes for certain common punctuation characters to
|
||||||
the most common OEM vkeys (e.g. '.' to VK_OEM_PERIOD). */
|
the most common OEM vkeys (e.g. '.' to VK_OEM_PERIOD). */
|
||||||
for (i = 0; i < ARRAY_SIZE(symbol_vkeys); i++)
|
for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++)
|
||||||
{
|
{
|
||||||
vkey = symbol_vkeys[i].vkey;
|
for (i = 0; i < ARRAY_SIZE(symbol_vkeys); i++)
|
||||||
|
|
||||||
if (vkey_used[vkey])
|
|
||||||
continue;
|
|
||||||
|
|
||||||
for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++)
|
|
||||||
{
|
{
|
||||||
|
vkey = symbol_vkeys[i].vkey;
|
||||||
|
|
||||||
|
if (vkey_used[vkey])
|
||||||
|
continue;
|
||||||
|
|
||||||
for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++)
|
for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++)
|
||||||
{
|
{
|
||||||
if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */
|
if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */
|
||||||
|
@ -898,9 +898,6 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vkey_used[vkey])
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue