#endif
#ifdef HAVE_WINDOWS_H
-# include <windows.h>
+# include <windows.h>
#endif
#include <simgear/compiler.h>
#include STL_STRING
#include <vector>
-#include FG_GLUT_H
-
-#include <plib/pu.h>
-
#include <simgear/compiler.h>
#include <simgear/constants.h>
#include <Cockpit/panel_io.hxx>
#include <GUI/gui.h>
#include <Model/panelnode.hxx>
+#include <Scripting/NasalSys.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
SG_USING_STD(string);
SG_USING_STD(vector);
+void mouseClickHandler(int button, int updown, int x, int y);
+void mouseMotionHandler(int x, int y);
+void keyHandler(int key, int keymod, int mousex, int mousey);
\f
////////////////////////////////////////////////////////////////////////
_init_joystick();
_init_mouse();
- glutKeyboardFunc(GLUTkey);
- glutKeyboardUpFunc(GLUTkeyup);
- glutSpecialFunc(GLUTspecialkey);
- glutSpecialUpFunc(GLUTspecialkeyup);
- glutMouseFunc (GLUTmouse);
- glutMotionFunc (GLUTmotion);
- glutPassiveMotionFunc (GLUTmotion);
+ fgRegisterKeyHandler(keyHandler);
+ fgRegisterMouseClickHandler(mouseClickHandler);
+ fgRegisterMouseMotionHandler(mouseMotionHandler);
+}
+
+void
+FGInput::reinit ()
+{
+ init();
+}
+
+void
+FGInput::postinit ()
+{
+ _postinit_joystick();
}
void
{
_update_keyboard();
_update_joystick(dt);
- _update_mouse();
+ _update_mouse(dt);
}
void
void
FGInput::doKey (int k, int modifiers, int x, int y)
{
- static SGPropertyNode *heading_enabled
- = fgGetNode("/autopilot/locks/heading", true);
-
// Sanity check.
if (k < 0 || k >= MAX_KEYS) {
SG_LOG(SG_INPUT, SG_WARN, "Key value " << k << " out of range");
button &b = _key_bindings[k];
// Key pressed.
- if (modifiers&FG_MOD_UP == 0) {
+ if (modifiers&KEYMOD_RELEASED == 0) {
SG_LOG( SG_INPUT, SG_DEBUG, "User pressed key " << k
<< " with modifiers " << modifiers );
if (!b.last_state || b.is_repeatable) {
}
}
}
-
// Key released.
else {
SG_LOG(SG_INPUT, SG_DEBUG, "User released key " << k
}
}
}
-
-
- // Use the old, default actions.
- SG_LOG( SG_INPUT, SG_DEBUG, "(No user binding.)" );
- if (modifiers&FG_MOD_UP)
- return;
-
- // everything after here will be removed sooner or later...
-
- if (modifiers & FG_MOD_SHIFT) {
-
- switch (k) {
- case 72: // H key
- HUD_brightkey( true );
- return;
- case 73: // I key
- // Minimal Hud
- fgHUDInit2(¤t_aircraft);
- return;
- }
-
-
- } else {
- SG_LOG( SG_INPUT, SG_DEBUG, "" );
- switch (k) {
- case 104: // h key
- HUD_masterswitch( true );
- return;
- case 105: // i key
- fgHUDInit(¤t_aircraft); // normal HUD
- return;
-
-// START SPECIALS
-
- case 256+GLUT_KEY_F6: // F6 toggles Autopilot target location
- if ( strcmp( heading_enabled->getStringValue(),
- "true-heading-hold" ) != 0 ) {
- heading_enabled->setStringValue( "true-heading-hold" );
- } else {
- heading_enabled->setStringValue( "" );
- }
- return;
- }
-
-// END SPECIALS
-
- }
}
void
FGInput::doMouseClick (int b, int updown, int x, int y)
{
- int modifiers = FG_MOD_NONE; // FIXME: any way to get the real ones?
+ int modifiers = fgGetKeyModifiers();
mouse &m = _mouse_bindings[0];
mouse_mode &mode = m.modes[m.current_mode];
// Let the property manager know.
if (b >= 0 && b < MAX_MOUSE_BUTTONS)
- m.mouse_button_nodes[b]->setBoolValue(updown == GLUT_DOWN);
+ m.mouse_button_nodes[b]->setBoolValue(updown == MOUSE_BUTTON_DOWN);
// Pass on to PUI and the panel if
// requested, and return if one of
void
FGInput::doMouseMotion (int x, int y)
{
- int modifiers = FG_MOD_NONE; // FIXME: any way to get the real ones?
+ // Don't call fgGetKeyModifiers() here, until we are using a
+ // toolkit that supports getting the mods from outside a key
+ // callback. Glut doesn't.
+ int modifiers = KEYMOD_NONE;
int xsize = fgGetInt("/sim/startup/xsize", 800);
int ysize = fgGetInt("/sim/startup/ysize", 600);
+
mouse &m = _mouse_bindings[0];
- if (m.current_mode < 0 || m.current_mode >= m.nModes)
- return;
+
+ if (m.current_mode < 0 || m.current_mode >= m.nModes) {
+ m.x = x;
+ m.y = y;
+ return;
+ }
mouse_mode &mode = m.modes[m.current_mode];
// Pass on to PUI if requested, and return
// if PUI consumed the event.
- if (mode.pass_through && puMouse(x, y))
- return;
+ if (mode.pass_through && puMouse(x, y)) {
+ m.x = x;
+ m.y = y;
+ return;
+ }
// OK, PUI didn't want the event,
// so we can play with it.
}
if (need_warp)
- glutWarpPointer(x, y);
+ fgWarpMouse(x, y);
}
m.x = x;
m.y = y;
_key_bindings[index].bindings->clear();
_key_bindings[index].is_repeatable = keys[i]->getBoolValue("repeatable");
- _read_bindings(keys[i], _key_bindings[index].bindings, FG_MOD_NONE);
+ _read_bindings(keys[i], _key_bindings[index].bindings, KEYMOD_NONE);
+ }
+}
+
+
+void
+FGInput::_scan_joystick_dir(SGPath *path, SGPropertyNode* node, int *index)
+{
+ ulDir *dir = ulOpenDir(path->c_str());
+ if (dir) {
+ ulDirEnt* dent;
+ while ((dent = ulReadDir(dir)) != 0) {
+ if (dent->d_name[0] == '.')
+ continue;
+
+ SGPath p(path->str());
+ p.append(dent->d_name);
+ _scan_joystick_dir(&p, node, index);
+ }
+ ulCloseDir(dir);
+
+ } else if (path->extension() == "xml") {
+ SG_LOG(SG_INPUT, SG_DEBUG, "Reading joystick file " << path->str());
+ SGPropertyNode *n = node->getChild("js-named", (*index)++, true);
+ readProperties(path->str(), n);
+ n->setStringValue("source", path->c_str());
}
}
void
FGInput::_init_joystick ()
{
+ jsInit();
// TODO: zero the old bindings first.
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing joystick bindings");
SGPropertyNode * js_nodes = fgGetNode("/input/joysticks");
js_nodes = fgGetNode("/input/joysticks", true);
}
+ // read all joystick xml files into /input/joysticks/js_named[1000++]
+ SGPath path(globals->get_fg_root());
+ path.append("Input/Joysticks");
+ int js_named_index = 1000;
+ _scan_joystick_dir(&path, js_nodes, &js_named_index);
+
+ // build name->node map with each <name> (reverse order)
+ map<string, SGPropertyNode_ptr> jsmap;
+ vector<SGPropertyNode_ptr> js_named = js_nodes->getChildren("js-named");
+
+ for (int k = (int)js_named.size() - 1; k >= 0; k--) {
+ SGPropertyNode *n = js_named[k];
+ vector<SGPropertyNode_ptr> names = n->getChildren("name");
+ if (names.size() && (n->getChildren("axis").size() || n->getChildren("button").size()))
+ for (unsigned int j = 0; j < names.size(); j++)
+ jsmap[names[j]->getStringValue()] = n;
+ }
+
for (int i = 0; i < MAX_JOYSTICKS; i++) {
- SGPropertyNode_ptr js_node = js_nodes->getChild("js", i);
- if (js_node == 0) {
- SG_LOG(SG_INPUT, SG_DEBUG, "No bindings for joystick " << i);
- js_node = js_nodes->getChild("js", i, true);
- }
jsJoystick * js = new jsJoystick(i);
_joystick_bindings[i].js = js;
if (js->notWorking()) {
SG_LOG(SG_INPUT, SG_DEBUG, "Joystick " << i << " not found");
continue;
+ }
+
+ const char * name = js->getName();
+ SGPropertyNode_ptr js_node = js_nodes->getChild("js", i);
+
+ if (js_node) {
+ SG_LOG(SG_INPUT, SG_INFO, "Using existing bindings for joystick " << i);
+
} else {
- bool found_js = false;
- const char * name = js->getName();
- SG_LOG(SG_INPUT, SG_INFO, "Looking for bindings for joystick \""
- << name << '"');
- vector<SGPropertyNode_ptr> nodes = js_nodes->getChildren("js-named");
- for (unsigned int i = 0; i < nodes.size(); i++) {
- SGPropertyNode_ptr node = nodes[i];
- vector<SGPropertyNode_ptr> name_nodes = node->getChildren("name");
- for (unsigned int j = 0; j < name_nodes.size(); j++) {
- const char * js_name = name_nodes[j]->getStringValue();
- SG_LOG(SG_INPUT, SG_INFO, " Trying \"" << js_name << '"');
- if (!strcmp(js_name, name)) {
- SG_LOG(SG_INPUT, SG_INFO, " Found bindings");
- js_node = node;
- found_js = true;
- break;
- }
- }
- if (found_js)
- break;
+ SG_LOG(SG_INPUT, SG_INFO, "Looking for bindings for joystick \"" << name << '"');
+ SGPropertyNode_ptr named;
+
+ if ((named = jsmap[name])) {
+ string source = named->getStringValue("source", "user defined");
+ SG_LOG(SG_INPUT, SG_INFO, "... found joystick: \"" << source << '"');
+
+ } else if ((named = jsmap["default"])) {
+ string source = named->getStringValue("source", "user defined");
+ SG_LOG(SG_INPUT, SG_INFO, "No config found for joystick \"" << name
+ << "\"\nUsing default: \"" << source << '"');
+
+ } else {
+ throw sg_throwable(string("No default joystick found! (<name>default</name>)"));
}
+
+ js_node = js_nodes->getChild("js", i, true);
+ copyProperties(named, js_node);
+ js_node->setStringValue("id", name);
}
+
+
#ifdef WIN32
JOYCAPS jsCaps ;
joyGetDevCaps( i, &jsCaps, sizeof(jsCaps) );
#else
int nbuttons = MAX_JOYSTICK_BUTTONS;
#endif
-
+
int naxes = js->getNumAxes();
if (naxes > MAX_JOYSTICK_AXES) naxes = MAX_JOYSTICK_AXES;
_joystick_bindings[i].naxes = naxes;
//
// Initialize the axes.
//
+ vector<SGPropertyNode_ptr> axes = js_node->getChildren("axis");
+ size_t nb_axes = axes.size();
int j;
- for (j = 0; j < naxes; j++) {
- const SGPropertyNode * axis_node = js_node->getChild("axis", j);
- if (axis_node == 0) {
- SG_LOG(SG_INPUT, SG_DEBUG, "No bindings for axis " << j);
- axis_node = js_node->getChild("axis", j, true);
+ for (j = 0; j < (int)nb_axes; j++) {
+ const SGPropertyNode * axis_node = axes[j];
+ const SGPropertyNode * num_node = axis_node->getChild("number");
+ int n_axis = axis_node->getIndex();
+ if (num_node != 0) {
+ n_axis = num_node->getIntValue(TGT_PLATFORM, -1);
+
+ // Silently ignore platforms that are not specified within the
+ // <number></number> section
+ if (n_axis < 0)
+ continue;
}
-
- axis &a = _joystick_bindings[i].axes[j];
- js->setDeadBand(j, axis_node->getDoubleValue("dead-band", 0.0));
+ if (n_axis >= naxes) {
+ SG_LOG(SG_INPUT, SG_DEBUG, "Dropping bindings for axis " << n_axis);
+ continue;
+ }
+ axis &a = _joystick_bindings[i].axes[n_axis];
+
+ js->setDeadBand(n_axis, axis_node->getDoubleValue("dead-band", 0.0));
a.tolerance = axis_node->getDoubleValue("tolerance", 0.002);
- minRange[j] = axis_node->getDoubleValue("min-range", minRange[j]);
- maxRange[j] = axis_node->getDoubleValue("max-range", maxRange[j]);
- center[j] = axis_node->getDoubleValue("center", center[j]);
+ minRange[n_axis] = axis_node->getDoubleValue("min-range", minRange[n_axis]);
+ maxRange[n_axis] = axis_node->getDoubleValue("max-range", maxRange[n_axis]);
+ center[n_axis] = axis_node->getDoubleValue("center", center[n_axis]);
- _read_bindings(axis_node, a.bindings, FG_MOD_NONE);
+ _read_bindings(axis_node, a.bindings, KEYMOD_NONE);
// Initialize the virtual axis buttons.
_init_button(axis_node->getChild("low"), a.low, "low");
a.low_threshold = axis_node->getDoubleValue("low-threshold", -0.9);
-
+
_init_button(axis_node->getChild("high"), a.high, "high");
a.high_threshold = axis_node->getDoubleValue("high-threshold", 0.9);
a.interval_sec = axis_node->getDoubleValue("interval-sec",0.0);
//
// Initialize the buttons.
//
+ vector<SGPropertyNode_ptr> buttons = js_node->getChildren("button");
char buf[32];
- for (j = 0; j < nbuttons; j++) {
- sprintf(buf, "%d", j);
- SG_LOG(SG_INPUT, SG_DEBUG, "Initializing button " << j);
- _init_button(js_node->getChild("button", j),
- _joystick_bindings[i].buttons[j],
+ for (j = 0; (j < (int)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();
+ if (num_node != 0) {
+ n_but = num_node->getIntValue(TGT_PLATFORM,n_but);
+ }
+
+ if (n_but >= (size_t)nbuttons) {
+ SG_LOG(SG_INPUT, SG_DEBUG, "Dropping bindings for button " << n_but);
+ continue;
+ }
+
+ sprintf(buf, "%d", n_but);
+ SG_LOG(SG_INPUT, SG_DEBUG, "Initializing button " << n_but);
+ _init_button(button_node,
+ _joystick_bindings[i].buttons[n_but],
buf);
-
- // get interval-sec property
- button &b = _joystick_bindings[i].buttons[j];
- const SGPropertyNode * button_node = js_node->getChild("button", j);
+
+ // get interval-sec property
+ button &b = _joystick_bindings[i].buttons[n_but];
if (button_node != 0) {
b.interval_sec = button_node->getDoubleValue("interval-sec",0.0);
b.last_dt = 0.0;
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]);
+ }
}
+
//
-// Map of all known GLUT cursor names
+// Map of all known cursor names
+// This used to contain all the Glut cursors, but those are
+// not defined by other toolkits. It now supports only the cursor
+// images we actually use, in the interest of portability. Someday,
+// it would be cool to write an OpenGL cursor renderer, with the
+// cursors defined as textures referenced in the property tree. This
+// list could then be eliminated. -Andy
//
-struct {
+static struct {
const char * name;
int cursor;
} mouse_cursor_map[] = {
- { "right-arrow", GLUT_CURSOR_RIGHT_ARROW },
- { "left-arrow", GLUT_CURSOR_LEFT_ARROW },
- { "info", GLUT_CURSOR_INFO },
- { "destroy", GLUT_CURSOR_DESTROY },
- { "help", GLUT_CURSOR_HELP },
- { "cycle", GLUT_CURSOR_CYCLE },
- { "spray", GLUT_CURSOR_SPRAY },
- { "wait", GLUT_CURSOR_WAIT },
- { "text", GLUT_CURSOR_TEXT },
- { "crosshair", GLUT_CURSOR_CROSSHAIR },
- { "up-down", GLUT_CURSOR_UP_DOWN },
- { "left-right", GLUT_CURSOR_LEFT_RIGHT },
- { "top-side", GLUT_CURSOR_TOP_SIDE },
- { "bottom-side", GLUT_CURSOR_BOTTOM_SIDE },
- { "left-side", GLUT_CURSOR_LEFT_SIDE },
- { "right-side", GLUT_CURSOR_RIGHT_SIDE },
- { "top-left-corner", GLUT_CURSOR_TOP_LEFT_CORNER },
- { "top-right-corner", GLUT_CURSOR_TOP_RIGHT_CORNER },
- { "bottom-right-corner", GLUT_CURSOR_BOTTOM_RIGHT_CORNER },
- { "bottom-left-corner", GLUT_CURSOR_BOTTOM_LEFT_CORNER },
- { "inherit", GLUT_CURSOR_INHERIT },
- { "none", GLUT_CURSOR_NONE },
- { "full-crosshair", GLUT_CURSOR_FULL_CROSSHAIR },
+ { "none", MOUSE_CURSOR_NONE },
+ { "inherit", MOUSE_CURSOR_POINTER },
+ { "wait", MOUSE_CURSOR_WAIT },
+ { "crosshair", MOUSE_CURSOR_CROSSHAIR },
+ { "left-right", MOUSE_CURSOR_LEFTRIGHT },
{ 0, 0 }
};
-
-
void
FGInput::_init_mouse ()
{
SGPropertyNode * mode_node = mouse_node->getChild("mode", j, true);
const char * cursor_name =
mode_node->getStringValue("cursor", "inherit");
- m.modes[j].cursor = GLUT_CURSOR_INHERIT;
+ m.modes[j].cursor = MOUSE_CURSOR_POINTER;
for (k = 0; mouse_cursor_map[k].name != 0; k++) {
if (!strcmp(mouse_cursor_map[k].name, cursor_name)) {
m.modes[j].cursor = mouse_cursor_map[k].cursor;
// Read the axis bindings for this mode
_read_bindings(mode_node->getChild("x-axis", 0, true),
m.modes[j].x_bindings,
- FG_MOD_NONE);
+ KEYMOD_NONE);
_read_bindings(mode_node->getChild("y-axis", 0, true),
m.modes[j].y_bindings,
- FG_MOD_NONE);
+ KEYMOD_NONE);
}
}
}
b.is_repeatable = node->getBoolValue("repeatable", b.is_repeatable);
// Get the bindings for the button
- _read_bindings(node, b.bindings, FG_MOD_NONE);
+ _read_bindings(node, b.bindings, KEYMOD_NONE);
}
}
void
FGInput::_update_joystick (double dt)
{
- int modifiers = FG_MOD_NONE; // FIXME: any way to get the real ones?
+ int modifiers = KEYMOD_NONE; // FIXME: any way to get the real ones?
int buttons;
// float js_val, diff;
float axis_values[MAX_JOYSTICK_AXES];
// position fires the bindings.
if (fabs(axis_values[j] - a.last_value) > a.tolerance) {
// SG_LOG(SG_INPUT, SG_DEBUG, "Axis " << j << " has moved");
- SGPropertyNode node;
a.last_value = axis_values[j];
// SG_LOG(SG_INPUT, SG_DEBUG, "There are "
// << a.bindings[modifiers].size() << " bindings");
}
void
-FGInput::_update_mouse ()
+FGInput::_update_mouse ( double dt )
{
mouse &m = _mouse_bindings[0];
int mode = m.mode_node->getIntValue();
if (mode != m.current_mode) {
m.current_mode = mode;
+ m.timeout = fgGetDouble( "/sim/mouse/cursor-timeout-sec", 10.0 );
if (mode >= 0 && mode < m.nModes) {
- glutSetCursor(m.modes[mode].cursor);
+ fgSetMouseCursor(m.modes[mode].cursor);
m.x = fgGetInt("/sim/startup/xsize", 800) / 2;
m.y = fgGetInt("/sim/startup/ysize", 600) / 2;
- glutWarpPointer(m.x, m.y);
+ fgWarpMouse(m.x, m.y);
} else {
SG_LOG(SG_INPUT, SG_DEBUG, "Mouse mode " << mode << " out of range");
- glutSetCursor(GLUT_CURSOR_INHERIT);
+ fgSetMouseCursor(MOUSE_CURSOR_POINTER);
}
}
+
+ if ( fgGetBool( "/sim/mouse/hide-cursor", true ) ) {
+ if ( m.x != m.save_x || m.y != m.save_y ) {
+ m.timeout = fgGetDouble( "/sim/mouse/cursor-timeout-sec", 10.0 );
+ fgSetMouseCursor(m.modes[mode].cursor);
+ } else {
+ m.timeout -= dt;
+ if ( m.timeout <= 0.0 ) {
+ fgSetMouseCursor(MOUSE_CURSOR_NONE);
+ m.timeout = 0.0;
+ }
+ }
+ m.save_x = m.x;
+ m.save_y = m.y;
+ }
}
void
// The release event is never repeated.
if (b.last_state) {
SG_LOG( SG_INPUT, SG_DEBUG, "Button has been released" );
- for (unsigned int k = 0; k < b.bindings[modifiers|FG_MOD_UP].size(); k++)
- b.bindings[modifiers|FG_MOD_UP][k]->fire(x, y);
+ for (unsigned int k = 0; k < b.bindings[modifiers|KEYMOD_RELEASED].size(); k++)
+ b.bindings[modifiers|KEYMOD_RELEASED][k]->fire(x, y);
}
}
// Read nested bindings for modifiers
if (node->getChild("mod-up") != 0)
_read_bindings(node->getChild("mod-up"), binding_list,
- modifiers|FG_MOD_UP);
+ modifiers|KEYMOD_RELEASED);
if (node->getChild("mod-shift") != 0)
_read_bindings(node->getChild("mod-shift"), binding_list,
- modifiers|FG_MOD_SHIFT);
+ modifiers|KEYMOD_SHIFT);
if (node->getChild("mod-ctrl") != 0)
_read_bindings(node->getChild("mod-ctrl"), binding_list,
- modifiers|FG_MOD_CTRL);
+ modifiers|KEYMOD_CTRL);
if (node->getChild("mod-alt") != 0)
_read_bindings(node->getChild("mod-alt"), binding_list,
- modifiers|FG_MOD_ALT);
+ modifiers|KEYMOD_ALT);
}
return b.bindings[modifiers];
// Alt-Gr is CTRL+ALT
- else if (modifiers&(FG_MOD_CTRL|FG_MOD_ALT))
- return _find_key_bindings(k, modifiers&~(FG_MOD_CTRL|FG_MOD_ALT));
+ else if (modifiers&(KEYMOD_CTRL|KEYMOD_ALT))
+ return _find_key_bindings(k, modifiers&~(KEYMOD_CTRL|KEYMOD_ALT));
// Try removing the control modifier
// for control keys.
- else if ((modifiers&FG_MOD_CTRL) && iscntrl(kc))
- return _find_key_bindings(k, modifiers&~FG_MOD_CTRL);
+ else if ((modifiers&KEYMOD_CTRL) && iscntrl(kc))
+ return _find_key_bindings(k, modifiers&~KEYMOD_CTRL);
// Try removing shift modifier
// for upper case or any punctuation
// (since different keyboards will
// shift different punctuation types)
- else if ((modifiers&FG_MOD_SHIFT) && (isupper(kc) || ispunct(kc)))
- return _find_key_bindings(k, modifiers&~FG_MOD_SHIFT);
+ else if ((modifiers&KEYMOD_SHIFT) && (isupper(kc) || ispunct(kc)))
+ return _find_key_bindings(k, modifiers&~KEYMOD_SHIFT);
// Try removing alt modifier for
// high-bit characters.
- else if ((modifiers&FG_MOD_ALT) && k >= 128 && k < 256)
- return _find_key_bindings(k, modifiers&~FG_MOD_ALT);
+ else if ((modifiers&KEYMOD_ALT) && k >= 128 && k < 256)
+ return _find_key_bindings(k, modifiers&~KEYMOD_ALT);
// Give up and return the empty vector.
else
FGInput::button::~button ()
{
// FIXME: memory leak
-// for (int i = 0; i < FG_MOD_MAX; i++)
+// for (int i = 0; i < KEYMOD_MAX; i++)
// for (int j = 0; i < bindings[i].size(); j++)
// delete bindings[i][j];
}
FGInput::axis::~axis ()
{
-// for (int i = 0; i < FG_MOD_MAX; i++)
+// for (int i = 0; i < KEYMOD_MAX; i++)
// for (int j = 0; i < bindings[i].size(); j++)
// delete bindings[i][j];
}
////////////////////////////////////////////////////////////////////////
FGInput::mouse_mode::mouse_mode ()
- : cursor(GLUT_CURSOR_INHERIT),
+ : cursor(MOUSE_CURSOR_POINTER),
constrained(false),
pass_through(false),
buttons(0)
FGInput::mouse_mode::~mouse_mode ()
{
// FIXME: memory leak
-// for (int i = 0; i < FG_MOD_MAX; i++) {
+// for (int i = 0; i < KEYMOD_MAX; i++) {
// int j;
// for (j = 0; i < x_bindings[i].size(); j++)
// delete bindings[i][j];
delete [] modes;
}
-
-\f
-////////////////////////////////////////////////////////////////////////
-// Implementation of GLUT callbacks.
-////////////////////////////////////////////////////////////////////////
-
-
-/**
- * Construct the modifiers.
- */
-static inline int get_mods ()
-{
- int glut_modifiers = glutGetModifiers();
- int modifiers = 0;
-
- if (glut_modifiers & GLUT_ACTIVE_SHIFT)
- modifiers |= FGInput::FG_MOD_SHIFT;
- if (glut_modifiers & GLUT_ACTIVE_CTRL)
- modifiers |= FGInput::FG_MOD_CTRL;
- if (glut_modifiers & GLUT_ACTIVE_ALT)
- modifiers |= FGInput::FG_MOD_ALT;
-
- return modifiers;
-}
-
-
-\f
////////////////////////////////////////////////////////////////////////
-// GLUT C callbacks.
+// Implementation of OS callbacks.
////////////////////////////////////////////////////////////////////////
-void
-GLUTkey(unsigned char k, int x, int y)
-{
- // Give PUI a chance to grab it first.
- if (!puKeyboard(k, PU_DOWN)) {
- if (default_input != 0)
- default_input->doKey(k, get_mods(), x, y);
- }
-}
-
-void
-GLUTkeyup(unsigned char k, int x, int y)
-{
- if (default_input != 0)
- default_input->doKey(k, get_mods()|FGInput::FG_MOD_UP, x, y);
-}
-
-void
-GLUTspecialkey(int k, int x, int y)
+void keyHandler(int key, int keymod, int mousex, int mousey)
{
- // Give PUI a chance to grab it first.
- if (!puKeyboard(k + PU_KEY_GLUT_SPECIAL_OFFSET, PU_DOWN)) {
- if (default_input != 0)
- default_input->doKey(k + 256, get_mods(), x, y);
- }
-}
+ if((keymod & KEYMOD_RELEASED) == 0)
+ if(puKeyboard(key, PU_DOWN))
+ return;
-void
-GLUTspecialkeyup(int k, int x, int y)
-{
- if (default_input != 0)
- default_input->doKey(k + 256, get_mods()|FGInput::FG_MOD_UP, x, y);
+ if(default_input)
+ default_input->doKey(key, keymod, mousex, mousey);
}
-void
-GLUTmouse (int button, int updown, int x, int y)
+void mouseClickHandler(int button, int updown, int x, int y)
{
- if (default_input != 0)
+ if(default_input)
default_input->doMouseClick(button, updown, x, y);
}
-void
-GLUTmotion (int x, int y)
+void mouseMotionHandler(int x, int y)
{
if (default_input != 0)
default_input->doMouseMotion(x, y);
}
-
-// end of input.cxx
projects / flightgear.git / blobdiff