X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInput%2Finput.cxx;h=98432a6f01803e7b43d3737015601296a27927e1;hb=f88a9aab6a097c65960e978444f64f0ea8a022a1;hp=5bc5132dc38fcb25d01495b0c5fcd8df1c652a10;hpb=9e2707c9f8f6262d4d40fce4ac0acfe54fef8757;p=flightgear.git diff --git a/src/Input/input.cxx b/src/Input/input.cxx index 5bc5132dc..98432a6f0 100644 --- a/src/Input/input.cxx +++ b/src/Input/input.cxx @@ -37,19 +37,14 @@ #include STL_STRING #include -#include GLUT_H - -#include - #include #include #include -#include +#include #include -#include -#include +#include #include #include #include @@ -65,6 +60,9 @@ SG_USING_STD(ifstream); 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); //////////////////////////////////////////////////////////////////////// @@ -94,17 +92,12 @@ FGBinding::FGBinding (const SGPropertyNode * node) read(node); } -FGBinding::~FGBinding () -{ - delete _arg; // Delete the saved arguments -} - void FGBinding::read (const SGPropertyNode * node) { const SGPropertyNode * conditionNode = node->getChild("condition"); if (conditionNode != 0) - setCondition(fgReadCondition(conditionNode)); + setCondition(sgReadCondition(globals->get_props(), conditionNode)); _command_name = node->getStringValue("command", ""); if (_command_name.empty()) { @@ -113,7 +106,6 @@ FGBinding::read (const SGPropertyNode * node) return; } - delete _arg; _arg = new SGPropertyNode; _setting = 0; copyProperties(node, _arg); // FIXME: don't use whole node!!! @@ -162,9 +154,6 @@ FGBinding::fire (double setting) const // Implementation of FGInput. //////////////////////////////////////////////////////////////////////// - // From main.cxx -extern void fgReshape( int width, int height ); - FGInput::FGInput () { @@ -185,33 +174,41 @@ FGInput::init () _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::bind () +FGInput::reinit () { - // no op + init(); +} + +void +FGInput::update (double dt) +{ + _update_keyboard(); + _update_joystick(dt); + _update_mouse(dt); } void -FGInput::unbind () +FGInput::suspend () { - // no op + // NO-OP } -void -FGInput::update (double dt) +void +FGInput::resume () { - _update_keyboard(); - _update_joystick(); - _update_mouse(); + // NO-OP +} + +bool +FGInput::is_suspended () const +{ + return false; } void @@ -235,7 +232,7 @@ FGInput::doKey (int k, int modifiers, int x, int y) 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) { @@ -249,7 +246,6 @@ FGInput::doKey (int k, int modifiers, int x, int y) } } } - // Key released. else { SG_LOG(SG_INPUT, SG_DEBUG, "User released key " << k @@ -265,101 +261,19 @@ FGInput::doKey (int k, int modifiers, int x, int y) } } } - - - // 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 ( globals->get_autopilot()->get_HeadingMode() != - FGAutopilot::FG_HEADING_WAYPOINT ) { - globals->get_autopilot()->set_HeadingMode( - FGAutopilot::FG_HEADING_WAYPOINT ); - globals->get_autopilot()->set_HeadingEnabled( true ); - } else { - globals->get_autopilot()->set_HeadingMode( - FGAutopilot::FG_TC_HEADING_LOCK ); - } - return; - case 256+GLUT_KEY_F8: {// F8 toggles fog ... off fastest nicest... - const string &fog = fgGetString("/sim/rendering/fog"); - if (fog == "disabled") { - fgSetString("/sim/rendering/fog", "fastest"); - SG_LOG(SG_INPUT, SG_INFO, "Fog enabled, hint=fastest"); - } else if (fog == "fastest") { - fgSetString("/sim/rendering/fog", "nicest"); - SG_LOG(SG_INPUT, SG_INFO, "Fog enabled, hint=nicest"); - } else if (fog == "nicest") { - fgSetString("/sim/rendering/fog", "disabled"); - SG_LOG(SG_INPUT, SG_INFO, "Fog disabled"); - } else { - fgSetString("/sim/rendering/fog", "disabled"); - SG_LOG(SG_INPUT, SG_ALERT, "Unrecognized fog type " - << fog << ", changed to 'disabled'"); - } - return; - } - case 256+GLUT_KEY_F10: // F10 toggles menu on and off... - SG_LOG(SG_INPUT, SG_INFO, "Invoking call back function"); -#if defined(FG_OLD_MENUBAR) - guiToggleMenu(); -#endif - return; - case 256+GLUT_KEY_F11: // F11 Altitude Dialog. - SG_LOG(SG_INPUT, SG_INFO, "Invoking Altitude call back function"); - NewAltitude( NULL ); - return; - case 256+GLUT_KEY_F12: // F12 Heading Dialog... - SG_LOG(SG_INPUT, SG_INFO, "Invoking Heading call back function"); - NewHeading( NULL ); - 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 @@ -367,9 +281,9 @@ FGInput::doMouseClick (int b, int updown, int x, int y) if (mode.pass_through) { if (puMouse(b, updown, x, y)) return; - else if ((current_panel != 0) && - current_panel->getVisibility() && - current_panel->doMouseAction(b, updown, x, y)) + else if ((globals->get_current_panel() != 0) && + globals->get_current_panel()->getVisibility() && + globals->get_current_panel()->doMouseAction(b, updown, x, y)) return; else if (fgHandle3DPanelMouseEvent(b, updown, x, y)) return; @@ -388,19 +302,30 @@ FGInput::doMouseClick (int b, int updown, int x, int y) 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. @@ -435,7 +360,7 @@ FGInput::doMouseMotion (int x, int y) } if (need_warp) - glutWarpPointer(x, y); + fgWarpMouse(x, y); } m.x = x; m.y = y; @@ -444,7 +369,6 @@ FGInput::doMouseMotion (int x, int y) void FGInput::_init_keyboard () { - // TODO: zero the old bindings first. SG_LOG(SG_INPUT, SG_DEBUG, "Initializing key bindings"); SGPropertyNode * key_nodes = fgGetNode("/input/keyboard"); if (key_nodes == 0) { @@ -456,8 +380,10 @@ FGInput::_init_keyboard () for (unsigned int i = 0; i < keys.size(); i++) { int index = keys[i]->getIndex(); SG_LOG(SG_INPUT, SG_DEBUG, "Binding key " << index); + + _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); } } @@ -465,6 +391,7 @@ FGInput::_init_keyboard () 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"); @@ -482,7 +409,7 @@ FGInput::_init_joystick () jsJoystick * js = new jsJoystick(i); _joystick_bindings[i].js = js; if (js->notWorking()) { - SG_LOG(SG_INPUT, SG_WARN, "Joystick " << i << " not found"); + SG_LOG(SG_INPUT, SG_DEBUG, "Joystick " << i << " not found"); continue; } else { bool found_js = false; @@ -541,24 +468,36 @@ FGInput::_init_joystick () // // Initialize the axes. // + vector 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"); + size_t 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 + // 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 >= (size_t)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"); @@ -566,19 +505,40 @@ FGInput::_init_joystick () _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); + a.last_dt = 0.0; } // // Initialize the buttons. // + vector 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[n_but]; + if (button_node != 0) { + b.interval_sec = button_node->getDoubleValue("interval-sec",0.0); + b.last_dt = 0.0; + } } js->setMinRange(minRange); @@ -588,40 +548,26 @@ FGInput::_init_joystick () } // -// 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 () { @@ -641,8 +587,11 @@ FGInput::_init_mouse () // Grab node pointers char buf[64]; sprintf(buf, "/devices/status/mice/mouse[%d]/mode", i); - m.mode_node = fgGetNode(buf, true); - m.mode_node->setIntValue(0); + m.mode_node = fgGetNode(buf); + if (m.mode_node == NULL) { + m.mode_node = fgGetNode(buf, true); + m.mode_node->setIntValue(0); + } for (j = 0; j < MAX_MOUSE_BUTTONS; j++) { sprintf(buf, "/devices/status/mice/mouse[%d]/button[%d]", i, j); m.mouse_button_nodes[j] = fgGetNode(buf, true); @@ -660,7 +609,7 @@ 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; @@ -686,10 +635,10 @@ FGInput::_init_mouse () // 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); } } } @@ -706,7 +655,7 @@ FGInput::_init_button (const SGPropertyNode * node, 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); } } @@ -719,9 +668,9 @@ FGInput::_update_keyboard () void -FGInput::_update_joystick () +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]; @@ -756,46 +705,71 @@ FGInput::_update_joystick () } // do we have to emulate axis buttons? - if (a.low.bindings[modifiers].size()) - _update_button(_joystick_bindings[i].axes[j].low, - modifiers, - axis_values[j] < a.low_threshold, - -1, -1); + a.last_dt += dt; + if(a.last_dt >= a.interval_sec) { + if (a.low.bindings[modifiers].size()) + _update_button(_joystick_bindings[i].axes[j].low, + modifiers, + axis_values[j] < a.low_threshold, + -1, -1); - if (a.high.bindings[modifiers].size()) - _update_button(_joystick_bindings[i].axes[j].high, - modifiers, - axis_values[j] > a.high_threshold, - -1, -1); + if (a.high.bindings[modifiers].size()) + _update_button(_joystick_bindings[i].axes[j].high, + modifiers, + axis_values[j] > a.high_threshold, + -1, -1); + a.last_dt -= a.interval_sec; + } } // Fire bindings for the buttons. for (j = 0; j < _joystick_bindings[i].nbuttons; j++) { - _update_button(_joystick_bindings[i].buttons[j], - modifiers, - (buttons & (1 << j)) > 0, - -1, -1); + button &b = _joystick_bindings[i].buttons[j]; + b.last_dt += dt; + if(b.last_dt >= b.interval_sec) { + _update_button(_joystick_bindings[i].buttons[j], + modifiers, + (buttons & (1 << j)) > 0, + -1, -1); + b.last_dt -= b.interval_sec; + } } } } 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 @@ -813,8 +787,8 @@ FGInput::_update_button (button &b, int modifiers, bool pressed, // 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); } } @@ -838,47 +812,52 @@ FGInput::_read_bindings (const SGPropertyNode * node, // 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); } const vector & FGInput::_find_key_bindings (unsigned int k, int modifiers) { + unsigned char kc = (unsigned char)k; button &b = _key_bindings[k]; // Try it straight, first. if (b.bindings[modifiers].size() > 0) return b.bindings[modifiers]; + // Alt-Gr is CTRL+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(k)) - 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(k) || ispunct(k))) - 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 @@ -900,7 +879,7 @@ FGInput::button::button () 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]; } @@ -921,7 +900,7 @@ FGInput::axis::axis () 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]; } @@ -950,7 +929,7 @@ FGInput::joystick::~joystick () //////////////////////////////////////////////////////////////////////// FGInput::mouse_mode::mouse_mode () - : cursor(GLUT_CURSOR_INHERIT), + : cursor(MOUSE_CURSOR_POINTER), constrained(false), pass_through(false), buttons(0) @@ -960,7 +939,7 @@ FGInput::mouse_mode::mouse_mode () 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]; @@ -990,83 +969,28 @@ FGInput::mouse::~mouse () delete [] modes; } - - -//////////////////////////////////////////////////////////////////////// -// 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; -} - - - //////////////////////////////////////////////////////////////////////// -// GLUT C callbacks. +// Implementation of OS callbacks. //////////////////////////////////////////////////////////////////////// -void -GLUTkey(unsigned char 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_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) -{ - // 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