From 32af6cb0cff91b4eade5eb9f7cdaaff60c92484c Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sun, 3 Aug 2014 12:18:15 +0300
Subject: [PATCH] Added support for Command/Meta key

---
 src/c_bind.cpp    | 4 ++++
 src/c_console.cpp | 4 ++++
 src/ct_chat.cpp   | 8 ++++++++
 src/d_gui.h       | 3 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/c_bind.cpp b/src/c_bind.cpp
index 0744efeee..66ed14ca5 100644
--- a/src/c_bind.cpp
+++ b/src/c_bind.cpp
@@ -230,7 +230,11 @@ const char *KeyNames[NUM_KEYS] =
 	NULL,		NULL,		NULL,		NULL,		NULL,		"pause",	NULL,		"home",		//C0
 	"uparrow",	"pgup",		NULL,		"leftarrow",NULL,		"rightarrow",NULL,		"end",		//C8
 	"downarrow","pgdn",		"ins",		"del",		NULL,		NULL,		NULL,		NULL,		//D0
+#ifdef __APPLE__
+	NULL,		NULL,		NULL,		"command",	NULL,		"apps",		"power",	"sleep",	//D8
+#else // !__APPLE__
 	NULL,		NULL,		NULL,		"lwin",		"rwin",		"apps",		"power",	"sleep",	//D8
+#endif // __APPLE__
 	NULL,		NULL,		NULL,		"wake",		NULL,		"search",	"favorites","refresh",	//E0
 	"webstop",	"webforward","webback",	"mycomputer","mail",	"mediaselect",NULL,		NULL,		//E8
 	NULL,		NULL,		NULL,		NULL,		NULL,		NULL,		NULL,		NULL,		//F0
diff --git a/src/c_console.cpp b/src/c_console.cpp
index e7c7dc30b..873cf5d7b 100644
--- a/src/c_console.cpp
+++ b/src/c_console.cpp
@@ -1421,7 +1421,11 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 		case 'V':
 			TabbedLast = false;
 			TabbedList = false;
+#ifdef __APPLE__
+			if (ev->data3 & GKM_META)
+#else // !__APPLE__
 			if (ev->data3 & GKM_CTRL)
+#endif // __APPLE__
 			{
 				if (data1 == 'C')
 				{ // copy to clipboard
diff --git a/src/ct_chat.cpp b/src/ct_chat.cpp
index c0c1f13f0..29edf3bcc 100644
--- a/src/ct_chat.cpp
+++ b/src/ct_chat.cpp
@@ -145,12 +145,20 @@ bool CT_Responder (event_t *ev)
 				CT_BackSpace ();
 				return true;
 			}
+#ifdef __APPLE__
+			else if (ev->data1 == 'C' && (ev->data3 & GKM_META))
+#else // !__APPLE__
 			else if (ev->data1 == 'C' && (ev->data3 & GKM_CTRL))
+#endif // __APPLE__
 			{
 				I_PutInClipboard ((char *)ChatQueue);
 				return true;
 			}
+#ifdef __APPLE__
+			else if (ev->data1 == 'V' && (ev->data3 & GKM_META))
+#else // !__APPLE__
 			else if (ev->data1 == 'V' && (ev->data3 & GKM_CTRL))
+#endif // __APPLE__
 			{
 				CT_PasteChat(I_GetFromClipboard(false));
 			}
diff --git a/src/d_gui.h b/src/d_gui.h
index b88041771..86c3761ed 100644
--- a/src/d_gui.h
+++ b/src/d_gui.h
@@ -70,7 +70,8 @@ enum GUIKeyModifiers
 	GKM_SHIFT	= 1,
 	GKM_CTRL	= 2,
 	GKM_ALT		= 4,
-	GKM_LBUTTON = 8
+	GKM_META	= 8,
+	GKM_LBUTTON = 16
 };
 
 // Special codes for some GUI keys, including a few real ASCII codes.