Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2150 from jhsrennie/keylayout

Remove code loading US keyboard layout
  • Loading branch information...
commit 68faea5b1a529874265306962f6421b67b5a669c 2 parents fbc7113 + 9d6b5ab
jmarshallnz jmarshallnz authored
Showing with 0 additions and 9 deletions.
  1. +0 −9 xbmc/windowing/windows/WinEventsWin32.cpp
9 xbmc/windowing/windows/WinEventsWin32.cpp
View
@@ -57,7 +57,6 @@ HWND g_hWnd = NULL;
#define EXTKEYPAD(keypad) ((scancode & 0x100)?(mvke):(keypad))
static XBMCKey VK_keymap[XBMCK_LAST];
-static HKL hLayoutUS = NULL;
static GUID USB_HID_GUID = { 0x4D1E55B2, 0xF16F, 0x11CF, { 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30 } };
@@ -80,10 +79,6 @@ void DIB_InitOSKeymap()
GetKeyboardLayoutName(current_layout);
- hLayoutUS = LoadKeyboardLayout("00000409", KLF_NOTELLSHELL);
- if (!hLayoutUS)
- hLayoutUS = GetKeyboardLayout(0);
-
LoadKeyboardLayout(current_layout, KLF_ACTIVATE);
/* Map the VK keysyms */
@@ -237,10 +232,6 @@ void DIB_InitOSKeymap()
static int XBMC_MapVirtualKey(int scancode, int vkey)
{
-// It isn't clear why the US keyboard layout was being used. This causes
-// problems with e.g. the \ key. I have provisionally switched the code
-// to use the Windows layout.
-// int mvke = MapVirtualKeyEx(scancode & 0xFF, 1, hLayoutUS);
int mvke = MapVirtualKeyEx(scancode & 0xFF, 1, NULL);
switch(vkey)
Please sign in to comment.
Something went wrong with that request. Please try again.