MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed up formatting, debug messages in new Windows Hotkey stuff.

develop
Clayton Hughes 2012-03-09 01:07:47 -08:00
parent 3d1ce32785
commit 47bbe1a3ff
3 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Core.cpp
Unescape Escape View File

@ -882,7 +882,6 @@ bool Core::ncurses_wgetch(int in, int & out)
int Core::UnicodeAwareSym(const SDL::KeyboardEvent& ke) int Core::UnicodeAwareSym(const SDL::KeyboardEvent& ke)
{ {
con.print("Unicode came in as %d\n", ke.ksym.unicode);
// Assume keyboard layouts don't change the order of numbers: // Assume keyboard layouts don't change the order of numbers:
if( '0' <= ke.ksym.sym && ke.ksym.sym <= '9') return ke.ksym.sym; if( '0' <= ke.ksym.sym && ke.ksym.sym <= '9') return ke.ksym.sym;
@ -892,14 +891,12 @@ int Core::UnicodeAwareSym(const SDL::KeyboardEvent& ke)
if (unicode < ' ') if (unicode < ' ')
{ {
unicode += 'A' - 1; unicode += 'A' - 1;
con.print("Unicode is a control character. Adding 0x40: %d\n", unicode);
} }
// convert A-Z to their a-z counterparts: // convert A-Z to their a-z counterparts:
if('A' < unicode && unicode < 'Z') if('A' < unicode && unicode < 'Z')
{ {
unicode += 'a' - 'A'; unicode += 'a' - 'A';
con.print("Unicode is a upper case. Subtracting 0x20: %d\n", unicode);
} }
// convert various other punctuation marks: // convert various other punctuation marks:
@ -914,8 +911,6 @@ int Core::UnicodeAwareSym(const SDL::KeyboardEvent& ke)
if('}' == unicode) unicode = ']'; if('}' == unicode) unicode = ']';
if('~' == unicode) unicode = '`'; if('~' == unicode) unicode = '`';
con.print("Unicode punctuation filter. Now: %d\n", unicode);
return unicode; return unicode;
} }
@ -943,7 +938,6 @@ int Core::SDL_Event(SDL::Event* ev)
// user's Input Language // user's Input Language
if((ke->ksym.unicode & 0xff80) == 0) if((ke->ksym.unicode & 0xff80) == 0)
{ {
int key = UnicodeAwareSym(*ke); int key = UnicodeAwareSym(*ke);
SelectHotkey(key, mod); SelectHotkey(key, mod);
} }

4
library/Hooks-windows.cpp
Unescape Escape View File

@ -404,6 +404,10 @@ DFhackCExport int SDL_EnableKeyRepeat(int delay, int interval)
static int (*_SDL_EnableUNICODE)(int enable) = 0; static int (*_SDL_EnableUNICODE)(int enable) = 0;
DFhackCExport int SDL_EnableUNICODE(int enable) DFhackCExport int SDL_EnableUNICODE(int enable)
{ {
if(!enable)
{
fprintf(stderr, "SDL_EnableUNICODE turned off. Keybindings may break.\n");
}
return _SDL_EnableUNICODE(enable); return _SDL_EnableUNICODE(enable);
} }

1
library/include/Core.h
Unescape Escape View File

@ -179,7 +179,6 @@ namespace DFHack
tthread::condition_variable * HotkeyCond; tthread::condition_variable * HotkeyCond;
int UnicodeAwareSym(const SDL::KeyboardEvent& ke); int UnicodeAwareSym(const SDL::KeyboardEvent& ke);
bool SelectHotkey(int key, int modifiers); bool SelectHotkey(int key, int modifiers);
void *last_world_data_ptr; // for state change tracking void *last_world_data_ptr; // for state change tracking