read(node);
}
+FGBinding::~FGBinding ()
+{
+ _arg->getParent()->removeChild(_arg->getName(), _arg->getIndex(), false);
+}
+
void
FGBinding::read (const SGPropertyNode * node)
{
return;
}
- _arg = new SGPropertyNode;
+ _arg = (SGPropertyNode *)node;
_setting = 0;
- copyProperties(node, _arg); // FIXME: don't use whole node!!!
}
void
button &b = _key_bindings[k];
// Key pressed.
- if (modifiers&KEYMOD_RELEASED == 0) {
+ if (!(modifiers & KEYMOD_RELEASED)) {
SG_LOG( SG_INPUT, SG_DEBUG, "User pressed key " << k
<< " with modifiers " << modifiers );
if (!b.last_state || b.is_repeatable) {
- const binding_list_t &bindings =
- _find_key_bindings(k, modifiers);
- int max = bindings.size();
- if (max > 0) {
- for (int i = 0; i < max; i++)
- bindings[i]->fire();
- return;
- }
+ const binding_list_t &bindings = _find_key_bindings(k, modifiers);
+
+ for (unsigned int i = 0; i < bindings.size(); i++)
+ bindings[i]->fire();
+ b.last_state = 1;
}
}
// Key released.
SG_LOG(SG_INPUT, SG_DEBUG, "User released key " << k
<< " with modifiers " << modifiers);
if (b.last_state) {
- const binding_list_t &bindings =
- _find_key_bindings(k, modifiers);
- int max = bindings.size();
- if (max > 0) {
- for (int i = 0; i < max; i++)
- bindings[i]->fire();
- return;
- }
+ const binding_list_t &bindings = _find_key_bindings(k, modifiers);
+ for (unsigned int i = 0; i < bindings.size(); i++)
+ bindings[i]->fire();
+ b.last_state = 0;
}
}
}
FGInput::_init_keyboard ()
{
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing key bindings");
+ _module[0] = 0;
SGPropertyNode * key_nodes = fgGetNode("/input/keyboard");
if (key_nodes == 0) {
SG_LOG(SG_INPUT, SG_WARN, "No key bindings (/input/keyboard)!!");
_key_bindings[index].bindings->clear();
_key_bindings[index].is_repeatable = keys[i]->getBoolValue("repeatable");
+ _key_bindings[index].last_state = 0;
_read_bindings(keys[i], _key_bindings[index].bindings, KEYMOD_NONE);
}
}
jsInit();
// TODO: zero the old bindings first.
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing joystick bindings");
- SGPropertyNode * js_nodes = fgGetNode("/input/joysticks");
- if (js_nodes == 0) {
- SG_LOG(SG_INPUT, SG_WARN, "No joystick bindings (/input/joysticks)!!");
- js_nodes = fgGetNode("/input/joysticks", true);
- }
+ SGPropertyNode * js_nodes = fgGetNode("/input/joysticks", true);
// read all joystick xml files into /input/joysticks/js_named[1000++]
SGPath path(globals->get_fg_root());
jsmap[names[j]->getStringValue()] = n;
}
+ // set up js[] nodes
for (int i = 0; i < MAX_JOYSTICKS; i++) {
jsJoystick * js = new jsJoystick(i);
_joystick_bindings[i].js = js;
+
if (js->notWorking()) {
SG_LOG(SG_INPUT, SG_DEBUG, "Joystick " << i << " not found");
continue;
if ((named = jsmap[name])) {
string source = named->getStringValue("source", "user defined");
- SG_LOG(SG_INPUT, SG_INFO, "... found joystick: \"" << source << '"');
+ SG_LOG(SG_INPUT, SG_INFO, "... found joystick: " << source);
} else if ((named = jsmap["default"])) {
string source = named->getStringValue("source", "user defined");
<< "\"\nUsing default: \"" << source << '"');
} else {
- throw sg_throwable(string("No default joystick found! (<name>default</name>)"));
+ throw sg_throwable(string("No joystick configuration file with "
+ "<name>default</name> entry found!"));
}
js_node = js_nodes->getChild("js", i, true);
copyProperties(named, js_node);
js_node->setStringValue("id", name);
}
+ }
+
+ // get rid of unused config nodes
+ js_nodes->removeChildren("js-named", false);
+}
+
+
+void
+FGInput::_postinit_joystick()
+{
+ FGNasalSys *nasalsys = (FGNasalSys *)globals->get_subsystem("nasal");
+ SGPropertyNode *js_nodes = fgGetNode("/input/joysticks");
+ for (int i = 0; i < MAX_JOYSTICKS; i++) {
+ SGPropertyNode_ptr js_node = js_nodes->getChild("js", i);
+ jsJoystick *js = _joystick_bindings[i].js;
+ if (!js_node || js->notWorking())
+ continue;
#ifdef WIN32
JOYCAPS jsCaps ;
joyGetDevCaps( i, &jsCaps, sizeof(jsCaps) );
- int nbuttons = jsCaps.wNumButtons;
+ unsigned int nbuttons = jsCaps.wNumButtons;
if (nbuttons > MAX_JOYSTICK_BUTTONS) nbuttons = MAX_JOYSTICK_BUTTONS;
#else
- int nbuttons = MAX_JOYSTICK_BUTTONS;
+ unsigned int nbuttons = MAX_JOYSTICK_BUTTONS;
#endif
int naxes = js->getNumAxes();
_joystick_bindings[i].axes = new axis[naxes];
_joystick_bindings[i].buttons = new button[nbuttons];
+ //
+ // Initialize nasal groups.
+ //
+ string init;
+ init = "this=\"" + string(js_node->getPath()) + "\"";
+ sprintf(_module, "__js%d", i);
+ nasalsys->createModule(_module, _module, init.c_str(), init.size());
+
+ vector<SGPropertyNode_ptr> nasal = js_node->getChildren("nasal");
+ unsigned int j;
+ for (j = 0; j < nasal.size(); j++) {
+ nasal[j]->setStringValue("module", _module);
+ nasalsys->handleCommand(nasal[j]);
+ }
//
// Initialize the axes.
//
vector<SGPropertyNode_ptr> axes = js_node->getChildren("axis");
size_t nb_axes = axes.size();
- int j;
- for (j = 0; j < (int)nb_axes; j++) {
+ for (j = 0; j < nb_axes; j++ ) {
const SGPropertyNode * axis_node = axes[j];
const SGPropertyNode * num_node = axis_node->getChild("number");
int n_axis = axis_node->getIndex();
//
vector<SGPropertyNode_ptr> buttons = js_node->getChildren("button");
char buf[32];
- for (j = 0; (j < (int)buttons.size()) && (j < nbuttons); j++) {
+ for (j = 0; j < buttons.size() && j < nbuttons; j++) {
const SGPropertyNode * button_node = buttons[j];
const SGPropertyNode * num_node = button_node->getChild("number");
size_t n_but = button_node->getIndex();
n_but = num_node->getIntValue(TGT_PLATFORM,n_but);
}
- if (n_but >= (size_t)nbuttons) {
+ if (n_but >= nbuttons) {
SG_LOG(SG_INPUT, SG_DEBUG, "Dropping bindings for button " << n_but);
continue;
}
js->setMaxRange(maxRange);
js->setCenter(center);
}
-
- for (unsigned int m = 0; m < js_named.size(); m++)
- js_nodes->removeChild("js-named", js_named[m]->getIndex(), false);
-}
-
-
-void
-FGInput::_postinit_joystick()
-{
- vector<SGPropertyNode_ptr> js = fgGetNode("/input/joysticks")->getChildren("js");
- for (unsigned int i = 0; i < js.size(); i++) {
- vector<SGPropertyNode_ptr> nasal = js[i]->getChildren("nasal");
- for (unsigned int j = 0; j < nasal.size(); j++)
- ((FGNasalSys*)globals->get_subsystem("nasal"))->handleCommand(nasal[j]);
- }
}
FGInput::_init_mouse ()
{
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing mouse bindings");
+ _module[0] = 0;
SGPropertyNode * mouse_nodes = fgGetNode("/input/mice");
if (mouse_nodes == 0) {
js->read(&buttons, axis_values);
-
// Fire bindings for the axes.
for ( j = 0; j < _joystick_bindings[i].naxes; j++) {
axis &a = _joystick_bindings[i].axes[j];
SG_LOG(SG_INPUT, SG_DEBUG, "Reading all bindings");
vector<SGPropertyNode_ptr> bindings = node->getChildren("binding");
for (unsigned int i = 0; i < bindings.size(); i++) {
- SG_LOG(SG_INPUT, SG_DEBUG, "Reading binding "
- << bindings[i]->getStringValue("command"));
+ const char *cmd = bindings[i]->getStringValue("command");
+ SG_LOG(SG_INPUT, SG_DEBUG, "Reading binding " << cmd);
+
+ if (!strcmp(cmd, "nasal") && _module[0])
+ bindings[i]->setStringValue("module", _module);
binding_list[modifiers].push_back(new FGBinding(bindings[i]));
}
projects / flightgear.git / blobdiff