From d7d2f7d6f2c0d635fd3fe81c69bcf0a803052cc8 Mon Sep 17 00:00:00 2001
From: Allen Webster <editor@4coder.net>
Date: Mon, 16 May 2016 12:14:42 -0400
Subject: [PATCH] fix to delay.cpp generator

---
 4ed_data.ctm           | Bin 3284 -> 0 bytes
 4ed_delay.cpp          |   5 ++++-
 4ed_linux_keyboard.cpp |  11 ++++++++++-
 4ed_metagen.cpp        |  12 ++++++++++--
 4 files changed, 24 insertions(+), 4 deletions(-)
 delete mode 100644 4ed_data.ctm

diff --git a/4ed_data.ctm b/4ed_data.ctm
deleted file mode 100644
index 5d46b5a95e8ecb6894e8d43ede2aad8a630ee872..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3284
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

diff --git a/4ed_delay.cpp b/4ed_delay.cpp
index 4a491f65..c76fcfee 100644
--- a/4ed_delay.cpp
+++ b/4ed_delay.cpp
@@ -35,7 +35,10 @@ str_alloc_copy(General_Memory *general, String str){
     result.str = (char*)general_memory_allocate(general, result.memory_size, 0);
     memcpy(result.str, str.str, str.size);
     result.str[result.size] = 0;
-    return(result);}
+    return(result);
+}
+
+
 
 inline Delayed_Action*
 delayed_action_(Delay *delay, Action_Type type){
diff --git a/4ed_linux_keyboard.cpp b/4ed_linux_keyboard.cpp
index e4a2e9ee..7a0dc7b0 100644
--- a/4ed_linux_keyboard.cpp
+++ b/4ed_linux_keyboard.cpp
@@ -9,7 +9,16 @@
 
 // TOP
 
-#include "4ed_keyboard.cpp"
+// TODO(allen): Let's go ahead and eliminate this file
+// like I did with the win32 keyboard files.
+
+// NOTE(allen): Old contents of 4ed_keyboard.cpp
+globalvar u8 keycode_lookup_table[255];
+
+inline u8
+keycode_lookup(u8 system_code){
+	return keycode_lookup_table[system_code];
+}
 
 internal void
 keycode_init(Display* dpy){
diff --git a/4ed_metagen.cpp b/4ed_metagen.cpp
index 69bbc78a..fd07ad6d 100644
--- a/4ed_metagen.cpp
+++ b/4ed_metagen.cpp
@@ -167,9 +167,17 @@ char str_alloc_copy[] =
 "    result.str = (char*)general_memory_allocate(general, result.memory_size, 0);\n"
 "    memcpy(result.str, str.str, str.size);\n"
 "    result.str[result.size] = 0;\n"
-"    return(result);"
+"    return(result);\n"
 "}\n\n";
 
+char delayed_action_zero[] =
+"inline Delayed_Action\n"
+"delayed_action_zero(){\n"
+"    Delayed_Action result = {0};\n"
+"    return(result);\n"
+"}\n\n"
+;
+
 char daction_name[] = "Delayed_Action";
 Struct_Field daction_fields[] = {
     {"Action_Type", "type"},
@@ -218,7 +226,7 @@ char delayed_action_function_bottom[] =
 "delay->general, delay->acts, delay->count*sizeof(Delayed_Action), delay->max*sizeof(Delayed_Action), 0);\n"
 "    }\n"
 "    result = delay->acts + delay->count++;\n"
-"    *result = {};\n"
+"    *result = delayed_action_zero();\n"
 "    result->type = type;\n"
 "    return(result);\n"
 "}\n\n";