From 72ed0c74345adf99959f67ce077279630de4dbfb Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Sun, 9 Feb 2025 10:20:31 -0800 Subject: [PATCH 1/2] adds support for pressing meta key as a modifier and adds 'command' keycode for pressing Super keys from nut.js --- src/main.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main.cc b/src/main.cc index 4aa858a..9013728 100644 --- a/src/main.cc +++ b/src/main.cc @@ -315,6 +315,8 @@ static KeyNames key_names[] = {"meta", K_META}, {"right_meta", K_RIGHTMETA}, + {"command", K_META}, + {"cmd", K_CMD}, {"right_cmd", K_RIGHTCMD}, @@ -416,10 +418,10 @@ int CheckKeyFlags(std::string &flagString, MMKeyFlags *flags) { if (flagString == "alt" || flagString == "right_alt") { *flags = MOD_ALT; #if defined(IS_MACOSX) - } else if (flagString == "command" || flagString == "cmd" || flagString == "right_cmd") { + } else if (flagString == "command" || flagString == "meta" || flagString == "right_meta" || flagString == "cmd" || flagString == "right_cmd") { *flags = MOD_META; #else - } else if (flagString == "command" || flagString == "win" || flagString == "right_win") { + } else if (flagString == "command" || flagString == "meta" || flagString == "right_meta" || flagString == "win" || flagString == "right_win") { *flags = MOD_META; #endif } else if (flagString == "control" || flagString == "right_control") { From 02d49fd4705097b0ab8619a4ad26d998fbae0eab Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Mon, 10 Feb 2025 13:21:02 -0800 Subject: [PATCH 2/2] removing "command" from KeyNames and CheckKeyFlags to bring in line with similar unmerged PR --- src/main.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main.cc b/src/main.cc index 9013728..44c7610 100644 --- a/src/main.cc +++ b/src/main.cc @@ -315,8 +315,6 @@ static KeyNames key_names[] = {"meta", K_META}, {"right_meta", K_RIGHTMETA}, - {"command", K_META}, - {"cmd", K_CMD}, {"right_cmd", K_RIGHTCMD}, @@ -418,10 +416,10 @@ int CheckKeyFlags(std::string &flagString, MMKeyFlags *flags) { if (flagString == "alt" || flagString == "right_alt") { *flags = MOD_ALT; #if defined(IS_MACOSX) - } else if (flagString == "command" || flagString == "meta" || flagString == "right_meta" || flagString == "cmd" || flagString == "right_cmd") { + } else if (flagString == "meta" || flagString == "right_meta" || flagString == "cmd" || flagString == "right_cmd") { *flags = MOD_META; #else - } else if (flagString == "command" || flagString == "meta" || flagString == "right_meta" || flagString == "win" || flagString == "right_win") { + } else if (flagString == "meta" || flagString == "right_meta" || flagString == "win" || flagString == "right_win") { *flags = MOD_META; #endif } else if (flagString == "control" || flagString == "right_control") {