From 1a28393dabf4f4696bf433ddde52e7a25253c955 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Thu, 16 Oct 2008 16:34:15 +0000
Subject: various user interface related updates

---
 src/client/input.cc | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

(limited to 'src/client/input.cc')

diff --git a/src/client/input.cc b/src/client/input.cc
index a72999e..1e018f5 100644
--- a/src/client/input.cc
+++ b/src/client/input.cc
@@ -486,8 +486,19 @@ void key_pressed(Key *key)
 		render::Camera::set_pitch(0.0f);
 
 		client()->console()->toggle();
+		return;
+	}
+
+	if (ui::root()->active()) {
+		local_direction = 0.0f;
+		local_pitch = 0.0f;
+		local_roll = 0.0f;
 
-	} else if (ui::root()->input_key(true, Keyboard::translate_keysym(key->sym(), keyboard_modifiers), keyboard_modifiers)) {
+		render::Camera::set_direction(0.0f);
+		render::Camera::set_pitch(0.0f);
+	}
+	
+	if (ui::root()->input_key(true, Keyboard::translate_keysym(key->sym(), keyboard_modifiers), keyboard_modifiers)) {
 		return;
 
 	} else if (core::application()->connected() && core::localcontrol()) {
@@ -609,8 +620,8 @@ void reset()
 	}
 	mouse_pitch = 0.0f;
 	mouse_direction = 0.0f;
-	mouse_x = video::width / 2;
-	mouse_y = video::height / 2;
+	mouse_x = render::Camera::width() / 2;
+	mouse_y = render::Camera::height() / 2;
 	render::Camera::reset();
 	render::Dust::reset();
 	mouse_control_override = false;
@@ -631,7 +642,7 @@ void reset()
 	joystick_lastmoved = 0;
 }
 
-void frame(float seconds)
+void frame()
 {
 	/* -- detect localcontrol() changes --------------- */
 	if (core::localcontrol() && (last_control != core::localcontrol()->id())) {
@@ -662,6 +673,9 @@ void frame(float seconds)
 		key = 0;
 
 		switch (event.type) {
+			case SDL_VIDEORESIZE:
+				video::resize((float) event.resize.w, (float) event.resize.h);
+				break;
 
   			case SDL_MOUSEMOTION:
 				mouse_x = event.motion.x;
@@ -774,26 +788,26 @@ void frame(float seconds)
 			mouse_deadzone = true;
 
 			// direction
-			int l = mouse_x - (video::width >> 1);
+			int l = mouse_x - (render::Camera::width() >> 1);
 	
 			if (abs(l) < ( deadzone_size >> 1 )) {
 				// dead zone
 				mouse_direction = 0;
 			} else {
-				l = (mouse_x - deadzone_size) - ((video::width - deadzone_size) >> 1);
-				mouse_direction = float (-l) / (float) ((video::width - deadzone_size) >> 1);
+				l = (mouse_x - deadzone_size) - ((render::Camera::width() - deadzone_size) >> 1);
+				mouse_direction = float (-l) / (float) ((render::Camera::width() - deadzone_size) >> 1);
 				mouse_deadzone = false;
 			}
 
 			// pitch
-			int h = mouse_y - (video::height >> 1);
+			int h = mouse_y - (render::Camera::height() >> 1);
 
 			if (abs(h) < ( deadzone_size >> 1 )) {
 				// dead zone
 				mouse_pitch = 0;
 			} else {
-				h = (mouse_y - deadzone_size) - ((video::height - deadzone_size) >> 1);
-				mouse_pitch = float (-h) / (float) ((video::height - deadzone_size) >> 1);
+				h = (mouse_y - deadzone_size) - ((render::Camera::height() - deadzone_size) >> 1);
+				mouse_pitch = float (-h) / (float) ((render::Camera::height() - deadzone_size) >> 1);
 				mouse_deadzone = false;
 			}
 
-- 
cgit v1.2.3