projects/mde: mde/input/input.d annotate

annotate mde/input/input.d @ 31:baa87e68d7dc

GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Removed some circular dependencies which slipped in. As a result, the OpenGL code got separated into different files. Enabled widgets to recieve events. New IParentWidget interface allowing widgets to interact with their parents. New Widget base class. New WidgetDecoration class. New ButtonWidget class responding to events (in a basic way). committer: Diggory Hardy <diggory.hardy@gmail.com>

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Tue, 29 Apr 2008 18:10:58 +0100
parents	611f7b9063c6
children

rev	line source
17 5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	1 /* LICENSE BLOCK
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	2 Part of mde: a Modular D game-oriented Engine
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	3 Copyright © 2007-2008 Diggory Hardy
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	4
26 611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	5 This program is free software: you can redistribute it and/or modify it under the terms
611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	6 of the GNU General Public License as published by the Free Software Foundation, either
611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	7 version 2 of the License, or (at your option) any later version.
17 5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	8
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	9 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	10 without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	11 See the GNU General Public License for more details.
5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	12
26 611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	13 You should have received a copy of the GNU General Public License
611f7b9063c6 Changed the licensing and removed a few dead files. Diggory Hardy <diggory.hardy@gmail.com> parents: 24 diff changeset	14 along with this program. If not, see <http://www.gnu.org/licenses/>. */
17 5f90774ea1ef Applied the GNU GPL v2 to mde. Diggory Hardy <diggory.hardy@gmail.com> parents: 15 diff changeset	15
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	16 /**
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	17 * This module contains the interface to the input system; it should be the only module of the
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	18 * input package imported from outside this package.
0 d547009c104c Repository creation. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	19 */
d547009c104c Repository creation. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	20 module mde.input.input;
2 78eb491bd642 mergetag: partially redesigned dataset and text reader classes. Changed text format. Diggory Hardy <diggory.hardy@gmail.com> parents: 0 diff changeset	21
78eb491bd642 mergetag: partially redesigned dataset and text reader classes. Changed text format. Diggory Hardy <diggory.hardy@gmail.com> parents: 0 diff changeset	22 // package imports
0 d547009c104c Repository creation. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	23 import mde.input.config;
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	24 import mde.input.exception;
0 d547009c104c Repository creation. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	25
2 78eb491bd642 mergetag: partially redesigned dataset and text reader classes. Changed text format. Diggory Hardy <diggory.hardy@gmail.com> parents: 0 diff changeset	26 // sdl imports
78eb491bd642 mergetag: partially redesigned dataset and text reader classes. Changed text format. Diggory Hardy <diggory.hardy@gmail.com> parents: 0 diff changeset	27 import derelict.sdl.events;
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	28 import derelict.sdl.types; // only SDL_PRESSED
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	29 import derelict.sdl.joystick; // SDL_HAT_*
2 78eb491bd642 mergetag: partially redesigned dataset and text reader classes. Changed text format. Diggory Hardy <diggory.hardy@gmail.com> parents: 0 diff changeset	30
8 f63f4f41a2dc Big changes to init; got some way towards input event support; changed mergetag ID to char[] from uint. Diggory Hardy <diggory.hardy@gmail.com> parents: 7 diff changeset	31 import tango.util.log.Log : Log, Logger;
f63f4f41a2dc Big changes to init; got some way towards input event support; changed mergetag ID to char[] from uint. Diggory Hardy <diggory.hardy@gmail.com> parents: 7 diff changeset	32
f63f4f41a2dc Big changes to init; got some way towards input event support; changed mergetag ID to char[] from uint. Diggory Hardy <diggory.hardy@gmail.com> parents: 7 diff changeset	33 /// Class encapsulating all input functionality.
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	34 class Input
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	35 {
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	36 /// Typedef for all indexes (type is uint).
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	37 typedef uint inputID;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	38 alias void delegate(inputID, bool) ButtonCallback;
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	39 alias void delegate(inputID, short) AxisCallback;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	40 alias void delegate(inputID, real,real) RelMotionCallback;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	41 alias void delegate(ushort, ushort, ubyte, bool) MouseClickCallback;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	42
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	43 /** Get key status at this ID.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	44 *
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	45 * Returns: value (true = down, false = up) or false if no value at this ID. */
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	46 bool getButton (inputID id) {
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	47 bool* retp = id in button;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	48 if (retp) return *retp;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	49 else return false;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	50 }
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	51
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	52 /** Get axis status at this ID.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	53 *
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	54 * Returns: value (short; range -32767 .. 32767) or 0 if no value at this ID. */
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	55 short getAxis (inputID id) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	56 short* retp = id in axis;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	57 if (retp) return *retp;
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	58 else return 0;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	59 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	60 /** Get axis status at this ID.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	61 *
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	62 * Returns: value (real; range roughly -1.0 .. 1.0) or 0 if no value at this ID. */
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	63 real getAxis1 (inputID id) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	64 short* retp = id in axis;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	65 if (retp) return (retp) 3.0518509475997192e-05;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	66 else return 0.0;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	67 }
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	68
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	69 /** Get the relative motion of the mouse or a joystick ball (since last frameReset() call).
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	70 *
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	71 * Future: Converts to a real via sensitivity settings (defaults may be set and overriden per item).
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	72 *
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	73 * To avoid confusion over the ID here, the idea is for the input-layer upward to support
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	74 * multiple mice, in case future platforms do.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	75 * Also joystick balls (supported by SDL) can be used in the same way as a mouse for relative
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	76 * positions.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	77 */
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	78 void getRelMotion (inputID id, out real x = 0.0, out real y = 0.0) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	79 RelPair* rp = id in relMotion;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	80 if (rp) {
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	81 x = rp.x; y = rp.y;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	82 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	83 }
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	84 /** Get mouse pointer position in screen coordinates.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	85 *
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	86 * Window managers only support one mouse, so there will only be one screen coordinate.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	87 * Unlike nearly everything else, this is not configurable.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	88 */
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	89 void getMouseScreenPos (out uint x, out uint y) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	90 x = mouse_x; y = mouse_y;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	91 }
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	92 // /// Is this modifier on?
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	93 //bool modifierStatus (inputID id);
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	94
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	95 /** Adds a callback delegate for key events (both DOWN and UP) with this ID.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	96 *
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	97 * Delegate receives event status.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	98 */
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	99 void addButtonCallback (inputID id, ButtonCallback dg) {
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	100 buttonCallbacks[id] ~= dg;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	101 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	102
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	103 /** Adds a callback delegate for axis events with this ID.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	104 *
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	105 * Delegate receives event status (as per what getAxis returns).
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	106 */
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	107 void addAxisCallback (inputID id, AxisCallback dg) {
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	108 axisCallbacks[id] ~= dg;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	109 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	110
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	111 /** Adds a callback delegate for mouse motion/joystick ball events with this ID.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	112 *
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	113 * Delegate receives event status. As the name suggests, this is relative motion not screen
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	114 * position, with sensitivity adjustments applied.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	115 *
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	116 * (A separate callback for mouse screen position changes is not
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	117 * necessary since this will be triggered by the same event - use mouseScreenPos from within the
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	118 * function to get new screen coordinates.)
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	119 */
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	120 void addRelMotionCallback (inputID id, RelMotionCallback dg) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	121 relMotionCallbacks[id] ~= dg;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	122 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	123
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	124 /** Adds a callback delegate for all mouse clicks & releases.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	125 *
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	126 * Delegate recieves x,y screen position (at time of click/release), button index (1 for left,
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	127 * 2 for middle, 3 for right, 4/5 for wheel, etc.), and whether the button was pressed or
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	128 * released (true if pressed).
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	129 *
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	130 * The point of this over a standard button callback is firstly to avoid mouse configuration for
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	131 * the GUI, and secondly to give the pointer position at the time of the event, not the time the
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	132 * callback gets called.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	133 */
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	134 void addMouseClickCallback (MouseClickCallback dg) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	135 mouseClickCallbacks ~= dg;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	136 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	137
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	138 /** Feed an SDL_Event struct (only uses if it's a key, mouse or joystick event).
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	139 *
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	140 * Other types of event functions may be added. Returns true if the event was used, false if not
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	141 * or no config was available. Hmm... doesn't seem very useful, but has practically no cost.
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	142 *
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	143 * May throw InputClassExceptions (on configuration errors). Catching the exception and continuing should
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	144 * be fine.
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	145 */
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	146 bool opCall (ref SDL_Event event) {
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	147 /* Non-config events.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	148 *
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	149 * Mouse events don't need config for the GUI. Handle them first so that if no config exists
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	150 * some functionality at least is retained.
31 baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	151 *
baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	152 * Note that the mouse coordinates as reported by SDL put the top-left most pixel at 1,1.
baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	153 * Internal coordinates put that pixel at 0,0 (see gui/GUI notes.txt).
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	154 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	155 switch (event.type) {
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	156 case SDL_MOUSEBUTTONDOWN:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	157 case SDL_MOUSEBUTTONUP:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	158 foreach (dg; mouseClickCallbacks)
31 baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	159 dg (event.button.x - 1, event.button.y - 1,
baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	160 event.button.button, event.button.state == SDL_PRESSED);
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	161 break;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	162
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	163 case SDL_MOUSEMOTION:
31 baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	164 mouse_x = event.motion.x - 1;
baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	165 mouse_y = event.motion.y - 1;
14 0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	166 break;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	167
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	168 default:
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	169 }
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	170
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	171 /* No config available, so don't try to access it and segfault.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	172 * Don't log a message because this function is called per-event (i.e. frequently).
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	173 * A message should already have been logged by loadConfig anyway.
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	174 */
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	175 if (!config) return false;
0047b364b6d9 Changed much of the mergetag structure and some functionality. First tests on windows. Diggory Hardy <diggory.hardy@gmail.com> parents: 12 diff changeset	176
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	177 switch (event.type) {
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	178 // Keyboard events:
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	179 case SDL_KEYDOWN:
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	180 case SDL_KEYUP:
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	181 outQueue[]* p = (Config.B.SDLKEY \| event.key.keysym.sym) in config.button;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	182 if (p) foreach (outQueue q; *p) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	183 bEvent (this, event.key.state == SDL_PRESSED, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	184 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	185 break;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	186
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	187 // Mouse events:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	188 case SDL_MOUSEBUTTONDOWN:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	189 case SDL_MOUSEBUTTONUP:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	190 // Button events:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	191 outQueue[]* p = (Config.B.MOUSE \| event.button.button) in config.button;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	192 if (p) foreach (outQueue q; *p) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	193 bEvent (this, event.button.state == SDL_PRESSED, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	194 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	195 break;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	196
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	197 case SDL_MOUSEMOTION:
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	198 // Relative motion:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	199 outQueue[]* p = (Config.M.WMMOUSE) in config.relMotion;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	200 if (p) foreach (outQueue q; *p) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	201 mEvent (this, event.motion.xrel, event.motion.yrel, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	202 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	203 break;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	204
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	205 // Joystick events:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	206 case SDL_JOYBUTTONDOWN:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	207 case SDL_JOYBUTTONUP:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	208 outQueue[]* p = (Config.B.JOYBUTTON \| (event.jbutton.which << 12) \| event.jbutton.button) in config.button;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	209 if (p) foreach (outQueue q; *p) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	210 bEvent (this, event.jbutton.state == SDL_PRESSED, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	211 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	212 break;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	213
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	214 case SDL_JOYAXISMOTION:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	215 outQueue[]* p = (Config.A.JOYAXIS \| (event.jaxis.which << 12) \| event.jaxis.axis) in config.axis;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	216 if (p) foreach (outQueue q; *p) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	217 aEvent (this, event.jaxis.value, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	218 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	219 break;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	220
11 b940f267419e Options class created & changes to mergetag exception messages. Diggory Hardy <diggory.hardy@gmail.com> parents: 10 diff changeset	221 case SDL_JOYBALLMOTION:
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	222 outQueue[]* p = (Config.M.JOYBALL \| (event.jball.which << 12) \| event.jball.ball) in config.relMotion;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	223 if (p) foreach (outQueue q; *p) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	224 mEvent (this, event.jball.xrel, event.jball.yrel, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	225 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	226 break;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	227
11 b940f267419e Options class created & changes to mergetag exception messages. Diggory Hardy <diggory.hardy@gmail.com> parents: 10 diff changeset	228 case SDL_JOYHATMOTION:
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	229 static ubyte[uint] oldJHatVals; // necessary to store this to know which "axis" changed
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	230
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	231 uint index = (event.jhat.which << 12) \| event.jhat.hat;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	232 ubyte* oVal_p = index in oldJHatVals;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	233 ubyte oldJHatVal = (oVal_p) ? *oVal_p : SDL_HAT_CENTERED;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	234
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	235 // Carry out functionality for an axis.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	236 void hatExamine (ubyte neg, ubyte pos, Config.B neg_b, Config.B pos_b, Config.A axis) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	237 // Check if there's any change on this axis (if not, nothing to do):
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	238 ubyte filter = neg \| pos;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	239 if ((oldJHatVal & filter) != (event.jhat.value & filter)) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	240 // Now we know this axis changed position, so can unset old value and set
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	241 // new value (if not centre).
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	242
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	243 // Cancel old button status:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	244 if (oldJHatVal & neg) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	245 outQueue[]* p = (neg_b \| index) in config.button;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	246 if (p) foreach (outQueue q; *p) bEvent (this, false, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	247 } else if (oldJHatVal & pos) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	248 outQueue[]* p = (pos_b \| index) in config.button;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	249 if (p) foreach (outQueue q; *p) bEvent (this, false, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	250 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	251
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	252 // Set new button status and position:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	253 short position = 0;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	254 if (event.jhat.value & neg) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	255 position = -32767;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	256 outQueue[]* p = (neg_b \| index) in config.button;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	257 if (p) foreach (outQueue q; *p) bEvent (this, true, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	258 } else if (event.jhat.value & pos) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	259 position = 32767;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	260 outQueue[]* p = (pos_b \| index) in config.button;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	261 if (p) foreach (outQueue q; *p) bEvent (this, true, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	262 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	263
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	264 // New axis event:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	265 outQueue[]* p = (axis \| index) in config.axis;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	266 if (p) foreach (outQueue q; *p) aEvent (this, position, readOutQueue(q));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	267 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	268 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	269
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	270 // Now run the code for each axis:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	271 hatExamine (SDL_HAT_UP, SDL_HAT_DOWN,
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	272 Config.B.JOYHAT_U, Config.B.JOYHAT_D, Config.A.JOYHAT_UD);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	273 hatExamine (SDL_HAT_LEFT, SDL_HAT_RIGHT,
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	274 Config.B.JOYHAT_L, Config.B.JOYHAT_R, Config.A.JOYHAT_LR);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	275
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	276 oldJHatVals[index] = event.jhat.value;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	277 break;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	278
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	279 // Other events:
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	280 default:
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	281 return false; // event not used
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	282 }
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	283 return true; // event used
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	284 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	285
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	286 /** Resets relative movement of mice / joystick balls to zero.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	287 *
8 f63f4f41a2dc Big changes to init; got some way towards input event support; changed mergetag ID to char[] from uint. Diggory Hardy <diggory.hardy@gmail.com> parents: 7 diff changeset	288 * Should be called once-per-frame if these are used, but must be called after their state has
f63f4f41a2dc Big changes to init; got some way towards input event support; changed mergetag ID to char[] from uint. Diggory Hardy <diggory.hardy@gmail.com> parents: 7 diff changeset	289 * been read (e.g. just before updating the input).
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	290 */
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	291 void frameReset () {
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	292 foreach (rp; relMotion) {
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	293 rp.x = rp.y = 0.0;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	294 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	295 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	296
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	297 /** Loads all configs, activating the requested id.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	298 *
31 baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	299 * Throws: ConfigLoadException if unable to load any configs or the requested config id wasn't
baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	300 * found.
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	301 */
31 baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	302 void loadConfig (char[] profile = "Default") {
15 4608be19ebe2 Use OS paths (linux only for now), merging multiple paths. Init changes regarding options. Diggory Hardy <diggory.hardy@gmail.com> parents: 14 diff changeset	303 Config.load("input"); // FIXME: filename
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	304 Config* c_p = profile in Config.configs;
31 baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	305 if (c_p) config = *c_p;
baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	306 else {
baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	307 throw new ConfigLoadException;
baa87e68d7dc GUI now supports basic interactible widgets, widget colour and border are more unified, and some code cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 26 diff changeset	308 logger.error ("Config profile \""~profile~"\" not found: input won't work unless a valid profile is loaded!");
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	309 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	310 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	311
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	312 private:
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	313 // Static constructor for event stream (fills es_*_fcts tables).
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	314 static this () {
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	315 es_b_fcts = [ ES_B.OUT : &es_b_out ];
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	316 es_a_fcts = [ ES_A.OUT : &es_a_out, ES_A.REVERSE : &es_a_reverse ];
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	317 es_m_fcts = [ ES_M.OUT : &es_m_out ];
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	318
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	319 logger = Log.getLogger ("mde.input.input.Input");
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	320 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	321
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	322 struct RelPair { // for mouse/joystick ball motion
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	323 real x, y;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	324 static RelPair opCall (real a, real b) {
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	325 RelPair ret;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	326 ret.x = a; ret.y = b;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	327 return ret;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	328 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	329 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	330
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	331 static Logger logger;
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	332
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	333 Config config; // Configuration
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	334
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	335 bool[inputID] button; // Table of button states
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	336 short[inputID] axis; // Table of axes states
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	337 ushort mouse_x, mouse_y; // Current screen coords of the window manager mouse
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	338 RelPair[inputID] relMotion; // Table of relative mouse / joystick ball motions
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	339
11 b940f267419e Options class created & changes to mergetag exception messages. Diggory Hardy <diggory.hardy@gmail.com> parents: 10 diff changeset	340 // FIXME: currently no means of removal
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	341 ButtonCallback[][inputID] buttonCallbacks;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	342 AxisCallback[][inputID] axisCallbacks;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	343 RelMotionCallback[][inputID] relMotionCallbacks;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	344 MouseClickCallback[] mouseClickCallbacks;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	345
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	346 //BEGIN Event stream functionality
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	347 /* This section contains functions called on an event, which may modify the event (adjuster
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	348 * functions), and finally output to one (or more) of the state tables (the event stream).
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	349 *
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	350 * Adjuster and other event functions should have a format to fit the ES_X_Func types, for X is B
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	351 * (button event), A (axis event) or M (mouse relative motion event or joystick ball event).
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	352 * Adjusters should call one of the xEvent() functions with their output and the remainder of
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	353 * the readOutQueue.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	354 *
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	355 * To control which adjusters get called and pass parameters, a stack of sorts is used: outQueue.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	356 */
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	357 //BEGIN ES Definitions
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	358 /* Note: We really want an array, not a stack. We cannot edit the lists, so we can either
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	359 * copy to a stack or just iterate through it as an array.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	360 */
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	361 alias Config.outQueue outQueue;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	362 struct readOutQueue { // A convenient structure for reading an outQueue item by item.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	363 private Config.outQueue _q; // the queue, stored by reference to the original
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	364 private uint p = 0; // current read position (start at beginning)
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	365
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	366 static readOutQueue opCall (Config.outQueue q) { // Static constructor
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	367 readOutQueue ret;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	368 ret._q = q;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	369 return ret;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	370 }
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	371 uint pop () { // Get the next element and advance. Throws an exception if there isn't another.
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	372 if (p >= _q.length)
7 b544c3a7c9ca Some changes to exceptions and a few more debug commands. Diggory Hardy <diggory.hardy@gmail.com> parents: 4 diff changeset	373 throw new InputClassException ("Input: Invalid configuration: incomplete config stack");
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	374 uint ret = _q[p];
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	375 ++p;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	376 return ret;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	377 }
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	378 debug uint next () { // Get the next element. No checks; for debug use only.
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	379 return _q[p];
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	380 }
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	381 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	382
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	383 // These aliases are for pointers to the event functions.
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	384 // These need to use "this", but cannot be delegates because they musn't be bound to a
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	385 // particular instance of Input, hence this must be passed when called.
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	386 alias void function (Input, bool, readOutQueue) ES_B_Func;
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	387 alias void function (Input, short, readOutQueue) ES_A_Func;
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	388 alias void function (Input, short, short, readOutQueue) ES_M_Func;
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	389
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	390 /* These are the codes allowing the config to specify event functions.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	391 *
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	392 * They are organised as defined in doc/input_ID_assignments.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	393 */
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	394 enum ES_B : uint {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	395 OUT = 0x1000u,
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	396 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	397 enum ES_A : uint {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	398 OUT = 0x1000u,
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	399 REVERSE = 0x2000u,
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	400 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	401 enum ES_M : uint {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	402 OUT = 0x1000u,
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	403 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	404 //END ES Definitions
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	405
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	406 // ES Data:
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	407 // These are the tables for looking up which event function to call.
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	408 static ES_B_Func[uint] es_b_fcts;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	409 static ES_A_Func[uint] es_a_fcts;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	410 static ES_M_Func[uint] es_m_fcts;
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	411
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	412 //BEGIN ES Functions
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	413 // These 3 functions pass an event to the appropriate event function (adjuster or output func).
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	414 // They are used to start and continue an event stream.
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	415 // They must be static to allow calling from event functions.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	416 const EVCONF_ERR = "Invalid configuration: bad event function code";
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	417 static void bEvent (Input myThis, bool b, readOutQueue s)
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	418 {
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	419 ES_B_Func* func = (s.pop() in es_b_fcts);
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	420 if (func != null) (*func)(myThis, b, s);
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	421 else throw new InputClassException (EVCONF_ERR);
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	422 }
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	423 static void aEvent (Input myThis, short x, readOutQueue s)
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	424 {
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	425 ES_A_Func* func = (s.pop() in es_a_fcts);
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	426 if (func != null) (*func)(myThis, x, s);
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	427 else throw new InputClassException (EVCONF_ERR);
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	428 }
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	429 // Only handles relative output since position-on-screen is not stored with an ID:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	430 static void mEvent (Input myThis, short x, short y, readOutQueue s)
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	431 {
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	432 ES_M_Func* func = (s.pop() in es_m_fcts);
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	433 if (func != null) (*func)(myThis, x, y, s);
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	434 else throw new InputClassException (EVCONF_ERR);
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	435 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	436
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	437 // The remaining functions are the stream functions, for adjusting and outputting an event.
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	438 // They need to work like non-static functions, but are called via a function pointer, hencne
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	439 // should be static with their first parameter being instead of this.
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	440
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	441 // Simple output function
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	442 static void es_b_out (Input myThis, bool b, readOutQueue s) {
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	443 inputID id = cast(inputID) s.pop();
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	444
9 1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	445 myThis.button[id] = b;
1885a9080f2a Joystick button input now works with config. Diggory Hardy <diggory.hardy@gmail.com> parents: 8 diff changeset	446
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	447 ButtonCallback[]* cb_p = id in myThis.buttonCallbacks;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	448 if (cb_p) foreach (cb; *cb_p) cb (id, b);
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	449 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	450 // Adjuster to check modifier keys
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	451 static void es_b_modifier (Input myThis, bool b, readOutQueue s);
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	452
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	453 // Simple output function
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	454 static void es_a_out (Input myThis, short x, readOutQueue s) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	455 inputID id = cast(inputID) s.pop();
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	456
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	457 myThis.axis[id] = x;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	458
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	459 AxisCallback[]* cb_p = id in myThis.axisCallbacks;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	460 if (cb_p) foreach (cb; *cb_p) cb (id, x);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	461 }
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	462
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	463 // Just reverses an axis's value
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	464 static void es_a_reverse (Input myThis, short x, readOutQueue s) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	465 aEvent (myThis, -x, s);
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	466 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	467
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	468 // Simple output function
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	469 static void es_m_out (Input myThis, short x, short y, readOutQueue s) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	470 inputID id = cast(inputID) s.pop();
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	471
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	472 myThis.relMotion[id] = RelPair(x,y);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	473
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	474 RelMotionCallback[]* cb_p = id in myThis.relMotionCallbacks;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	475 if (cb_p) foreach (cb; *cb_p) cb (id, x,y);
4 9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	476 }
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	477 //END ES Functions
9a990644948c Many changes: upgraded to tango 0.99.4, reorganised mde/input, large changes to mde/mergetag and mde/init, separated off test/MTTest.d and more. Diggory Hardy <diggory.hardy@gmail.com> parents: 2 diff changeset	478 //END Event stream functionality
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	479
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	480
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	481 /* This unittest covers input.config.Config and input.input.Input for some events of all types.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	482 * It is not bullet-proof, and does not cover the steam-functions other than the direct output
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	483 * ones (largely because these may get added at any time and tested via input tests).
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	484 *
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	485 * What it does test:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	486 * Events of all types.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	487 * Callbacks of all types.
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	488 * Status set from events for all types (button,axis,relMotion).
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	489 *
12 bff0d802cb7d Implemented some internationalization support. Diggory Hardy <diggory.hardy@gmail.com> parents: 11 diff changeset	490 * It relies on config loaded from a file (dependant on where input bindings are loaded from;
bff0d802cb7d Implemented some internationalization support. Diggory Hardy <diggory.hardy@gmail.com> parents: 11 diff changeset	491 * currently conf/input.mtt).
10 4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	492 */
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	493 debug (mdeUnitTest) unittest {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	494 Input ut = new Input();
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	495 ut.loadConfig ("UnitTest");
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	496
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	497 int[6] counters; // counters for callbacks
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	498 // Should become: [2,2,0,2,1,1]
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	499
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	500 //BEGIN Set up some callbacks
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	501 ut.addButtonCallback (0x03F0, delegate void(inputID id, bool status) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	502 assert (status == !counters[0]); // true first call, false next
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	503 counters[0] += 1;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	504 });
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	505 ut.addButtonCallback (0x06F0, delegate void(inputID id, bool status) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	506 assert (status == !counters[1]); // true first call, false next
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	507 counters[1] += 1;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	508 });
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	509 ut.addButtonCallback (0x07F0, delegate void(inputID id, bool status) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	510 counters[2] += 1;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	511 });
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	512 ut.addAxisCallback (0x22F0, delegate void(inputID id, short x) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	513 assert (x == (counters[3] ? 0 : 32767));
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	514 counters[3] += 1;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	515 });
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	516 ut.addRelMotionCallback (0x11F0, delegate void(inputID id, real x, real y) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	517 assert (x == 14.0);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	518 assert (y == -1.0);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	519 counters[4] += 1;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	520 });
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	521 ut.addMouseClickCallback (delegate void(ushort x, ushort y, ubyte b, bool s) {
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	522 assert (x == 291);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	523 assert (y == 10010);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	524 assert (b == 3);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	525 assert (s == false);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	526 counters[5] += 1;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	527 });
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	528 //END Set up some callbacks
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	529
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	530 //BEGIN Post a lot of events
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	531 SDL_Event e;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	532
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	533 // F11 down:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	534 e.type = SDL_KEYDOWN;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	535 e.key.state = SDL_PRESSED;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	536 e.key.keysym.sym = 292; // SDLK_F11
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	537 ut(e);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	538 // Right mouse button up:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	539 e.type = SDL_MOUSEBUTTONUP;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	540 e.button.button = 3; // SDL_BUTTON_RIGHT
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	541 e.button.state = SDL_RELEASED;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	542 e.button.x = 291;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	543 e.button.y = 10010;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	544 ut(e);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	545 // Mouse motion:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	546 e.type = SDL_MOUSEMOTION;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	547 e.motion.x = 63;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	548 e.motion.y = 44;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	549 e.motion.xrel = 14;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	550 e.motion.yrel = -1;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	551 ut(e);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	552 // Joystick 2 button 5 down:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	553 e.type = SDL_JOYBUTTONDOWN;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	554 e.jbutton.which = 2;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	555 e.jbutton.button = 5;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	556 e.jbutton.state = SDL_PRESSED;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	557 ut(e);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	558 // Same button released:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	559 e.jbutton.state = SDL_RELEASED;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	560 ut(e);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	561 // Joystick 1 axis 8 motion:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	562 e.type = SDL_JOYAXISMOTION;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	563 e.jaxis.which = 1;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	564 e.jaxis.axis = 8;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	565 e.jaxis.value = 32767;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	566 ut(e);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	567 // Joystick 22 ball 100 motion:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	568 e.type = SDL_JOYBALLMOTION;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	569 e.jball.which = 22;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	570 e.jball.ball = 100;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	571 e.jball.xrel = -21;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	572 e.jball.yrel = 1024;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	573 ut(e);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	574 // Joystick 214 hat 12 DOWN-RIGHT:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	575 e.type = SDL_JOYHATMOTION;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	576 e.jhat.which = 214;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	577 e.jhat.hat = 12;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	578 e.jhat.value = SDL_HAT_RIGHTDOWN;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	579 ut(e);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	580 // Same hat LEFT:
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	581 e.jhat.value = SDL_HAT_LEFT;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	582 ut(e);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	583 //END Post a lot of events
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	584
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	585 //BEGIN Check states
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	586 assert (ut.getButton(0xF0) == true);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	587 assert (ut.getButton(0x1F0) == false);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	588 assert (ut.getButton(0x2F0) == false);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	589 assert (ut.getButton(0x4F0) == false);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	590 assert (ut.getButton(0x5F0) == true);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	591 assert (ut.getButton(0x6F0) == false);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	592 assert (ut.getButton(0x7F0) == false);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	593
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	594 assert (ut.getAxis(0x20F0) == 32767);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	595 assert (ut.getAxis(0x21F0) == -32767);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	596 assert (ut.getAxis1(0x22F0) == 0.0);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	597
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	598 real s,t;
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	599 ut.getRelMotion(0x10F0, s,t);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	600 assert (s == 14.0);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	601 assert (t == -1.0);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	602 ut.getRelMotion(0x12F0, s,t);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	603 assert (s == -21.0);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	604 assert (t == 1024.0);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	605
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	606 assert (counters == [2,2,0,2,1,1]);
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	607 //END Check states
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	608
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	609 logger.info ("Unittest complete.");
4c3575400769 DefaultData largely rewritten with unittest, SDL input event handling completed with unittest, changes to Init threading. Diggory Hardy <diggory.hardy@gmail.com> parents: 9 diff changeset	610 }
0 d547009c104c Repository creation. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	611 }

Mercurial > projects > mde

annotate mde/input/input.d @ 31:baa87e68d7dc