0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add debugging info: config level info.

Browse source
This commit is contained in:
Rusty Russell 2006-03-20 02:02:32 +00:00
parent 9b091a176c
commit e8bbc5ae7e
1 changed files with 40 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/hotkeys.cpp
View file

@ -34,6 +34,7 @@
#include <map>
#define ERR_G LOG_STREAM(err, general)
#define INFO_C LOG_STREAM(info, config)
namespace {
@ -218,12 +219,21 @@ void hotkey_item::set_key(int character, int keycode, bool shift, bool ctrl, boo
{
const std::string keyname = SDL_GetKeyName(SDLKey(keycode_));
INFO_C << "setting hotkey: char=" << lexical_cast<std::string>(character)
<< " keycode=" << lexical_cast<std::string>(keycode) << " "
<< (shift ? "shift," : "")
<< (ctrl ? "ctrl," : "")
<< (alt ? "alt," : "")
<< (cmd ? "cmd," : "")
<< "\n";
// Sometimes control modifies by -64, ie ^A == 1.
if (character < 64 && ctrl) {
if (shift)
character += 64;
else
character += 96;
INFO_C << "Mapped to character " << lexical_cast<std::string>(character) << "\n";
}
// We handle simple cases by character, others by the actual key.
@ -233,6 +243,7 @@ void hotkey_item::set_key(int character, int keycode, bool shift, bool ctrl, boo
ctrl_ = ctrl;
alt_ = alt;
cmd_ = cmd;
INFO_C << "type = BY_CHARACTER\n";
} else {
type_ = BY_KEYCODE;
keycode_ = keycode;
@ -240,6 +251,7 @@ void hotkey_item::set_key(int character, int keycode, bool shift, bool ctrl, boo
ctrl_ = ctrl;
alt_ = alt;
cmd_ = cmd;
INFO_C << "type = BY_KEYCODE\n";
}
}
@ -336,28 +348,45 @@ hotkey_item& get_hotkey(int character, int keycode, bool shift, bool ctrl, bool
{
std::vector<hotkey_item>::iterator itor;
INFO_C << "getting hotkey: char=" << lexical_cast<std::string>(character)
<< " keycode=" << lexical_cast<std::string>(keycode) << " "
<< (shift ? "shift," : "")
<< (ctrl ? "ctrl," : "")
<< (alt ? "alt," : "")
<< (cmd ? "cmd," : "")
<< "\n";
// Sometimes control modifies by -64, ie ^A == 1.
if (character < 64 && ctrl) {
if (shift)
character += 64;
else
character += 96;
INFO_C << "Mapped to character " << lexical_cast<std::string>(character) << "\n";
}
for (itor = hotkeys_.begin(); itor != hotkeys_.end(); ++itor) {
if (itor->get_type() == hotkey_item::BY_CHARACTER) {
if (character == itor->get_character()
&& ctrl == itor->get_ctrl()
&& alt == itor->get_alt()
&& cmd == itor->get_cmd())
break;
if (character == itor->get_character()) {
if (ctrl == itor->get_ctrl()
&& alt == itor->get_alt()
&& cmd == itor->get_cmd()) {
INFO_C << "Could match by character..." << "yes\n";
break;
}
INFO_C << "Could match by character..." << "but modifiers different\n";
}
} else if (itor->get_type() == hotkey_item::BY_KEYCODE) {
if (keycode == itor->get_keycode()
&& shift == itor->get_shift()
&& ctrl == itor->get_ctrl()
&& alt == itor->get_alt()
&& cmd == itor->get_cmd())
break;
if (keycode == itor->get_keycode()) {
if (shift == itor->get_shift()
&& ctrl == itor->get_ctrl()
&& alt == itor->get_alt()
&& cmd == itor->get_cmd()) {
INFO_C << "Could match by keycode..." << "yes\n";
break;
}
INFO_C << "Could match by keycode..." << "but modifiers different\n";
}
}
}