Skip to content
This repository
Browse code

Merge pull request #2150 from jhsrennie/keylayout

Remove code loading US keyboard layout
  • Loading branch information...
commit 68faea5b1a529874265306962f6421b67b5a669c 2 parents fbc7113 + 9d6b5ab
jmarshallnz authored January 31, 2013

Showing 1 changed file with 0 additions and 9 deletions. Show diff stats Hide diff stats

  1. 9  xbmc/windowing/windows/WinEventsWin32.cpp
9  xbmc/windowing/windows/WinEventsWin32.cpp
@@ -57,7 +57,6 @@ HWND g_hWnd = NULL;
57 57
 #define EXTKEYPAD(keypad) ((scancode & 0x100)?(mvke):(keypad))
58 58
 
59 59
 static XBMCKey VK_keymap[XBMCK_LAST];
60  
-static HKL hLayoutUS = NULL;
61 60
 
62 61
 static GUID USB_HID_GUID = { 0x4D1E55B2, 0xF16F, 0x11CF, { 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30 } };
63 62
 
@@ -80,10 +79,6 @@ void DIB_InitOSKeymap()
80 79
 
81 80
   GetKeyboardLayoutName(current_layout);
82 81
 
83  
-  hLayoutUS = LoadKeyboardLayout("00000409", KLF_NOTELLSHELL);
84  
-  if (!hLayoutUS)
85  
-    hLayoutUS = GetKeyboardLayout(0);
86  
-
87 82
   LoadKeyboardLayout(current_layout, KLF_ACTIVATE);
88 83
 
89 84
   /* Map the VK keysyms */
@@ -237,10 +232,6 @@ void DIB_InitOSKeymap()
237 232
 
238 233
 static int XBMC_MapVirtualKey(int scancode, int vkey)
239 234
 {
240  
-// It isn't clear why the US keyboard layout was being used. This causes
241  
-// problems with e.g. the \ key. I have provisionally switched the code
242  
-// to use the Windows layout.
243  
-// int mvke = MapVirtualKeyEx(scancode & 0xFF, 1, hLayoutUS);
244 235
   int mvke = MapVirtualKeyEx(scancode & 0xFF, 1, NULL);
245 236
 
246 237
   switch(vkey)

0 notes on commit 68faea5

Please sign in to comment.
Something went wrong with that request. Please try again.