From 40906bb852d1785fea990c76bf5068f3d4090bc1 Mon Sep 17 00:00:00 2001
From: Ilia Demianenko <ilia.demianenko@gmail.com>
Date: Sat, 15 Jul 2023 00:15:12 -0700
Subject: [PATCH] Feedback

---
 src/mp_app.h              | 11 ++++++-----
 src/osx_app.m             |  1 +
 src/platform/orca_clock.c |  2 --
 src/ui.c                  | 14 ++++++++------
 src/util/hash.c           |  2 +-
 src/win32_app.c           |  1 +
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/mp_app.h b/src/mp_app.h
index 468b06c..d652c9c 100644
--- a/src/mp_app.h
+++ b/src/mp_app.h
@@ -190,11 +190,12 @@ typedef enum { MP_KEY_UNKNOWN    = 0,
                MP_KEY_COUNT } mp_key_code;
 
 typedef enum {
-	MP_KEYMOD_NONE  = 0x00,
-	MP_KEYMOD_ALT   = 0x01,
-	MP_KEYMOD_SHIFT = 0x02,
-	MP_KEYMOD_CTRL  = 0x04,
-	MP_KEYMOD_CMD   = 0x08 } mp_keymod_flags;
+	MP_KEYMOD_NONE          = 0x00,
+	MP_KEYMOD_ALT           = 0x01,
+	MP_KEYMOD_SHIFT         = 0x02,
+	MP_KEYMOD_CTRL          = 0x04,
+	MP_KEYMOD_CMD           = 0x08,
+	MP_KEYMOD_MAIN_MODIFIER = 0x16 } mp_keymod_flags;
 
 typedef enum {
 	MP_MOUSE_LEFT	= 0x00,
diff --git a/src/osx_app.m b/src/osx_app.m
index 1ae74a5..affb7d7 100644
--- a/src/osx_app.m
+++ b/src/osx_app.m
@@ -253,6 +253,7 @@ static mp_keymod_flags mp_convert_osx_mods(NSUInteger nsFlags)
 	if(nsFlags & NSEventModifierFlagCommand)
 	{
 		mods |= MP_KEYMOD_CMD;
+		mods |= MP_KEYMOD_MAIN_MODIFIER;
 	}
 	return(mods);
 }
diff --git a/src/platform/orca_clock.c b/src/platform/orca_clock.c
index 8658f0a..a93599d 100644
--- a/src/platform/orca_clock.c
+++ b/src/platform/orca_clock.c
@@ -1,6 +1,4 @@
 #include"util/typedefs.h"
 #include"platform_clock.h"
 
-void ORCA_IMPORT(mp_clock_init)();
-
 f64 ORCA_IMPORT(mp_get_time)(mp_clock_kind clock);
diff --git a/src/ui.c b/src/ui.c
index de97e29..b8aea1c 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -6,11 +6,11 @@
 *	@revision:
 *
 *****************************************************************/
-#include"platform.h"
-#include"platform_assert.h"
-#include"memory.h"
-#include"hash.h"
-#include"platform_clock.h"
+#include"platform/platform.h"
+#include"platform/platform_assert.h"
+#include"platform/platform_clock.h"
+#include"util/memory.h"
+#include"util/hash.h"
 #include"ui.h"
 
 static ui_style UI_STYLE_DEFAULTS =
@@ -2303,10 +2303,12 @@ typedef struct ui_edit_command
 
 } ui_edit_command;
 
-#if PLATFORM_WINDOWS || PLATFORM_ORCA
+#if PLATFORM_WINDOWS
 	#define OS_COPY_PASTE_MOD MP_KEYMOD_CTRL
 #elif PLATFORM_MACOS
 	#define OS_COPY_PASTE_MOD MP_KEYMOD_CMD
+#elif PLATFORM_ORCA
+	#define OS_COPY_PASTE_MOD MP_KEYMOD_MAIN_MODIFIER
 #endif
 
 const ui_edit_command UI_EDIT_COMMANDS[] = {
diff --git a/src/util/hash.c b/src/util/hash.c
index e1a4ee0..d60493d 100644
--- a/src/util/hash.c
+++ b/src/util/hash.c
@@ -7,7 +7,7 @@
 *
 *****************************************************************/
 #include"hash.h"
-#include"platform.h"
+#include"platform/platform.h"
 
 #if ARCH_X64
 #include<immintrin.h>
diff --git a/src/win32_app.c b/src/win32_app.c
index af99453..c438847 100644
--- a/src/win32_app.c
+++ b/src/win32_app.c
@@ -191,6 +191,7 @@ static mp_keymod_flags mp_get_mod_keys()
 	if(GetKeyState(VK_CONTROL) & 0x8000)
 	{
 		mods |= MP_KEYMOD_CTRL;
+		mods |= MP_KEYMOD_MAIN_MODIFIER;
 	}
 	if(GetKeyState(VK_MENU) & 0x8000)
 	{