1 files changed, 53 insertions, 3 deletions

diff --git a/src/client/input.cc b/src/client/input.cc
index f8d76f2..819ce27 100644
--- a/src/client/input.cc
+++ b/src/client/input.cc
@@ -23,6 +23,8 @@ namespace client
 {
 
 core::Cvar *input_mousecontrol = 0;
+core::Cvar *input_keydelay = 0;
+core::Cvar *input_keyrepeat = 0;
 
 namespace input
 {
@@ -204,9 +206,15 @@ void init()
 	SDL_WM_GrabInput(SDL_GRAB_ON);
 //	SDL_EnableUNICODE(1);
 
-	input_mousecontrol = core::Cvar::get("input_mousecontrol", "1", core::Cvar::Archive);
+	input_mousecontrol = core::Cvar::get("input_mousecontrol", 1.0f, core::Cvar::Archive);
 	input_mousecontrol->set_info("[bool] enable or disable mouse control");
 
+	input_keydelay = core::Cvar::get("input_keydelay", 250.0f, core::Cvar::Archive);
+	input_keydelay->set_info("[int] keyboard delay time-out in milliseconds");
+
+	input_keyrepeat = core::Cvar::get("input_keyrepeat", 30.0f, core::Cvar::Archive);
+	input_keyrepeat->set_info("[int] keyboard repeat time-out in milliseconds");
+
 	core::Func *func = 0;
 
 	func = core::Func::add("ui_console", func_ui_console);
@@ -270,7 +278,7 @@ void shutdown()
 
  	SDL_ShowCursor(SDL_ENABLE);
 	SDL_WM_GrabInput(SDL_GRAB_OFF);
-//	SDL_EnableUNICODE(0);
+//	SDL_DisableUNICODE(0);
 
 }
 
@@ -447,6 +455,7 @@ void key_released(Key *key)
 
 void frame(float seconds)
 {
+	/* -- detect localcontrol() changes --------------- */
 	if (core::localcontrol() && (last_control != core::localcontrol()->id())) {
 
 		local_direction = 0.0f;
@@ -464,6 +473,7 @@ void frame(float seconds)
 		render::reset();	
 	}
 
+	/* -- poll SDL keyboard events -------------------- */
 	SDL_Event event;
 	Key *key = 0;
 	bool pressed = false;
@@ -515,10 +525,50 @@ void frame(float seconds)
 				key_released(key);
 		}
 	}
+
+	/* -- handle key repeat --------------------------- */
+	float delay = 250.0f;	// key delay time-out in milliseconds
+	if (input_keydelay) {
+		delay = input_keydelay->value();
+		math::clamp(delay, 50.0f, 500.0f);
+	}
+	
+	float repeat = 30.0f;	// key repeat time-out in milliseconds
+	if (input_keyrepeat) {
+		repeat = input_keyrepeat->value();
+		math::clamp(repeat, 10.0f, 250.0f);
+	}
+	
+	if (repeat > delay) {
+		float tmp = repeat;
+		repeat = delay;
+		delay = tmp;
+	}
+	if (input_keydelay)
+		(*input_keydelay) = delay;
+	if (input_keyrepeat)
+		(*input_keyrepeat) = repeat;
 	
+	repeat /= 1000.0f;
+	delay /= 1000.0f;
+	
+	for (Keyboard::iterator it = keyboard->begin(); it != keyboard->end(); it++) {
+		key = (*it).second;
+		if (key && key->sym() < 512 && key->pressed()) {
+			while ((key->pressed()+delay < core::application()->time()) && (key->lastpressed()+repeat < core::application()->time())) {
+				if (key->lastpressed() > key->pressed())
+					key->lastpressed() += repeat;
+				else
+					key->lastpressed() += delay;
+				key_pressed(key);
+			}
+		}
+	}
+
+	/* -- process mouse movement ----------------------*/
 	mouse_control = false;
 	mouse_deadzone = false;
-
+	key->lastpressed() += repeat;
 	if (core::application()->connected() && core::localcontrol()) {
 
 		mouse_control = !console()->visible() && ((input_mousecontrol->value() > 0) || mouse_control_override);