Merge https://github.com/ClaytonHughes/dfhack

library/Core.cpp

@@ -50,8 +50,6 @@ using namespace std;
 #include "modules/Windows.h"
 using namespace DFHack;
 
-#include "SDL_events.h"
-
 #include "df/ui.h"
 #include "df/world.h"
 #include "df/world_data.h"
@@ -882,6 +880,40 @@ bool Core::ncurses_wgetch(int in, int & out)
     return true;
 }
 
+int Core::UnicodeAwareSym(const SDL::KeyboardEvent& ke)
+{
+    // Assume keyboard layouts don't change the order of numbers:
+    if( '0' <= ke.ksym.sym && ke.ksym.sym <= '9') return ke.ksym.sym;
+
+    int unicode = ke.ksym.unicode;
+
+    // convert Ctrl characters to their 0x40-0x5F counterparts:
+    if (unicode < ' ')
+    {        
+        unicode += 'A' - 1;
+    }
+
+    // convert A-Z to their a-z counterparts:
+    if('A' < unicode && unicode < 'Z')
+    {
+        unicode += 'a' - 'A';
+    }    
+
+    // convert various other punctuation marks:
+    if('\"' == unicode) unicode = '\'';
+    if('+' == unicode) unicode = '=';
+    if(':' == unicode) unicode = ';';
+    if('<' == unicode) unicode = ',';
+    if('>' == unicode) unicode = '.';
+    if('?' == unicode) unicode = '/';
+    if('{' == unicode) unicode = '[';
+    if('|' == unicode) unicode = '\\';
+    if('}' == unicode) unicode = ']';
+    if('~' == unicode) unicode = '`';
+
+    return unicode;
+}
+
 //MEMO: return false if event is consumed
 int Core::SDL_Event(SDL::Event* ev)
 {
@@ -902,7 +934,18 @@ int Core::SDL_Event(SDL::Event* ev)
             if (ke->ksym.mod & SDL::KMOD_CTRL) mod |= 2;
             if (ke->ksym.mod & SDL::KMOD_ALT) mod |= 4;
 
-            SelectHotkey(ke->ksym.sym, mod);
+            // Use unicode so Windows gives the correct value for the
+            // user's Input Language
+            if((ke->ksym.unicode & 0xff80) == 0)
+            {
+                int key = UnicodeAwareSym(*ke);
+                SelectHotkey(key, mod);
+            }
+            else
+            {
+                // Pretend non-ascii characters don't happen:
+                SelectHotkey(ke->ksym.sym, mod);
+            }
         }
         else if(ke->state == SDL::BTN_RELEASED)
         {

library/Hooks-windows.cpp

@@ -404,6 +404,10 @@ DFhackCExport int SDL_EnableKeyRepeat(int delay, int interval)
 static int (*_SDL_EnableUNICODE)(int enable) = 0;
 DFhackCExport int SDL_EnableUNICODE(int enable)
 {
+    if(!enable)
+    {
+        fprintf(stderr, "SDL_EnableUNICODE turned off.  Keybindings may break.\n");
+    }
     return _SDL_EnableUNICODE(enable);
 }
 
@@ -800,6 +804,8 @@ bool FirstCall()
     _SDL_SemWait = (int (*)(void *))GetProcAddress(realSDLlib,"SDL_SemWait");
     _SDL_ThreadID = (uint32_t (*)(void))GetProcAddress(realSDLlib,"SDL_ThreadID");
     
+    _SDL_EnableUNICODE(1);
+
     fprintf(stderr,"Initized HOOKS!\n");
     inited = true;
     return 1;

library/include/Core.h

@@ -33,6 +33,7 @@ distribution.
 #include <stdint.h>
 #include "Console.h"
 #include "modules/Graphic.h"
+#include "SDL_events.h"
 
 struct WINDOW;
 
@@ -177,6 +178,7 @@ namespace DFHack
         tthread::mutex * HotkeyMutex;
         tthread::condition_variable * HotkeyCond;
 
+        int UnicodeAwareSym(const SDL::KeyboardEvent& ke);
         bool SelectHotkey(int key, int modifiers);
 
         void *last_world_data_ptr; // for state change tracking