mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r1040) Fix: All character hotkeys are disabled now when a window for typing is open

release/0.4.5
dominik 2004-12-12 22:05:08 +00:00
parent 9e3ca26ae6
commit 2690ba03b2
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main_gui.c
View File

@ -1809,7 +1809,6 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
case WKC_PAUSE: case WKC_PAUSE:
ToolbarPauseClick(w); ToolbarPauseClick(w);
break; break;
case 'L': ShowTerraformToolbar(); break;
case WKC_F2: ShowGameOptions(); break; case WKC_F2: ShowGameOptions(); break;
case WKC_F3: MenuClickSaveLoad(0); break; case WKC_F3: MenuClickSaveLoad(0); break;
case WKC_F4: ShowSmallMap(); break; case WKC_F4: ShowSmallMap(); break;
@ -1835,7 +1834,6 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
case WKC_SHIFT | WKC_F12: ShowMusicWindow(); break; case WKC_SHIFT | WKC_F12: ShowMusicWindow(); break;
case WKC_CTRL | 'S': _make_screenshot = 1; break; case WKC_CTRL | 'S': _make_screenshot = 1; break;
case WKC_CTRL | 'G': _make_screenshot = 2; break; case WKC_CTRL | 'G': _make_screenshot = 2; break;
case WKC_BACKQUOTE: IConsoleSwitch(); e->keypress.cont=false; break;
case WKC_CTRL | WKC_ALT | 'C': if (!_networking) ShowCheatWindow(); break; case WKC_CTRL | WKC_ALT | 'C': if (!_networking) ShowCheatWindow(); break;
} }
} break; } break;
@ -2324,11 +2322,20 @@ static void MainWindowWndProc(Window *w, WindowEvent *e) {
ShowBuildRailToolbar(_last_built_railtype, 0); ShowBuildRailToolbar(_last_built_railtype, 0);
break; break;
case 'L':
ShowTerraformToolbar();
break;
case 'X': case 'X':
_display_opt ^= DO_TRANS_BUILDINGS; _display_opt ^= DO_TRANS_BUILDINGS;
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WKC_BACKQUOTE:
IConsoleSwitch();
e->keypress.cont=false;
break;
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
case 'T' | WKC_SHIFT: case 'T' | WKC_SHIFT:
ShowNetworkChatQueryWindow(DESTTYPE_BROADCAST, 0); ShowNetworkChatQueryWindow(DESTTYPE_BROADCAST, 0);

5
rail_gui.c
View File

@ -612,6 +612,11 @@ static void BuildRailToolbWndProc(Window *w, WindowEvent *e)
case WE_KEYPRESS: { case WE_KEYPRESS: {
int i; int i;
// check if we have a query string window open before allowing hotkeys
if(FindWindowById(WC_QUERY_STRING, 0)!=NULL)
break;
for(i=0; i!=lengthof(_rail_keycodes); i++) for(i=0; i!=lengthof(_rail_keycodes); i++)
if (e->keypress.keycode == _rail_keycodes[i]) { if (e->keypress.keycode == _rail_keycodes[i]) {
e->keypress.cont = false; e->keypress.cont = false;

4
road_gui.c
View File

@ -192,6 +192,10 @@ static void BuildRoadToolbWndProc(Window *w, WindowEvent *e) {
} break; } break;
case WE_KEYPRESS: case WE_KEYPRESS:
// check if we have a query string window open before allowing hotkeys
if(FindWindowById(WC_QUERY_STRING, 0)!=NULL)
break;
switch(e->keypress.keycode) { switch(e->keypress.keycode) {
case '1': BuildRoadClick_NE(w); break; case '1': BuildRoadClick_NE(w); break;
case '2': BuildRoadClick_NW(w); break; case '2': BuildRoadClick_NW(w); break;

5
terraform_gui.c
View File

@ -121,6 +121,11 @@ static void TerraformToolbWndProc(Window *w, WindowEvent *e)
case WE_KEYPRESS: case WE_KEYPRESS:
{ {
int i; int i;
// check if we have a query string window open before allowing hotkeys
if(FindWindowById(WC_QUERY_STRING, 0)!=NULL)
break;
for(i=0; i!=lengthof(_terraform_keycodes); i++) for(i=0; i!=lengthof(_terraform_keycodes); i++)
if (e->keypress.keycode == _terraform_keycodes[i]) { if (e->keypress.keycode == _terraform_keycodes[i]) {
e->keypress.cont = false; e->keypress.cont = false;