From: terencehill <piuntn@gmail.com>
Date: Wed, 9 Nov 2011 21:52:38 +0000 (+0100)
Subject: Thanks to the use of the built in function setcursormode we can fix 2 bugs in hud... 
X-Git-Tag: xonotic-v0.7.0~196^2~7
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=ffa05049ee992833e194e2da30de04452f2324e0;p=xonotic%2Fxonotic-data.pk3dir.git

Thanks to the use of the built in function setcursormode we can fix 2 bugs in hud setup mode: 1) dancing weapon while moving the cursor and 2) changed view on exit if mouse position has changed.
---

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 627ee9f2f..3de6fdd4f 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -636,9 +636,10 @@ void GameCommand(string msg)
 // CSQC_InputEvent : Used to perform actions based on any key pressed, key released and mouse on the client.
 // Return value should be 1 if CSQC handled the input, otherwise return 0 to have the input passed to the engine.
 // All keys are in ascii.
-// bInputType = 0 is key pressed, 1 is key released, 2 is mouse input.
+// bInputType = 0 is key pressed, 1 is key released, 2 and 3 are mouse input.
 // In the case of keyboard input, nPrimary is the ascii code, and nSecondary is 0.
 // In the case of mouse input, nPrimary is xdelta, nSecondary is ydelta.
+// In the case of mouse input after a setcursormode(1) call, nPrimary is xpos, nSecondary is ypos.
 float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
 	float bSkipKey;
diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index ac976db67..e0180a706 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -468,7 +468,7 @@ void CSQC_UpdateView(float w, float h)
 	}
 	
 	// do lockview after event chase camera so that it still applies whenever necessary.
-	if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0) || intermission > 1)
+	if(autocvar_cl_lockview || intermission > 1)
 	{
 		R_SetView(VF_ORIGIN, freeze_org);
 		R_SetView(VF_ANGLES, freeze_ang);
diff --git a/qcsrc/client/csqc_builtins.qc b/qcsrc/client/csqc_builtins.qc
index 6ef34f35e..dd7b18da3 100644
--- a/qcsrc/client/csqc_builtins.qc
+++ b/qcsrc/client/csqc_builtins.qc
@@ -125,6 +125,7 @@ void ()									DefaultPlayerPhysics = #347;
 
 string (float playernum, string key)					getplayerkey = #348;
 void (string cmdname)							registercmd = #352;
+void(float usecursor)							setcursormode = #343;
 vector ()								getmousepos = #344;
 
 string (string s) 							uncolorstring = #170;
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 7acfacb8c..f8e68fc2b 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4989,7 +4989,12 @@ void HUD_Main (void)
 			HUD_Panel_UpdatePosSizeForId(highlightedPanel);
 			HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha));
 		}
+
+		if (!hud_configure_prev)
+			setcursormode(1);
 	}
+	else if (hud_configure_prev)
+		setcursormode(0);
 
 	hud_configure_prev = autocvar__hud_configure;
 
diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 18ff119a7..0c47ffa2d 100644
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -621,13 +621,19 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
 	string s;
 
-	// we only care for keyboard events
-	if(bInputType != 0 && bInputType != 1)
+	if(bInputType == 2)
 		return false;
 
 	if(!autocvar__hud_configure)
 		return false;
 
+	if(bInputType == 3)
+	{
+		mousepos_x = nPrimary;
+		mousepos_y = nSecondary;
+		return true;
+	}
+
 	// allow console bind to work
 	string con_keys;
 	float keys;
@@ -1055,11 +1061,6 @@ void HUD_Panel_Mouse()
 	if(menu_enabled == 1 || (menu_enabled == 2 && !hud_fade_alpha))
 		return;
 
-	mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed;
-
-	mousepos_x = bound(0, mousepos_x, vid_conwidth);
-	mousepos_y = bound(0, mousepos_y, vid_conheight);
-
 	if(mouseClicked)
 	{
 		if(prevMouseClicked == 0)