add keyhandler to main map display (#890)

CBATeam · Feb 13, 2018 · 67c54e9 · 67c54e9
1 parent 91c8e89
commit 67c54e9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/addons/events/CfgEventHandlers.hpp b/addons/events/CfgEventHandlers.hpp
@@ -20,6 +20,9 @@ class Extended_DisplayLoad_EventHandlers {
     class RscDisplayMission {
         ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMission)'));
     };
+    class RscDiary {
+        ADDON = QUOTE(if (ctrlIDD (_this select 0) == 12) then {_this call (uiNamespace getVariable 'FUNC(initDisplayMainMap)')};);
+    };
     class RscDisplayCurator {
         ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
     };

diff --git a/addons/events/XEH_preStart.sqf b/addons/events/XEH_preStart.sqf
@@ -2,6 +2,7 @@
 
 if (hasInterface) then {
     PREP(initDisplayMission);
+    PREP(initDisplayMainMap);
     PREP(initDisplayCurator);
 
     PREP(keyHandler);

diff --git a/addons/events/fnc_initDisplayMainMap.sqf b/addons/events/fnc_initDisplayMainMap.sqf
@@ -0,0 +1,12 @@
+#include "script_component.hpp"
+
+params ["_display"];
+
+// set up CBA_fnc_addKeyHandler
+_display displayAddEventHandler ["KeyDown",         {if (visibleMap) then {call FUNC(keyHandlerDown)};}];
+_display displayAddEventHandler ["KeyUp",           {if (visibleMap) then {call FUNC(keyHandlerUp)};}];
+_display displayAddEventHandler ["MouseButtonDown", {if (visibleMap) then {call FUNC(mouseHandlerDown)};}];
+_display displayAddEventHandler ["MouseButtonUp",   {if (visibleMap) then {call FUNC(mouseHandlerUp)};}];
+_display displayAddEventHandler ["MouseZChanged",   {if (visibleMap) then {call FUNC(mouseWheelHandler)};}];
+_display displayAddEventHandler ["MouseMoving",     {if (visibleMap) then {call FUNC(userKeyHandler)};}];
+_display displayAddEventHandler ["MouseHolding",    {if (visibleMap) then {call FUNC(userKeyHandler)};}];
diff --git a/addons/events/fnc_initDisplayMission.sqf b/addons/events/fnc_initDisplayMission.sqf
@@ -23,10 +23,10 @@ if (!isNil QGVAR(handlerHash)) then {
 };
 
 // set up CBA_fnc_addKeyHandler
-_display displayAddEventHandler ["KeyDown", {call FUNC(keyHandlerDown)}];
-_display displayAddEventHandler ["KeyUp", {call FUNC(keyHandlerUp)}];
-_display displayAddEventHandler ["MouseButtonDown", {call FUNC(mouseHandlerDown)}];
-_display displayAddEventHandler ["MouseButtonUp", {call FUNC(mouseHandlerUp)}];
-_display displayAddEventHandler ["MouseZChanged", {call FUNC(mouseWheelHandler)}];
-_display displayAddEventHandler ["MouseMoving", {call FUNC(userKeyHandler)}];
-_display displayAddEventHandler ["MouseHolding", {call FUNC(userKeyHandler)}];
+_display displayAddEventHandler ["KeyDown",         {if (!visibleMap) then {call FUNC(keyHandlerDown)};}];
+_display displayAddEventHandler ["KeyUp",           {if (!visibleMap) then {call FUNC(keyHandlerUp)};}];
+_display displayAddEventHandler ["MouseButtonDown", {if (!visibleMap) then {call FUNC(mouseHandlerDown)};}];
+_display displayAddEventHandler ["MouseButtonUp",   {if (!visibleMap) then {call FUNC(mouseHandlerUp)};}];
+_display displayAddEventHandler ["MouseZChanged",   {if (!visibleMap) then {call FUNC(mouseWheelHandler)};}];
+_display displayAddEventHandler ["MouseMoving",     {if (!visibleMap) then {call FUNC(userKeyHandler)};}];
+_display displayAddEventHandler ["MouseHolding",    {if (!visibleMap) then {call FUNC(userKeyHandler)};}];