kg: src/Input.cc@6c7b4deefdfb (annotated)

221 fbc5db6fce45 reorganize the weapons code and input handling code terom parents: diff changeset	1
fbc5db6fce45 reorganize the weapons code and input handling code terom parents: diff changeset	2	#include "Input.hh"
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	3	#include "Engine.hh"
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	4	#include "Config.hh"
221 fbc5db6fce45 reorganize the weapons code and input handling code terom parents: diff changeset	5
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	6	InputKeymapEntry<PlayerInputBit> INPUT_PLAYER_KEYMAP[] = {
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	7	{ INPUT_AIM_UP, INPUT_FLAG_UNLIMITED, { -CL_KEY_ENTER, CL_KEY_UP } },
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	8	{ INPUT_AIM_DOWN, INPUT_FLAG_UNLIMITED, { -CL_KEY_ENTER, CL_KEY_DOWN } },
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	9	{ INPUT_MOVE_LEFT, INPUT_FLAG_UNLIMITED, { -CL_KEY_ENTER, CL_KEY_LEFT } },
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	10	{ INPUT_MOVE_RIGHT, INPUT_FLAG_UNLIMITED, { -CL_KEY_ENTER, CL_KEY_RIGHT } },
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	11	{ INPUT_JUMP, INPUT_FLAG_SLOWREPEAT, { -CL_KEY_ENTER, CL_KEY_RSHIFT } },
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	12	{ INPUT_DIG, INPUT_FLAG_NOREPEAT, { CL_KEY_LEFT, CL_KEY_RIGHT } },
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	13	{ INPUT_SHOOT, INPUT_FLAG_UNLIMITED, { CL_KEY_RCONTROL, 0 } },
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	14	{ INPUT_CHANGE_PREV, INPUT_FLAG_SLOWREPEAT, { CL_KEY_ENTER, CL_KEY_LEFT } },
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	15	{ INPUT_CHANGE_NEXT, INPUT_FLAG_SLOWREPEAT, { CL_KEY_ENTER, CL_KEY_RIGHT } },
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	16	{ INPUT_ROPE, INPUT_FLAG_NOREPEAT, { CL_KEY_ENTER, CL_KEY_RSHIFT } },
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	17	{ INPUT_UNROPE, INPUT_FLAG_SLOWREPEAT, { -CL_KEY_ENTER, CL_KEY_RSHIFT } },
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	18	{ INPUT_ROPE_UP, INPUT_FLAG_UNLIMITED, { CL_KEY_ENTER, CL_KEY_UP } },
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	19	{ INPUT_ROPE_DOWN, INPUT_FLAG_UNLIMITED, { CL_KEY_ENTER, CL_KEY_DOWN } },
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	20	{ INPUT_SUICIDE, INPUT_FLAG_NOREPEAT, { CL_KEY_LCONTROL, CL_KEY_K } },
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	21	{ INPUT_NONE, 0, { 0, 0 } }
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	22	};
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	23
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	24	InputKeymapEntry<GuiInputBit> INPUT_GUI_KEYMAP[] = {
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	25	{ GUI_INPUT_QUIT, 0, { CL_KEY_ESCAPE, 0 } },
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	26	{ GUI_INPUT_DISPLAY_WEAPON, 0, { CL_KEY_ENTER, 0 } },
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	27	{ GUI_INPUT_DEBUG_PLAYER, 0, { CL_KEY_I, 0 } },
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	28	{ GUI_INPUT_NONE, 0, { 0, 0, } }
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	29	};
230 78cf0cd69af4 better input handling terom parents: 229 diff changeset	30
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	31	/*
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	32	* InputKeyRepeatEntry
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	33	*/
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	34	template <typename BitEnumType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	35	InputKeyRepeatEntry<BitEnumType>::InputKeyRepeatEntry (BitEnumType value, TimeMS expire) :
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	36	value(value), expire(expire)
235 0a0c729365ee code cleanup terom parents: 233 diff changeset	37	{
0a0c729365ee code cleanup terom parents: 233 diff changeset	38
0a0c729365ee code cleanup terom parents: 233 diff changeset	39	}
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	40
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	41	template <typename BitEnumType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	42	bool InputKeyRepeatEntry<BitEnumType>::operator< (const struct InputKeyRepeatEntry &other) {
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	43	return other.expire > expire;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	44	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	45
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	46	template <typename BitEnumType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	47	bool InputKeyRepeatEntry<BitEnumType>::updateExpired (TimeMS dt) {
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	48	if (expire == 0)
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	49	return false;
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	50
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	51	expire -= dt;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	52
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	53	return (expire <= 0);
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	54	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	55
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	56	/*
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	57	* InputKeyRepeatQueue
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	58	*/
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	59	template <typename BitEnumType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	60	InputKeyRepeatQueue<BitEnumType>::InputKeyRepeatQueue (TimeMS expire) :
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	61	expire(expire)
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	62	{
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	63
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	64	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	65
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	66	template <typename BitEnumType>
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	67	void InputKeyRepeatQueue<BitEnumType>::push (BitEnumType bit, bool expire) {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	68	list.push_back(InputKeyRepeatEntry<BitEnumType>(bit, expire ? this->expire : 0));
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	69	}
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	70
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	71	template <typename BitEnumType>
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	72	void InputKeyRepeatQueue<BitEnumType>::forget (BitEnumType bit) {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	73	// go through the list, looking for it
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	74	for (list_iterator it = list.begin(); it != list.end(); it++) {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	75	if (it->value == bit) {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	76	// found, erase it and return
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	77	list.erase(it);
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	78
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	79	return;
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	80	}
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	81	}
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	82	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	83
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	84	template <typename BitEnumType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	85	bool InputKeyRepeatQueue<BitEnumType>::find (BitEnumType bit) {
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	86	for (list_iterator it = list.begin(); it != list.end(); it++) {
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	87	if (it->value == bit)
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	88	return true;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	89	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	90
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	91	return false;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	92	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	93
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	94	template <typename BitEnumType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	95	void InputKeyRepeatQueue<BitEnumType>::update (TimeMS dt) {
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	96	list_iterator it = list.begin();
235 0a0c729365ee code cleanup terom parents: 233 diff changeset	97
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	98	// go through each entry, updateExpired and remove if expired
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	99	while (it != list.end()) {
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	100	if (it->updateExpired(dt))
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	101	it = list.erase(it);
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	102	else
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	103	it++;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	104	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	105	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	106
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	107	/*
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	108	* InputHandler
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	109	*/
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	110	template <typename BitEnumType, typename BitMaskType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	111	InputHandler<BitEnumType, BitMaskType>::InputHandler (CL_InputDevice &keyboard, InputKeymapEntry<BitEnumType> *keymap, TimeMS keyrepeat_expire) :
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	112	keyboard(keyboard),
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	113	keymap(keymap),
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	114	value(0),
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	115	prev_value(0),
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	116	dt(0),
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	117	queue(keyrepeat_expire)
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	118	{
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	119
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	120	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	121
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	122	template <typename BitEnumType, typename BitMaskType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	123	bool InputHandler<BitEnumType, BitMaskType>::checkKeycode (int keycode) {
230 78cf0cd69af4 better input handling terom parents: 229 diff changeset	124	if (keycode > 0)
78cf0cd69af4 better input handling terom parents: 229 diff changeset	125	return keyboard.get_keycode(keycode);
78cf0cd69af4 better input handling terom parents: 229 diff changeset	126
78cf0cd69af4 better input handling terom parents: 229 diff changeset	127	else if (keycode < 0)
78cf0cd69af4 better input handling terom parents: 229 diff changeset	128	return !keyboard.get_keycode(-keycode);
78cf0cd69af4 better input handling terom parents: 229 diff changeset	129
78cf0cd69af4 better input handling terom parents: 229 diff changeset	130	else // == 0
78cf0cd69af4 better input handling terom parents: 229 diff changeset	131	return true;
78cf0cd69af4 better input handling terom parents: 229 diff changeset	132	}
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	133
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	134	template <typename BitEnumType, typename BitMaskType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	135	void InputHandler<BitEnumType, BitMaskType>::readValue (BitMaskType &mask, TimeMS &dt) {
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	136	// copy to args
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	137	mask = this->value;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	138	dt = this->dt;
230 78cf0cd69af4 better input handling terom parents: 229 diff changeset	139
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	140	this->value = 0;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	141	this->dt = 0;
230 78cf0cd69af4 better input handling terom parents: 229 diff changeset	142	}
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	143
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	144	template <typename BitEnumType, typename BitMaskType>
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	145	void InputHandler<BitEnumType, BitMaskType>::update (TimeMS dt) {
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	146	// all bits that are held down, even those ignored
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	147	BitMaskType raw_value = 0;
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	148
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	149	// update the key-repeat queue
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	150	queue.update(dt);
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	151
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	152	// then go through the keymap
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	153	for (InputKeymapEntry<BitEnumType> *e = keymap; e->input != 0; e++) {
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	154	// check if we've got the correct keycodes
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	155	if (checkKeycode(e->keycodes[0]) && checkKeycode(e->keycodes[1])) {
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	156	// set raw_value
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	157	raw_value \|= e->input;
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	158
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	159	if (e->flags & INPUT_FLAG_SLOWREPEAT) {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	160	// repeat, but slowly
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	161	if (!(prev_value & e->input)) {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	162	// we've released the key earlier, move it to the back of the queue
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	163	queue.forget(e->input);
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	164	queue.push(e->input);
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	165
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	166	} else if (queue.find(e->input)) {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	167	// it's still in the queue, so ignore, but set it in ignore_value
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	168	continue;
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	169
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	170	} else {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	171	// ok, but add it to the queue
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	172	queue.push(e->input);
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	173	}
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	174
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	175	} else if (e->flags & INPUT_FLAG_NOREPEAT) {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	176	// do not repeat at all
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	177	if (prev_value & e->input) {
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	178	// ignore repeats
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	179	continue;
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	180	}
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	181	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	182
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	183	// set bit in masks
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	184	this->value \|= e->input;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	185	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	186	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	187
319 9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	188	// update prev_value, also adding ignored values
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	189	prev_value = raw_value;
9f6a838d58c4 improve input handling further, ROPE_THROW and DIG don't repeat at all now terom parents: 311 diff changeset	190
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	191	// then increment our dt
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	192	this->dt += dt;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	193	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	194
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	195	/**
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	196	* Input
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	197	*/
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	198	Input::Input (CL_InputDevice &keyboard) :
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	199	keyboard(keyboard),
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	200	update_timer(INPUT_POLL_INTERVAL),
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	201	player(keyboard, INPUT_PLAYER_KEYMAP, INPUT_REPEAT_DELAY),
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	202	gui(keyboard, INPUT_GUI_KEYMAP, INPUT_REPEAT_DELAY)
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	203	{
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	204	// connect timer
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	205	slots.connect(update_timer.sig_tick(), &player, &InputHandler<PlayerInputBit, PlayerInput>::update);
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	206	slots.connect(update_timer.sig_tick(), &gui, &InputHandler<GuiInputBit, GuiInput>::update);
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	207
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	208	// enable timer
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	209	update_timer.start();
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	210	}
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	211
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	212	void Input::readPlayerInput (PlayerInput &mask, TimeMS &dt) {
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	213	player.readValue(mask, dt);
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	214	}
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	215
235 0a0c729365ee code cleanup terom parents: 233 diff changeset	216	GuiInput Input::readGuiInput (void) {
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	217	GuiInput mask;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	218	TimeMS dt;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	219
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	220	gui.readValue(mask, dt);
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	221
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 300 diff changeset	222	return mask;
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	223	}
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	224

author	terom
	Tue, 09 Dec 2008 04:23:57 +0000
changeset 362	6c7b4deefdfb
parent 319	9f6a838d58c4
child 389	e74c1820fbd2
permissions	-rw-r--r--