fly/flightgear
1
0
Fork 0
Code Activity

fixed #308: "Reload input" did not respect joysticks.xml

Browse source 
Predefined joystick information must be maintained on "reload input".
This commit is contained in:
ThorstenB 2011-05-28 11:16:03 +02:00
parent a336a96304
commit be1117f782
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Input/FGJoystickInput.cxx
View file

@ -49,7 +49,8 @@ FGJoystickInput::joystick::joystick ()
naxes(0),
nbuttons(0),
axes(0),
buttons(0)
buttons(0),
predefined(true)
{
}
@ -73,15 +74,18 @@ FGJoystickInput::FGJoystickInput()
FGJoystickInput::~FGJoystickInput()
{
_remove();
_remove(true);
}
void FGJoystickInput::_remove()
void FGJoystickInput::_remove(bool all)
{
SGPropertyNode * js_nodes = fgGetNode("/input/joysticks", true);
js_nodes->removeChildren("js", false);
for (int i = 0; i < MAX_JOYSTICKS; i++)
{
// do not remove predefined joysticks info on reinit
if ((all)||(!bindings[i].predefined))
js_nodes->removeChild("js", i, false);
if (bindings[i].js)
delete bindings[i].js;
bindings[i].js = NULL;
@ -92,7 +96,7 @@ void FGJoystickInput::init()
{
jsInit();
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing joystick bindings");
SGPropertyNode * js_nodes = fgGetNode("/input/joysticks", true);
SGPropertyNode_ptr js_nodes = fgGetNode("/input/joysticks", true);
FGDeviceConfigurationMap configMap("Input/Joysticks", js_nodes, "js-named");
@ -112,6 +116,7 @@ void FGJoystickInput::init()
SG_LOG(SG_INPUT, SG_INFO, "Using existing bindings for joystick " << i);
} else {
bindings[i].predefined = false;
SG_LOG(SG_INPUT, SG_INFO, "Looking for bindings for joystick \"" << name << '"');
SGPropertyNode_ptr named;
@ -137,7 +142,7 @@ void FGJoystickInput::init()
void FGJoystickInput::reinit() {
SG_LOG(SG_INPUT, SG_DEBUG, "Re-Initializing joystick bindings");
_remove();
_remove(false);
FGJoystickInput::init();
FGJoystickInput::postinit();
}

5
src/Input/FGJoystickInput.hxx
View file

@ -25,7 +25,7 @@
#ifndef _FGJOYSTICKINPUT_HXX
#define _FGJOYSTICKINPUT_HXX
#ifndef __cplusplus
#ifndef __cplusplus
# error This library requires C++
#endif
@ -52,7 +52,7 @@ public:
static const int MAX_JOYSTICK_BUTTONS = 32;
private:
void _remove();
void _remove(bool all);
/**
* Settings for a single joystick axis.
@ -83,6 +83,7 @@ private:
int nbuttons;
axis * axes;
FGButton * buttons;
bool predefined;
};
joystick bindings[MAX_JOYSTICKS];