cpp/openttd-patchpack/source Changeset - r129:8ef2815ca423

Changeset - r129:8ef2815ca423

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

dominik - 20 years ago 2004-08-24 11:53:30
dominik@openttd.org

(svn r130) Change: hotkey for console is Backquote (the key left to '1', regardless of keyboard layout

4 files changed with 14 insertions and 11 deletions:

console.c

intro_gui.c

sdl.c

window.h

0 comments (0 inline, 0 general)

console.c

➞

Show inline comments

@@ @@ -108,7 +108,7 @@ static void IConsoleWndProc(Window *w, W @@
 	case WE_KEYPRESS:
 		e->keypress.cont=false;
-		if (e->keypress.keycode == WKC_TAB)
+		if (e->keypress.keycode == WKC_BACKQUOTE)
+			{
 			IConsoleSwitch();
 			} else

intro_gui.c

➞

Show inline comments

@@ @@ -6,7 +6,7 @@ @@
 #include "viewport.h"
 #include "gfx.h"
 #include "player.h"
-#include "command.h"
 #include "command.h"
 #include "console.h"
 extern void MakeNewGame();
@@ @@ -70,11 +70,11 @@ static void SelectGameWndProc(Window *w, @@
 		case 12: case 13: case 14: case 15:
 			DoCommandP(0, e->click.widget - 12, 0, NULL, CMD_SET_NEW_LANDSCAPE_TYPE);
 			break;
+		}
 	case WE_KEYPRESS:
 		switch(e->keypress.keycode) {
 		case WKC_TAB: IConsoleSwitch(); break;
+		}
+		}
 	case WE_KEYPRESS:
 		switch(e->keypress.keycode) {
 		case WKC_BACKQUOTE: IConsoleSwitch(); break;
+		}
 		break;
+	}
+}

sdl.c

➞

Show inline comments

@@ @@ -344,8 +344,6 @@ static const VkMapping _vk_mapping[] = { @@
 	AM(SDLK_a,SDLK_z,'A','Z'),
 	AM(SDLK_0,SDLK_9,'0','9'),
 	AS(SDLK_AMPERSAND, WKC_AMPERSAND), // mainly for french keyboards
 	AS(SDLK_ESCAPE,	WKC_ESC),
 	AS(SDLK_BACKSPACE,	WKC_BACKSPACE),
@@ @@ -385,6 +383,9 @@ static uint32 ConvertSdlKeyIntoMy(SDL_ke @@
 			break;
+		}
+	}
 	// check scancode for BACKQUOTE key, because we want the key left of "1", not anything else (on non-US keyboards)
 	if (sym->scancode == 49) key |= WKC_BACKQUOTE;
 	// META are the command keys on mac
 	if (sym->mod & KMOD_META) key |= WKC_META;

window.h

➞

Show inline comments

@@ @@ -124,8 +124,10 @@ enum WindowKeyCodes { @@
 	WKC_F11 = 43,
 	WKC_F12 = 44,
 	// Required for french keyboard
 	WKC_AMPERSAND = 45,
 	// backquote is the key left of "1"
 	// we only store this key here, no matter what character is really mapped to it
 	// on a particular keyboard. (US keyboard: ` and ~ ; German keyboard: ^ and °)
 	WKC_BACKQUOTE = 45,
 	// 0-9 are mapped to 48-57
 	// A-Z are mapped to 65-90

0 comments (0 inline, 0 general)