fix keyHandler becoming unremovable if added to two different keys (#653

) * fix keyHandler becoming unremovable if added two different keys * fix strange modifier key behavior (#654) * fix strange modifier key behaviour * disable modifier state in keyDown if released
CBATeam · May 1, 2017 · e3e6300 · e3e6300
1 parent 8590630
commit e3e6300
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 9 deletions.
diff --git a/addons/events/XEH_preInit.sqf b/addons/events/XEH_preInit.sqf
@@ -79,3 +79,7 @@ GVAR(keyHoldTimers) = call CBA_fnc_createNamespace;
 
     false
 }] call CBA_fnc_compileFinal;
+
+GVAR(shift) = false;
+GVAR(control) = false;
+GVAR(alt) = false;
diff --git a/addons/events/fnc_addKeyHandler.sqf b/addons/events/fnc_addKeyHandler.sqf
@@ -69,6 +69,12 @@ if (_type isEqualTo "keydown") then {
 };
 
 private _hash = [GVAR(keyHandlersDown), GVAR(keyHandlersUp)] select (_type == "keyup");
+
+// fix using addKeyHander twice on different keys makes old handler unremovable
+if (!isNil {_hash getVariable _hashKey}) then {
+    [_hashKey, _type] call CBA_fnc_removeKeyHandler;
+};
+
 _hash setVariable [_hashKey, [_key, _settings, _code, _allowHold, _holdDelay]];
 
 private _keyHandlers = [GVAR(keyDownStates), GVAR(keyUpStates)] select (_type == "keyup");

diff --git a/addons/events/fnc_keyHandlerDown.sqf b/addons/events/fnc_keyHandlerDown.sqf
@@ -15,7 +15,32 @@ params ["", "_inputKey"];
 
 if (_inputKey isEqualTo 0) exitWith {};
 
-private _inputModifiers = _this select [2,3];
+// handle modifiers
+switch (true) do {
+    case (_inputKey in [DIK_LSHIFT, DIK_RSHIFT]): {
+        GVAR(shift) = true;
+    };
+    case (_inputKey in [DIK_LCONTROL, DIK_RCONTROL]): {
+        GVAR(control) = true;
+    };
+    case (_inputKey in [DIK_LMENU, DIK_RMENU]): {
+        GVAR(alt) = true;
+    };
+};
+
+if !(_this select 2) then {
+    GVAR(shift) = false;
+};
+
+if !(_this select 3) then {
+    GVAR(control) = false;
+};
+
+if !(_this select 4) then {
+    GVAR(alt) = false;
+};
+
+private _inputModifiers = [GVAR(shift), GVAR(control), GVAR(alt)];
 
 private _blockInput = false;
 

diff --git a/addons/events/fnc_keyHandlerUp.sqf b/addons/events/fnc_keyHandlerUp.sqf
@@ -15,6 +15,19 @@ params ["", "_inputKey"];
 
 if (_inputKey isEqualTo 0) exitWith {};
 
+// handle modifiers
+switch (true) do {
+    case (_inputKey in [DIK_LSHIFT, DIK_RSHIFT]): {
+        GVAR(shift) = false;
+    };
+    case (_inputKey in [DIK_LCONTROL, DIK_RCONTROL]): {
+        GVAR(control) = false;
+    };
+    case (_inputKey in [DIK_LMENU, DIK_RMENU]): {
+        GVAR(alt) = false;
+    };
+};
+
 private _removeHandlers = [];
 
 {

diff --git a/addons/events/fnc_mouseHandlerDown.sqf b/addons/events/fnc_mouseHandlerDown.sqf
@@ -13,6 +13,4 @@ SCRIPT(mouseHandlerDown);
 
 params ["_display", "_inputButton"];
 
-private _inputModifiers = _this select [4,3];
-
-([_display, MOUSE_OFFSET + _inputButton] + _inputModifiers) call FUNC(keyHandlerDown);
+[_display, MOUSE_OFFSET + _inputButton, GVAR(shift), GVAR(control), GVAR(alt)] call FUNC(keyHandlerDown);
diff --git a/addons/events/fnc_mouseHandlerUp.sqf b/addons/events/fnc_mouseHandlerUp.sqf
@@ -13,6 +13,4 @@ SCRIPT(mouseHandlerUp);
 
 params ["_display", "_inputButton"];
 
-private _inputModifiers = _this select [4,3];
-
-([_display, MOUSE_OFFSET + _inputButton] + _inputModifiers) call FUNC(keyHandlerUp);
+[_display, MOUSE_OFFSET + _inputButton, GVAR(shift), GVAR(control), GVAR(alt)] call FUNC(keyHandlerUp);
diff --git a/addons/events/fnc_mouseWheelHandler.sqf b/addons/events/fnc_mouseWheelHandler.sqf
@@ -15,5 +15,5 @@ params ["_display", "_inputDirection"];
 
 private _inputDirection = [0, 1] select (_inputDirection < 0);
 
-[_display, MOUSE_WHEEL_OFFSET + _inputDirection, false, false, false] call FUNC(keyHandlerDown);
-[_display, MOUSE_WHEEL_OFFSET + _inputDirection, false, false, false] call FUNC(keyHandlerUp);
+[_display, MOUSE_WHEEL_OFFSET + _inputDirection, GVAR(shift), GVAR(control), GVAR(alt)] call FUNC(keyHandlerDown);
+[_display, MOUSE_WHEEL_OFFSET + _inputDirection, GVAR(shift), GVAR(control), GVAR(alt)] call FUNC(keyHandlerUp);