projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split of the line buffer from Console into ConsoleBuffer class
[supertux.git]
/
src
/
supertux
/
menu
/
keyboard_menu.cpp
diff --git
a/src/supertux/menu/keyboard_menu.cpp
b/src/supertux/menu/keyboard_menu.cpp
index
a34b974
..
e1c4d28
100644
(file)
--- a/
src/supertux/menu/keyboard_menu.cpp
+++ b/
src/supertux/menu/keyboard_menu.cpp
@@
-1,6
+1,6
@@
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>,
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>,
-// 2007 Ingo Ruhnke <grumbel@gm
x.de
>
+// 2007 Ingo Ruhnke <grumbel@gm
ail.com
>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@
-17,11
+17,13
@@
#include "supertux/menu/keyboard_menu.hpp"
#include "supertux/menu/keyboard_menu.hpp"
-#include "
util/gettext
.hpp"
+#include "
control/keyboard_manager
.hpp"
#include "supertux/gameconfig.hpp"
#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
+#include "util/gettext.hpp"
-KeyboardMenu::KeyboardMenu(
JoystickKeyboardController* _controll
er) :
-
controller(_controll
er)
+KeyboardMenu::KeyboardMenu(
InputManager& input_manag
er) :
+
m_input_manager(input_manag
er)
{
add_label(_("Setup Keyboard"));
add_hl();
{
add_label(_("Setup Keyboard"));
add_hl();
@@
-38,17
+40,17
@@
KeyboardMenu::KeyboardMenu(JoystickKeyboardController* _controller) :
if (g_config->console_enabled) {
add_controlfield(Controller::CONSOLE, _("Console"));
}
if (g_config->console_enabled) {
add_controlfield(Controller::CONSOLE, _("Console"));
}
- add_toggle(Controller::CONTROLCOUNT, _("Jump with Up"),
controll
er->jump_with_up_kbd);
+ add_toggle(Controller::CONTROLCOUNT, _("Jump with Up"),
m_input_manager.keyboard_manag
er->jump_with_up_kbd);
add_hl();
add_back(_("Back"));
add_hl();
add_back(_("Back"));
-
update
();
+
refresh
();
}
KeyboardMenu::~KeyboardMenu()
{}
std::string
}
KeyboardMenu::~KeyboardMenu()
{}
std::string
-KeyboardMenu::get_key_name(SDL
Key
key)
+KeyboardMenu::get_key_name(SDL
_Keycode
key)
{
switch(key) {
case SDLK_UNKNOWN:
{
switch(key) {
case SDLK_UNKNOWN:
@@
-78,7
+80,7
@@
KeyboardMenu::get_key_name(SDLKey key)
case SDLK_LALT:
return _("Left Alt");
default:
case SDLK_LALT:
return _("Left Alt");
default:
- return SDL_GetKeyName((SDL
Key
) key);
+ return SDL_GetKeyName((SDL
_Keycode
) key);
}
}
}
}
@@
-87,41
+89,42
@@
KeyboardMenu::menu_action(MenuItem* item)
{
if(item->id >= 0 && item->id < Controller::CONTROLCOUNT){
item->change_input(_("Press Key"));
{
if(item->id >= 0 && item->id < Controller::CONTROLCOUNT){
item->change_input(_("Press Key"));
-
controll
er->wait_for_key = item->id;
+
m_input_manager.keyboard_manag
er->wait_for_key = item->id;
} else if( item->id == Controller::CONTROLCOUNT) {
} else if( item->id == Controller::CONTROLCOUNT) {
-
controll
er->jump_with_up_kbd = item->toggled;
- }
+
m_input_manager.keyboard_manag
er->jump_with_up_kbd = item->toggled;
+ }
}
void
}
void
-KeyboardMenu::
update
()
+KeyboardMenu::
refresh
()
{
{
- // update menu
+ auto& kbd_mgr = m_input_manager.keyboard_manager;
+
get_item_by_id((int) Controller::UP).change_input(get_key_name(
get_item_by_id((int) Controller::UP).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::UP)));
+
kbd_mg
r->reversemap_key(Controller::UP)));
get_item_by_id((int) Controller::DOWN).change_input(get_key_name(
get_item_by_id((int) Controller::DOWN).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::DOWN)));
+
kbd_mg
r->reversemap_key(Controller::DOWN)));
get_item_by_id((int) Controller::LEFT).change_input(get_key_name(
get_item_by_id((int) Controller::LEFT).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::LEFT)));
+
kbd_mg
r->reversemap_key(Controller::LEFT)));
get_item_by_id((int) Controller::RIGHT).change_input(get_key_name(
get_item_by_id((int) Controller::RIGHT).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::RIGHT)));
+
kbd_mg
r->reversemap_key(Controller::RIGHT)));
get_item_by_id((int) Controller::JUMP).change_input(get_key_name(
get_item_by_id((int) Controller::JUMP).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::JUMP)));
+
kbd_mg
r->reversemap_key(Controller::JUMP)));
get_item_by_id((int) Controller::ACTION).change_input(get_key_name(
get_item_by_id((int) Controller::ACTION).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::ACTION)));
+
kbd_mg
r->reversemap_key(Controller::ACTION)));
get_item_by_id((int) Controller::PEEK_LEFT).change_input(get_key_name(
get_item_by_id((int) Controller::PEEK_LEFT).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::PEEK_LEFT)));
+
kbd_mg
r->reversemap_key(Controller::PEEK_LEFT)));
get_item_by_id((int) Controller::PEEK_RIGHT).change_input(get_key_name(
get_item_by_id((int) Controller::PEEK_RIGHT).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::PEEK_RIGHT)));
+
kbd_mg
r->reversemap_key(Controller::PEEK_RIGHT)));
get_item_by_id((int) Controller::PEEK_UP).change_input(get_key_name(
get_item_by_id((int) Controller::PEEK_UP).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::PEEK_UP)));
+
kbd_mg
r->reversemap_key(Controller::PEEK_UP)));
get_item_by_id((int) Controller::PEEK_DOWN).change_input(get_key_name(
get_item_by_id((int) Controller::PEEK_DOWN).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::PEEK_DOWN)));
+
kbd_mg
r->reversemap_key(Controller::PEEK_DOWN)));
if (g_config->console_enabled) {
get_item_by_id((int) Controller::CONSOLE).change_input(get_key_name(
if (g_config->console_enabled) {
get_item_by_id((int) Controller::CONSOLE).change_input(get_key_name(
-
controlle
r->reversemap_key(Controller::CONSOLE)));
+
kbd_mg
r->reversemap_key(Controller::CONSOLE)));
}
}
- get_item_by_id(Controller::CONTROLCOUNT).toggled =
controlle
r->jump_with_up_kbd;
+ get_item_by_id(Controller::CONTROLCOUNT).toggled =
kbd_mg
r->jump_with_up_kbd;
}
/* EOF */
}
/* EOF */