Browse Source

use blank keyboard state when trying to find out shortcut keys

pull/45/merge
Siegfried Pammer 12 years ago
parent
commit
058718f818
  1. 9
      src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs

9
src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs

@ -283,17 +283,14 @@ namespace ICSharpCode.Core.Presentation
/// <remarks>Only works with Windows.Forms.Keys. The WPF Key enum seems to be horribly distorted!</remarks> /// <remarks>Only works with Windows.Forms.Keys. The WPF Key enum seems to be horribly distorted!</remarks>
public static string KeyToUnicode(WinForms.Keys key) public static string KeyToUnicode(WinForms.Keys key)
{ {
StringBuilder sb = new StringBuilder(255); StringBuilder sb = new StringBuilder(256);
byte[] keyState = new byte[255];
IntPtr hkl = GetKeyboardLayout(0); IntPtr hkl = GetKeyboardLayout(0);
if (!GetKeyboardState(keyState)) return null;
uint scanCode = MapVirtualKeyEx((uint)key, 0, hkl); uint scanCode = MapVirtualKeyEx((uint)key, 0, hkl);
if (scanCode < 1) return null; if (scanCode < 1) return null;
ClearKeyboardBuffer(hkl); ClearKeyboardBuffer(hkl);
int len = ToUnicodeEx((uint)key, scanCode, keyState, sb, sb.Capacity, 0, hkl); int len = ToUnicodeEx((uint)key, scanCode, new byte[256], sb, sb.Capacity, 0, hkl);
if (len > 0) if (len > 0)
return sb.ToString(0, len).ToUpper(); return sb.ToString(0, len).ToUpper();
@ -307,7 +304,7 @@ namespace ICSharpCode.Core.Presentation
uint key = (uint)WinForms.Keys.Space; uint key = (uint)WinForms.Keys.Space;
int rc; int rc;
do { do {
rc = ToUnicodeEx(key, MapVirtualKeyEx(key, 0, hkl), new byte[255], sb, sb.Capacity, 0, hkl); rc = ToUnicodeEx(key, MapVirtualKeyEx(key, 0, hkl), new byte[256], sb, sb.Capacity, 0, hkl);
} while(rc < 0); } while(rc < 0);
} }

Loading…
Cancel
Save