[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Feuerkraft-CVS] rev 316 - trunk/src/input
From: |
Ingo Ruhnke |
Subject: |
[Feuerkraft-CVS] rev 316 - trunk/src/input |
Date: |
Tue, 09 Dec 2003 13:58:46 +0100 |
Author: grumbel
Date: 2003-12-09 13:58:46 +0100 (Tue, 09 Dec 2003)
New Revision: 316
Modified:
trunk/src/input/button_factory.cxx
Log:
- fixed some bugs in the keyboard handling
Modified: trunk/src/input/button_factory.cxx
===================================================================
--- trunk/src/input/button_factory.cxx 2003-12-09 12:35:36 UTC (rev 315)
+++ trunk/src/input/button_factory.cxx 2003-12-09 12:58:46 UTC (rev 316)
@@ -35,7 +35,7 @@
}
else if (gh_equal_p(sym, gh_symbol2scm("keyboard-button")))
{
- return create_joystick_button(gh_cdr(lst));
+ return create_keyboard_button(gh_cdr(lst));
}
else
{
@@ -64,8 +64,10 @@
InputButton*
ButtonFactory::create_keyboard_button(SCM lst)
{
- std::string key_str = Guile::symbol2string(gh_cadr(lst));
+ gh_display(lst);
+ std::string key_str = Guile::scm2string(gh_car(lst));
int key_num = CL_Keyboard::get_device().keyid_to_string(key_str);
+
// FIXME: No error checking
return new InputButtonInputDevice(CL_Keyboard::get_device(), key_num);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Feuerkraft-CVS] rev 316 - trunk/src/input,
Ingo Ruhnke <=