Rename HandleKeyPress to ExecuteCommand.

kovacsv · kovacsv · commit fe6bbc511e10 · 2020-08-21T08:31:49.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,7 +61,7 @@ if (${EMSCRIPTEN})
 	set (SDLUsedLibraries -sUSE_SDL=2 -sUSE_SDL_TTF=2)
 	target_compile_options (WebApp PUBLIC ${SDLUsedLibraries})
 	target_link_options (WebApp PUBLIC ${SDLUsedLibraries})
-	target_link_options (WebApp PUBLIC "-sEXPORTED_FUNCTIONS=[\"_main\", \"_ResizeWindow\", \"_HandleKeyPress\", \"_CreateNode\", \"_ContextMenuResponse\", \"_ParameterSettingsResponse\"]")
+	target_link_options (WebApp PUBLIC "-sEXPORTED_FUNCTIONS=[\"_main\", \"_ResizeWindow\", \"_ExecuteCommand\", \"_CreateNode\", \"_ContextMenuResponse\", \"_ParameterSettingsResponse\"]")
 	target_link_options (WebApp PUBLIC "-sEXTRA_EXPORTED_RUNTIME_METHODS=[\"ccall\", \"cwrap\"]")
 	target_link_options (WebApp PUBLIC --preload-file Assets)
 	add_definitions (-DSIZEOFSIZET=4)
diff --git a/Sources/WebApp/main.cpp b/Sources/WebApp/main.cpp
@@ -127,7 +127,7 @@ void ResizeWindow (int width, int height)
 	gAppForBrowser->ResizeWindow (width, height);
 }
 
-void HandleKeyPress (char* keyCode)
+void ExecuteCommand (char* keyCode)
 {
 	if (gAppForBrowser == nullptr) {
 		return;
@@ -139,27 +139,23 @@ void HandleKeyPress (char* keyCode)
 	}
 
 	std::string keyCodeStr (keyCode);
-	NUIE::Key pressedKey (NUIE::KeyCode::Undefined);
+	NUIE::NodeEditor& nodeEditor = gAppForBrowser->GetNodeEditor ();
 	if (keyCodeStr == "SelectAll") {
-		pressedKey.SetKeyCode (NUIE::KeyCode::SelectAll);
+		nodeEditor.OnKeyPress (NUIE::KeyCode::SelectAll);
 	} else if (keyCodeStr == "Copy") {
-		pressedKey.SetKeyCode (NUIE::KeyCode::Copy);
+		nodeEditor.OnKeyPress (NUIE::KeyCode::Copy);
 	} else if (keyCodeStr == "Paste") {
-		pressedKey.SetKeyCode (NUIE::KeyCode::Paste);
+		nodeEditor.OnKeyPress (NUIE::KeyCode::Paste);
 	} else if (keyCodeStr == "Group") {
-		pressedKey.SetKeyCode (NUIE::KeyCode::Group);
+		nodeEditor.OnKeyPress (NUIE::KeyCode::Group);
 	} else if (keyCodeStr == "Undo") {
-		pressedKey.SetKeyCode (NUIE::KeyCode::Undo);
+		nodeEditor.OnKeyPress (NUIE::KeyCode::Undo);
 	} else if (keyCodeStr == "Redo") {
-		pressedKey.SetKeyCode (NUIE::KeyCode::Redo);
+		nodeEditor.OnKeyPress (NUIE::KeyCode::Redo);
 	} else if (keyCodeStr == "Escape") {
-		pressedKey.SetKeyCode (NUIE::KeyCode::Escape);
+		nodeEditor.OnKeyPress (NUIE::KeyCode::Escape);
 	} else if (keyCodeStr == "Delete") {
-		pressedKey.SetKeyCode (NUIE::KeyCode::Delete);
-	}
-	if (pressedKey.IsValid ()) {
-		NUIE::NodeEditor& nodeEditor = gAppForBrowser->GetNodeEditor ();
-		nodeEditor.OnKeyPress (pressedKey);
+		nodeEditor.OnKeyPress (NUIE::KeyCode::Delete);
 	}
 }
 
diff --git a/Sources/WebSite/script/application.js b/Sources/WebSite/script/application.js
@@ -46,37 +46,35 @@ Application.prototype.InitKeyboardEvents = function ()
 		overCanvas = false;
 	});
 	
-	var handleKeyPressFunc = this.module.cwrap ('HandleKeyPress', null, ['string']);
-	
 	$(window).keydown (function (ev) {
 		if (!overCanvas) {
 			return;
 		}
-		var keyCode = null;
+		var command = null;
 		var isControlPressed = ev.ctrlKey;
 		if (isControlPressed) {
 			if (ev.which == 65) {
-				keyCode = 'SelectAll';
+				command = 'SelectAll';
 			} else if (ev.which == 67) {
-				keyCode = 'Copy';
+				command = 'Copy';
 			} else if (ev.which == 86) {
-				keyCode = 'Paste';
+				command = 'Paste';
 			} else if (ev.which == 71) {
-				keyCode = 'Group';
+				command = 'Group';
 			} else if (ev.which == 90) {
-				keyCode = 'Undo';
+				command = 'Undo';
 			} else if (ev.which == 89) {
-				keyCode = 'Redo';
+				command = 'Redo';
 			}
 		} else {
 			if (ev.which == 8 || ev.which == 46) {
-				keyCode = 'Delete';
+				command = 'Delete';
 			} else if (ev.which == 27) {
-				keyCode = 'Escape';
+				command = 'Escape';
 			}
 		}
-		if (keyCode != null) {
-			handleKeyPressFunc (keyCode);
+		if (command != null) {
+			myThis.ExecuteCommand (command);
 			ev.preventDefault();
 		}
 	});
@@ -94,6 +92,12 @@ Application.prototype.InitMenu = function (menuDivName)
 	nodeTree.BuildAsMenu ();
 };
 
+Application.prototype.ExecuteCommand = function (command)
+{
+	var executeCommandFunc = this.module.cwrap ('ExecuteCommand', null, ['string']);
+	executeCommandFunc (command);
+};
+
 Application.prototype.ResizeCanvas = function (width, height)
 {
 	var resizeWindowFunc = Module.cwrap ('ResizeWindow', null, ['number', 'number']);
