From d02f9158d0b579ea3b15616c3c952218d3ec8744 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sat, 9 Sep 2017 19:51:11 -0400 Subject: [PATCH 1/8] setting up Mac to work in the new partially cleaned up platform layer --- platform_mac/mac_4ed.cpp | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index ddccde95..b49fada1 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -21,7 +21,6 @@ # include "4coder_API/style.h" # define FSTRING_IMPLEMENTATION -# define FSTRING_C # include "4coder_lib/4coder_string.h" # include "4coder_lib/4coder_mem.h" @@ -43,8 +42,35 @@ #include "4ed_font_interface_to_os.h" #include "4ed_system_shared.h" +#include "unix_4ed_headers.h" #include +//////////////////////////////// + +#define SLASH '/' +#define DLL "so" + +global System_Functions sysfunc; +#include "4ed_shared_library_constants.h" +#include "mac_library_wrapper.h" +#include "4ed_standard_libraries.cpp" + +#include "4ed_coroutine.cpp" + +//////////////////////////////// + +global Render_Target target; +global Application_Memory memory_vars; +global Plat_Settings plat_settings; + +global Libraries libraries; +global App_Functions app; +global Custom_API custom_api; + +global Coroutine_System_Auto_Alloc coroutines; + +//////////////////////////////// + #include "unix_4ed_functions.cpp" #include "osx_objective_c_to_cpp_links.h" From 67ab069e5b5c8d01ac1dc35fdf52ba03f9d5b7ac Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sun, 10 Sep 2017 14:24:26 -0400 Subject: [PATCH 2/8] setting up more mac build stuff --- meta/4ed_build.cpp | 11 ++- meta/4ed_file_moving.h | 8 +- platform_linux/linux_4ed.cpp | 9 +-- platform_mac/mac_4ed.cpp | 76 ++++++++++++++++++- platform_unix/unix_4ed_headers.h | 1 + .../unix_library_wrapper.h | 0 .../unix_threading_wrapper.h | 5 +- 7 files changed, 94 insertions(+), 16 deletions(-) rename platform_linux/linux_library_wrapper.h => platform_unix/unix_library_wrapper.h (100%) rename platform_linux/linux_threading_wrapper.h => platform_unix/unix_threading_wrapper.h (95%) diff --git a/meta/4ed_build.cpp b/meta/4ed_build.cpp index b114acb8..53fbc0b2 100644 --- a/meta/4ed_build.cpp +++ b/meta/4ed_build.cpp @@ -491,18 +491,26 @@ do_buildsuper(char *cdir, char *file, u32 arch){ END_TIME_SECTION("build custom"); } +// TODO(allen): Remove this internal i32 get_freetype_include(char *out, u32 max){ i32 size = 0; +#if 0 #if defined(IS_LINUX) char freetype_include[512]; FILE *file = popen("pkg-config --cflags freetype2", "r"); if (file != 0){ fgets(freetype_include, sizeof(freetype_include), file); size = strlen(freetype_include); - freetype_include[size-1] = 0; + memcpy(out, freetype_include, size); pclose(file); } +#elif defined(IS_MAC) + char *freetype_include = "/usr/local/include/freetype2"; + size = strlen(freetype_include); + memcpy(out, freetype_include, size + ); +#endif #endif return(size); } @@ -521,6 +529,7 @@ build_main(char *cdir, b32 update_local_theme, u32 flags, u32 arch){ i32 ft_size = get_freetype_include(ft_include, sizeof(ft_include) - 1); if (ft_size > 0){ ft_include[ft_size] = 0; + fprintf(stdout, "FREETYPE: %s\n", ft_include); build_includes = fm_list(build_includes, fm_list_one_item(ft_include)); } diff --git a/meta/4ed_file_moving.h b/meta/4ed_file_moving.h index a2222a60..c02c6ec7 100644 --- a/meta/4ed_file_moving.h +++ b/meta/4ed_file_moving.h @@ -35,7 +35,7 @@ static i32 prev_error = 0; #endif #define systemf(...) do{ \ - i32 n = snprintf(SF_CMD, sizeof(SF_CMD), __VA_ARGS__); \ + i32 n = snprintf(SF_CMD, sizeof(SF_CMD), __VA_ARGS__); \ AllowLocal(n); \ Assert(n < sizeof(SF_CMD)); \ SYSTEMF_PRINTF("%s\n", SF_CMD); \ @@ -136,13 +136,13 @@ internal void fm__swap_ptr(char **A, char **B); // Slashes #if defined(IS_WINDOWS) -#define SLASH "\\" +# define SLASH "\\" static char platform_correct_slash = '\\'; #elif defined(IS_LINUX) || defined(IS_MAC) -#define SLASH "/" +# define SLASH "/" static char platform_correct_slash = '/'; #else -#error Slash not set for this platform. +# error Slash not set for this platform. #endif // File Extensions diff --git a/platform_linux/linux_4ed.cpp b/platform_linux/linux_4ed.cpp index 46aeaa37..8b7ded10 100644 --- a/platform_linux/linux_4ed.cpp +++ b/platform_linux/linux_4ed.cpp @@ -50,7 +50,6 @@ #include #include -#include #include #include @@ -76,7 +75,7 @@ #include #include "4ed_shared_thread_constants.h" -#include "linux_threading_wrapper.h" +#include "unix_threading_wrapper.h" // // Linux macros @@ -118,7 +117,7 @@ internal void LinuxStringDup(String*, void*, size_t); global System_Functions sysfunc; #include "4ed_shared_library_constants.h" -#include "linux_library_wrapper.h" +#include "unix_library_wrapper.h" #include "4ed_standard_libraries.cpp" #include "4ed_coroutine.cpp" @@ -484,10 +483,6 @@ Sys_CLI_End_Update_Sig(system_cli_end_update){ return(close_me); } -// -// Linux rendering/font system functions -// - #include "4ed_font_data.h" #include "4ed_system_shared.cpp" diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index b49fada1..276c5703 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -45,6 +45,14 @@ #include "unix_4ed_headers.h" #include +#include +#include + +//////////////////////////////// + +#include "4ed_shared_thread_constants.h" +#include "unix_threading_wrapper.h" + //////////////////////////////// #define SLASH '/' @@ -52,7 +60,7 @@ global System_Functions sysfunc; #include "4ed_shared_library_constants.h" -#include "mac_library_wrapper.h" +#include "unix_library_wrapper.h" #include "4ed_standard_libraries.cpp" #include "4ed_coroutine.cpp" @@ -76,6 +84,14 @@ global Coroutine_System_Auto_Alloc coroutines; #include "osx_objective_c_to_cpp_links.h" OSX_Vars osx; +#include + +#include "4ed_font_data.h" +#include "4ed_system_shared.cpp" + +#include "4ed_link_system_functions.cpp" +#include "4ed_shared_init_logic.cpp" + external void* osx_allocate(umem size){ void *result = system_memory_allocate(size); @@ -111,6 +127,64 @@ osx_step(){ external void osx_init(){ + // + // System Linkage + // + + link_system_code(); + + // + // Memory init + // + + memset(&linuxvars, 0, sizeof(linuxvars)); + memset(&target, 0, sizeof(target)); + memset(&memory_vars, 0, sizeof(memory_vars)); + memset(&plat_settings, 0, sizeof(plat_settings)); + + memset(&libraries, 0, sizeof(libraries)); + memset(&app, 0, sizeof(app)); + memset(&custom_api, 0, sizeof(custom_api)); + + memory_init(); + + // + // HACK(allen): + // Previously zipped stuff is here, it should be zipped in the new pattern now. + // + + init_shared_vars(); + + // + // Dynamic Linkage + // + + load_app_code(); + link_rendering(); +#if defined(FRED_SUPER) + load_custom_code(); +#else + custom_api.get_bindings = get_bindings; +#endif + + // + // Read command line + // + + read_command_line(argc, argv); + + // + // Threads + // + + work_system_init(); + + // + // Coroutines + // + + coroutines_init(); + // TODO } diff --git a/platform_unix/unix_4ed_headers.h b/platform_unix/unix_4ed_headers.h index 4b4d44b3..7548359b 100644 --- a/platform_unix/unix_4ed_headers.h +++ b/platform_unix/unix_4ed_headers.h @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/platform_linux/linux_library_wrapper.h b/platform_unix/unix_library_wrapper.h similarity index 100% rename from platform_linux/linux_library_wrapper.h rename to platform_unix/unix_library_wrapper.h diff --git a/platform_linux/linux_threading_wrapper.h b/platform_unix/unix_threading_wrapper.h similarity index 95% rename from platform_linux/linux_threading_wrapper.h rename to platform_unix/unix_threading_wrapper.h index 5409fe72..9ea8562b 100644 --- a/platform_linux/linux_threading_wrapper.h +++ b/platform_unix/unix_threading_wrapper.h @@ -9,8 +9,8 @@ // TOP -#if !defined(LINUX_THREADING_WRAPPER) -#define LINUX_THREADING_WRAPPER +#if !defined(MAC_THREADING_WRAPPER) +#define MAC_THREADING_WRAPPER #define PLAT_THREAD_SIG(n) void* n(void *ptr) typedef PLAT_THREAD_SIG(Thread_Function); @@ -35,7 +35,6 @@ union Semaphore{ FixSize(SEMAPHORE_TYPE_SIZE); }; - internal void system_init_and_launch_thread(Thread *t, Thread_Function *proc, void *ptr){ pthread_create(&t->t, 0, proc, ptr); From fd141031b91dd6242b1150d900dc08073f441044 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sun, 10 Sep 2017 14:40:11 -0400 Subject: [PATCH 3/8] mac clipboard wrapper --- 4ed_defines.h | 6 ++++-- osx_objective_c_to_cpp_links.h | 3 +++ platform_linux/linux_4ed.cpp | 10 +++------- platform_mac/mac_4ed.cpp | 26 ++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/4ed_defines.h b/4ed_defines.h index 26b5459a..61850c27 100644 --- a/4ed_defines.h +++ b/4ed_defines.h @@ -89,11 +89,13 @@ inline i32 div_ceil(i32 n, i32 d){ } inline i32 l_round_up_i32(i32 x, i32 b){ - return( ((x)+(b)-1) - (((x)+(b)-1)%(b)) ); + i32 t = x + b - 1; + return(t - (t%b)); } inline u32 l_round_up_u32(u32 x, u32 b){ - return( ((x)+(b)-1) - (((x)+(b)-1)%(b)) ); + i32 t = x + b - 1; + return(t - (t%b)); } inline u32 round_up_pot_u32(u32 x){ diff --git a/osx_objective_c_to_cpp_links.h b/osx_objective_c_to_cpp_links.h index b374b59a..91598f98 100644 --- a/osx_objective_c_to_cpp_links.h +++ b/osx_objective_c_to_cpp_links.h @@ -36,6 +36,9 @@ typedef struct OSX_Vars{ void *clipboard_data; umem clipboard_size, clipboard_max; b32 just_posted_to_clipboard; + + char *clipboard_space; + umem clipboard_space_max; } OSX_Vars; // In C++ layer. diff --git a/platform_linux/linux_4ed.cpp b/platform_linux/linux_4ed.cpp index 8b7ded10..70aa7d9a 100644 --- a/platform_linux/linux_4ed.cpp +++ b/platform_linux/linux_4ed.cpp @@ -1465,20 +1465,17 @@ LinuxHandleX11Events(void) response.time = request.time; response.property = None; - if ( - linuxvars.clipboard_outgoing.size && + if (linuxvars.clipboard_outgoing.size && request.selection == linuxvars.atom_CLIPBOARD && request.property != None && request.display && - request.requestor - ){ + request.requestor){ Atom atoms[] = { XA_STRING, linuxvars.atom_UTF8_STRING }; if (request.target == linuxvars.atom_TARGETS){ - XChangeProperty( request.display, request.requestor, @@ -1487,8 +1484,7 @@ LinuxHandleX11Events(void) 32, PropModeReplace, (u8*)atoms, - ArrayCount(atoms) - ); + ArrayCount(atoms)); response.property = request.property; diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index 276c5703..9573350d 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -89,6 +89,32 @@ OSX_Vars osx; #include "4ed_font_data.h" #include "4ed_system_shared.cpp" +//////////////////////////////// + +// +// Clipboard +// + +internal +Sys_Post_Clipboard_Sig(system_post_clipboard){ + char *string = str.str; + if (!terminate_with_null(&str)){ + if (osx.clipboard_space_max <= str.size + 1){ + if (osx.clipboard_space != 0){ + system_memory_free(osx.clipboard_space, osx.clipboard_space_max); + } + osx.clipboard_space_max = l_round_up_u32(str.size*2 + 1, KB(4096)); + osx.clipboard_space = (char*)system_memory_allocate(osx.clipboard_space_max); + } + memcpy(osx.clipboard_space, str.str, str.size); + osx.clipboard_space[str.size] = 0; + string = osx.clipboard_space; + } + osx_post_to_clipboard(string); +} + +//////////////////////////////// + #include "4ed_link_system_functions.cpp" #include "4ed_shared_init_logic.cpp" From cdccd7d9124c01e537788065dfce777293df1c32 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sun, 10 Sep 2017 15:14:41 -0400 Subject: [PATCH 4/8] zip coroutine functions --- platform_all/4ed_coroutine_functions.cpp | 76 ++++++++++++++++++++++++ platform_linux/linux_4ed.cpp | 59 +----------------- platform_mac/mac_4ed.cpp | 5 +- platform_win32/win32_4ed.cpp | 57 +----------------- 4 files changed, 83 insertions(+), 114 deletions(-) create mode 100644 platform_all/4ed_coroutine_functions.cpp diff --git a/platform_all/4ed_coroutine_functions.cpp b/platform_all/4ed_coroutine_functions.cpp new file mode 100644 index 00000000..154267cb --- /dev/null +++ b/platform_all/4ed_coroutine_functions.cpp @@ -0,0 +1,76 @@ +/* + * Mr. 4th Dimention - Allen Webster + * + * 10.09.2017 + * + * Mac C++ layer for 4coder + * + */ + +// TOP + +#if !defined(FRED_COROUTINE_FUNCTIONS_CPP) +#define FRED_COROUTINE_FUNCTIONS_CPP + +// +// Coroutine +// + +internal +Sys_Create_Coroutine_Sig(system_create_coroutine){ + Coroutine *coroutine = coroutine_system_alloc(&coroutines); + Coroutine_Head *result = 0; + if (coroutine != 0){ + coroutine_set_function(coroutine, func); + result = &coroutine->head; + } + return(result); +} + +internal +Sys_Launch_Coroutine_Sig(system_launch_coroutine){ + Coroutine *coroutine = (Coroutine*)head; + coroutine->head.in = in; + coroutine->head.out = out; + + Coroutine *active = coroutine->sys->active; + Assert(active != 0); + coroutine_launch(active, coroutine); + Assert(active == coroutine->sys->active); + + Coroutine_Head *result = &coroutine->head; + if (coroutine->state == CoroutineState_Dead){ + coroutine_system_free(&coroutines, coroutine); + result = 0; + } + return(result); +} + +Sys_Resume_Coroutine_Sig(system_resume_coroutine){ + Coroutine *coroutine = (Coroutine*)head; + coroutine->head.in = in; + coroutine->head.out = out; + + Coroutine *active = coroutine->sys->active; + Assert(active != 0); + coroutine_resume(active, coroutine); + Assert(active == coroutine->sys->active); + + Coroutine_Head *result = &coroutine->head; + if (coroutine->state == CoroutineState_Dead){ + coroutine_system_free(&coroutines, coroutine); + result = 0; + } + return(result); +} + +Sys_Yield_Coroutine_Sig(system_yield_coroutine){ + Coroutine *coroutine = (Coroutine*)head; + coroutine_yield(coroutine); +} + +#endif + +// BOTTOM + + diff --git a/platform_linux/linux_4ed.cpp b/platform_linux/linux_4ed.cpp index 70aa7d9a..5f1b9636 100644 --- a/platform_linux/linux_4ed.cpp +++ b/platform_linux/linux_4ed.cpp @@ -304,6 +304,8 @@ Sys_Send_Exit_Signal_Sig(system_send_exit_signal){ linuxvars.keep_running = false; } +#include "4ed_coroutine_functions.cpp" + // // Clipboard // @@ -314,63 +316,6 @@ Sys_Post_Clipboard_Sig(system_post_clipboard){ XSetSelectionOwner(linuxvars.XDisplay, linuxvars.atom_CLIPBOARD, linuxvars.XWindow, CurrentTime); } -// -// Coroutine -// - -internal -Sys_Create_Coroutine_Sig(system_create_coroutine){ - Coroutine *coroutine = coroutine_system_alloc(&coroutines); - Coroutine_Head *result = 0; - if (coroutine != 0){ - coroutine_set_function(coroutine, func); - result = &coroutine->head; - } - return(result); -} - -internal -Sys_Launch_Coroutine_Sig(system_launch_coroutine){ - Coroutine *coroutine = (Coroutine*)head; - coroutine->head.in = in; - coroutine->head.out = out; - - Coroutine *active = coroutine->sys->active; - Assert(active != 0); - coroutine_launch(active, coroutine); - Assert(active == coroutine->sys->active); - - Coroutine_Head *result = &coroutine->head; - if (coroutine->state == CoroutineState_Dead){ - coroutine_system_free(&coroutines, coroutine); - result = 0; - } - return(result); -} - -Sys_Resume_Coroutine_Sig(system_resume_coroutine){ - Coroutine *coroutine = (Coroutine*)head; - coroutine->head.in = in; - coroutine->head.out = out; - - Coroutine *active = coroutine->sys->active; - Assert(active != 0); - coroutine_resume(active, coroutine); - Assert(active == coroutine->sys->active); - - Coroutine_Head *result = &coroutine->head; - if (coroutine->state == CoroutineState_Dead){ - coroutine_system_free(&coroutines, coroutine); - result = 0; - } - return(result); -} - -Sys_Yield_Coroutine_Sig(system_yield_coroutine){ - Coroutine *coroutine = (Coroutine*)head; - coroutine_yield(coroutine); -} - // // CLI // diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index 9573350d..9700bab6 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -91,6 +91,8 @@ OSX_Vars osx; //////////////////////////////// +#include "4ed_coroutine_functions.cpp" + // // Clipboard // @@ -108,7 +110,8 @@ Sys_Post_Clipboard_Sig(system_post_clipboard){ } memcpy(osx.clipboard_space, str.str, str.size); osx.clipboard_space[str.size] = 0; - string = osx.clipboard_space; + string = osx.clipboard_space + ; } osx_post_to_clipboard(string); } diff --git a/platform_win32/win32_4ed.cpp b/platform_win32/win32_4ed.cpp index f8a94740..78d0de08 100644 --- a/platform_win32/win32_4ed.cpp +++ b/platform_win32/win32_4ed.cpp @@ -262,62 +262,7 @@ Sys_Send_Exit_Signal_Sig(system_send_exit_signal){ win32vars.send_exit_signal = true; } -// -// Coroutines -// - -internal -Sys_Create_Coroutine_Sig(system_create_coroutine){ - Coroutine *coroutine = coroutine_system_alloc(&coroutines); - Coroutine_Head *result = 0; - if (coroutine != 0){ - coroutine_set_function(coroutine, func); - result = &coroutine->head; - } - return(result); -} - -internal -Sys_Launch_Coroutine_Sig(system_launch_coroutine){ - Coroutine *coroutine = (Coroutine*)head; - coroutine->head.in = in; - coroutine->head.out = out; - - Coroutine *active = coroutine->sys->active; - Assert(active != 0); - coroutine_launch(active, coroutine); - Assert(active == coroutine->sys->active); - - Coroutine_Head *result = &coroutine->head; - if (coroutine->state == CoroutineState_Dead){ - coroutine_system_free(&coroutines, coroutine); - result = 0; - } - return(result); -} - -Sys_Resume_Coroutine_Sig(system_resume_coroutine){ - Coroutine *coroutine = (Coroutine*)head; - coroutine->head.in = in; - coroutine->head.out = out; - - Coroutine *active = coroutine->sys->active; - Assert(active != 0); - coroutine_resume(active, coroutine); - Assert(active == coroutine->sys->active); - - Coroutine_Head *result = &coroutine->head; - if (coroutine->state == CoroutineState_Dead){ - coroutine_system_free(&coroutines, coroutine); - result = 0; - } - return(result); -} - -Sys_Yield_Coroutine_Sig(system_yield_coroutine){ - Coroutine *coroutine = (Coroutine*)head; - coroutine_yield(coroutine); -} +#include "4ed_coroutine_functions.cpp" // // Clipboard From 670726442b89ebd8451831993f949a6a11b93765 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sun, 10 Sep 2017 16:41:30 -0400 Subject: [PATCH 5/8] setup to work on mac cli calls --- platform_mac/mac_4ed.cpp | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index 9700bab6..2b70c6c8 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -86,9 +86,6 @@ OSX_Vars osx; #include -#include "4ed_font_data.h" -#include "4ed_system_shared.cpp" - //////////////////////////////// #include "4ed_coroutine_functions.cpp" @@ -116,6 +113,40 @@ Sys_Post_Clipboard_Sig(system_post_clipboard){ osx_post_to_clipboard(string); } +// +// CLI +// + +internal +Sys_CLI_Call_Sig(system_cli_call){ + // b32 #(char *path, char *script_name, CLI_Handles *cli_out) + // TODO + return(true); +} + +internal +Sys_CLI_Begin_Update_Sig(system_cli_begin_update){ + // void #(CLI_Handles *cli) + // TODO +} + +internal +Sys_CLI_Update_Step_Sig(system_cli_update_step){ + // b32 #(CLI_Handles *cli, char *dest, u32 max, u32 *amount) + // TODO + return(0); +} + +internal +Sys_CLI_End_Update_Sig(system_cli_end_update){ + // b32 #(CLI_Handles *cli) + // TODO + return(false); +} + +#include "4ed_font_data.h" +#include "4ed_system_shared.cpp" + //////////////////////////////// #include "4ed_link_system_functions.cpp" From 80b32ca4ed13a5c75fee2d18deabb82a3fb7b567 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Tue, 26 Sep 2017 11:12:51 -0400 Subject: [PATCH 6/8] worked out dialogue box, work queue, stubbed more functions --- platform_all/4ed_work_queues.cpp | 2 +- platform_linux/linux_4ed.cpp | 1 + platform_mac/mac_4ed.cpp | 70 +++++++++++++++---- platform_mac/mac_4ed.m | 10 +++ platform_mac/mac_error_box.cpp | 19 +++++ .../osx_objective_c_to_cpp_links.h | 6 ++ 6 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 platform_mac/mac_error_box.cpp rename osx_objective_c_to_cpp_links.h => platform_mac/osx_objective_c_to_cpp_links.h (93%) diff --git a/platform_all/4ed_work_queues.cpp b/platform_all/4ed_work_queues.cpp index 75540681..215830d3 100644 --- a/platform_all/4ed_work_queues.cpp +++ b/platform_all/4ed_work_queues.cpp @@ -117,7 +117,7 @@ PLAT_THREAD_SIG(job_thread_proc){ // with the cancel job routine, which may try to cancel this job // at the same time that we try to run it - i32 safe_running_thread =InterlockedCompareExchange(&full_job->running_thread, thread->id, THREAD_NOT_ASSIGNED); + i32 safe_running_thread = InterlockedCompareExchange(&full_job->running_thread, thread->id, THREAD_NOT_ASSIGNED); if (safe_running_thread == THREAD_NOT_ASSIGNED){ thread->job_id = full_job->id; diff --git a/platform_linux/linux_4ed.cpp b/platform_linux/linux_4ed.cpp index 5f1b9636..eeb46e71 100644 --- a/platform_linux/linux_4ed.cpp +++ b/platform_linux/linux_4ed.cpp @@ -89,6 +89,7 @@ LOGF("%s: " fmt "\n", __func__, ##__VA_ARGS__); \ } while (0) +// TODO(allen): Make an intrinsics header that uses the cracked OS to define a single set of intrinsic names. #define InterlockedCompareExchange(dest, ex, comp) \ __sync_val_compare_and_swap((dest), (comp), (ex)) diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index 2b70c6c8..8acb2416 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -48,11 +48,17 @@ #include #include +#include + //////////////////////////////// #include "4ed_shared_thread_constants.h" #include "unix_threading_wrapper.h" +// TODO(allen): Make an intrinsics header that uses the cracked OS to define a single set of intrinsic names. +#define InterlockedCompareExchange(dest, ex, comp) \ +__sync_val_compare_and_swap((dest), (comp), (ex)) + //////////////////////////////// #define SLASH '/' @@ -67,6 +73,8 @@ global System_Functions sysfunc; //////////////////////////////// +#include "osx_objective_c_to_cpp_links.h" +OSX_Vars osx; global Render_Target target; global Application_Memory memory_vars; global Plat_Settings plat_settings; @@ -79,15 +87,52 @@ global Coroutine_System_Auto_Alloc coroutines; //////////////////////////////// -#include "unix_4ed_functions.cpp" - -#include "osx_objective_c_to_cpp_links.h" -OSX_Vars osx; - -#include +#include "mac_error_box.cpp" //////////////////////////////// +#include "unix_4ed_functions.cpp" +#include "4ed_shared_file_handling.cpp" + +//////////////////////////////// + +internal void +system_schedule_step(){ + // NOTE(allen): It is unclear to me right now what we might need to actually do here. + // The run loop in a Cocoa app will keep rendering the app anyway, I might just need to set a + // "do_new_frame" variable of some kind to true here. +} + +//////////////////////////////// + +#include "4ed_work_queues.cpp" + +//////////////////////////////// + +// TODO(allen): add a "shown but auto-hides on timer" setting here. +internal +Sys_Show_Mouse_Cursor_Sig(system_show_mouse_cursor){ + // TODO(allen) +} + +internal +Sys_Set_Fullscreen_Sig(system_set_fullscreen){ + osx.do_toggle = (osx.full_screen != full_screen); + return(true); +} + +internal +Sys_Is_Fullscreen_Sig(system_is_fullscreen){ + b32 result = (osx.full_screen != osx.do_toggle); + return(result); +} + +// HACK(allen): Why does this work differently from the win32 version!? +internal +Sys_Send_Exit_Signal_Sig(system_send_exit_signal){ + osx.running = false; +} + #include "4ed_coroutine_functions.cpp" // @@ -107,8 +152,7 @@ Sys_Post_Clipboard_Sig(system_post_clipboard){ } memcpy(osx.clipboard_space, str.str, str.size); osx.clipboard_space[str.size] = 0; - string = osx.clipboard_space - ; + string = osx.clipboard_space; } osx_post_to_clipboard(string); } @@ -120,27 +164,27 @@ Sys_Post_Clipboard_Sig(system_post_clipboard){ internal Sys_CLI_Call_Sig(system_cli_call){ // b32 #(char *path, char *script_name, CLI_Handles *cli_out) - // TODO + NotImplemented; return(true); } internal Sys_CLI_Begin_Update_Sig(system_cli_begin_update){ // void #(CLI_Handles *cli) - // TODO + NotImplemented; } internal Sys_CLI_Update_Step_Sig(system_cli_update_step){ // b32 #(CLI_Handles *cli, char *dest, u32 max, u32 *amount) - // TODO + NotImplemented; return(0); } internal Sys_CLI_End_Update_Sig(system_cli_end_update){ // b32 #(CLI_Handles *cli) - // TODO + NotImplemented; return(false); } @@ -197,7 +241,7 @@ osx_init(){ // Memory init // - memset(&linuxvars, 0, sizeof(linuxvars)); + memset(&osx, 0, sizeof(osx)); memset(&target, 0, sizeof(target)); memset(&memory_vars, 0, sizeof(memory_vars)); memset(&plat_settings, 0, sizeof(plat_settings)); diff --git a/platform_mac/mac_4ed.m b/platform_mac/mac_4ed.m index 51bd8e3c..b9f9158b 100644 --- a/platform_mac/mac_4ed.m +++ b/platform_mac/mac_4ed.m @@ -38,6 +38,16 @@ osx_post_to_clipboard(char *str){ osx.just_posted_to_clipboard = true; } +void +osx_error_dialogue(char *str){ + NSAlert *alert = [[NSAlert alloc] init]; + [alert addButtonWithTitle:@"OK"]; + NSString *text = [NSString stringWithUTF8String:str]; + [alert setMessageText:text]; + [alert setAlertStyle:NSCriticalAlertStyle]; + [alert runModal]; +} + // // Entry point, OpenGL window setup. // diff --git a/platform_mac/mac_error_box.cpp b/platform_mac/mac_error_box.cpp new file mode 100644 index 00000000..88793746 --- /dev/null +++ b/platform_mac/mac_error_box.cpp @@ -0,0 +1,19 @@ +/* + * Mr. 4th Dimention - Allen Webster + * + * 26.09.2017 + * + * Mac error box implementation. + * + */ + +// TOP + +internal void +system_error_box(char *msg){ + osx_error_dialogue(msg); + exit(1); +} + +// BOTTOM + diff --git a/osx_objective_c_to_cpp_links.h b/platform_mac/osx_objective_c_to_cpp_links.h similarity index 93% rename from osx_objective_c_to_cpp_links.h rename to platform_mac/osx_objective_c_to_cpp_links.h index 91598f98..eb00b9d8 100644 --- a/osx_objective_c_to_cpp_links.h +++ b/platform_mac/osx_objective_c_to_cpp_links.h @@ -39,6 +39,9 @@ typedef struct OSX_Vars{ char *clipboard_space; umem clipboard_space_max; + + b32 full_screen; + b32 do_toggle; } OSX_Vars; // In C++ layer. @@ -69,6 +72,9 @@ osx_init(); external void osx_post_to_clipboard(char *str); +external void +osx_error_dialogue(char *str); + #endif // BOTTOM From 894479bfcaa12a41a006bf00227397479e3f0d65 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Tue, 26 Sep 2017 11:44:13 -0400 Subject: [PATCH 7/8] mostly wrapped up the mac init function, need to link free type properly, left lots of unimplemented stubs to work on --- platform_mac/mac_4ed.cpp | 35 ++++++++++-- platform_mac/mac_4ed.m | 2 + platform_mac/mac_4ed_file_track.cpp | 63 +++++++++++++++++++++ platform_mac/osx_objective_c_to_cpp_links.h | 3 + 4 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 platform_mac/mac_4ed_file_track.cpp diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index 8acb2416..040401c8 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -109,7 +109,6 @@ system_schedule_step(){ //////////////////////////////// -// TODO(allen): add a "shown but auto-hides on timer" setting here. internal Sys_Show_Mouse_Cursor_Sig(system_show_mouse_cursor){ // TODO(allen) @@ -241,7 +240,6 @@ osx_init(){ // Memory init // - memset(&osx, 0, sizeof(osx)); memset(&target, 0, sizeof(target)); memset(&memory_vars, 0, sizeof(memory_vars)); memset(&plat_settings, 0, sizeof(plat_settings)); @@ -275,7 +273,7 @@ osx_init(){ // Read command line // - read_command_line(argc, argv); + read_command_line(osx.argc, osx.argv); // // Threads @@ -289,8 +287,37 @@ osx_init(){ coroutines_init(); - // TODO + // + // Font System Init + // + + system_font_init(&sysfunc.font, 0, 0, plat_settings.font_size, plat_settings.use_hinting); + + // + // App Init + // + + char cwd[4096]; + u32 size = sysfunc.get_current_path(cwd, sizeof(cwd)); + if (size == 0 || size >= sizeof(cwd)){ + system_error_box("Could not get current directory at launch."); + } + String curdir = make_string(cwd, size); + terminate_with_null(&curdir); + replace_char(&curdir, '\\', '/'); + + String clipboard_string = {0}; + if (osx.has_clipboard_item){ + clipboard_string = make_string(osx.clipboard_data, osx.clipboard_size); + } + + LOG("Initializing application variables\n"); + app.init(&sysfunc, &target, &memory_vars, clipboard_string, curdir, custom_api); } +#include "4ed_shared_fonts.cpp" +#include "mac_4ed_file_track.cpp" +#include "4ed_font_static_functions.cpp" + // BOTTOM diff --git a/platform_mac/mac_4ed.m b/platform_mac/mac_4ed.m index b9f9158b..7b0540fc 100644 --- a/platform_mac/mac_4ed.m +++ b/platform_mac/mac_4ed.m @@ -291,6 +291,8 @@ main(int argc, char **argv){ umem clipboard_size = MB(4); osx.clipboard_data = osx_allocate(clipboard_size); osx.clipboard_max = clipboard_size; + osx.argc = argc; + osx.argv = argv; osx_init(); diff --git a/platform_mac/mac_4ed_file_track.cpp b/platform_mac/mac_4ed_file_track.cpp new file mode 100644 index 00000000..cbf3ba4e --- /dev/null +++ b/platform_mac/mac_4ed_file_track.cpp @@ -0,0 +1,63 @@ +/* + * Mr. 4th Dimention - Allen Webster + * + * 28.06.2017 + * + * Mac file tracking C++ wrapper. + * + */ + +// TOP + + +File_Track_Result +init_track_system(File_Track_System *system, Partition *scratch, void *table_memory, i32 table_memory_size, void *listener_memory, i32 listener_memory_size){ + File_Track_Result result = FileTrack_Good; + NotImplemented; + return(result); +} + +File_Track_Result +add_listener(File_Track_System *system, Partition *scratch, u8 *filename){ + File_Track_Result result = FileTrack_Good; + NotImplemented; + return(result); +} + +File_Track_Result +remove_listener(File_Track_System *system, Partition *scratch, u8 *filename){ + File_Track_Result result = FileTrack_Good; + NotImplemented; + return(result); +} + +File_Track_Result +move_track_system(File_Track_System *system, Partition *scratch, void *mem, i32 size){ + File_Track_Result result = FileTrack_Good; + NotImplemented; + return(result); +} + +File_Track_Result +expand_track_system_listeners(File_Track_System *system, Partition *scratch, void *mem, i32 size){ + File_Track_Result result = FileTrack_Good; + NotImplemented; + return(result); +} + +File_Track_Result +get_change_event(File_Track_System *system, Partition *scratch, u8 *buffer, i32 max, i32 *size){ + File_Track_Result result = FileTrack_Good; + NotImplemented; + return(result); +} + +File_Track_Result +shut_down_track_system(File_Track_System *system, Partition *scratch){ + File_Track_Result result = FileTrack_Good; + NotImplemented; + return(result); +} + +// BOTTOM + diff --git a/platform_mac/osx_objective_c_to_cpp_links.h b/platform_mac/osx_objective_c_to_cpp_links.h index eb00b9d8..25d5f994 100644 --- a/platform_mac/osx_objective_c_to_cpp_links.h +++ b/platform_mac/osx_objective_c_to_cpp_links.h @@ -42,6 +42,9 @@ typedef struct OSX_Vars{ b32 full_screen; b32 do_toggle; + + i32 argc; + char **argv; } OSX_Vars; // In C++ layer. From 2587feee0e332d445841de0b92c2636f8adc0616 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Tue, 31 Oct 2017 03:14:24 -0400 Subject: [PATCH 8/8] fixed crashes (hoping it's not a merge conflict) --- 4ed_file_view.cpp | 73 ++++++++----- platform_all/4ed_shared_library_constants.h | 2 +- platform_all/4ed_system_shared.cpp | 114 ++++++++++---------- 3 files changed, 106 insertions(+), 83 deletions(-) diff --git a/4ed_file_view.cpp b/4ed_file_view.cpp index 63ebfed6..843a840c 100644 --- a/4ed_file_view.cpp +++ b/4ed_file_view.cpp @@ -923,22 +923,30 @@ wrap_state_consume_token(System_Functions *system, Render_Font *font, Code_Wrap_ result.position_start = i; + Cpp_Token token = {0}; + + token.start = state->size; + if (state->token_ptr < state->end_token){ + token = *state->token_ptr; + } + if (state->consume_newline){ ++i; state->x = 0; state->consume_newline = 0; } + if (state->in_pp_body){ - if (!(state->token_ptr->flags & CPP_TFLAG_PP_BODY)){ - state->in_pp_body = 0; + if (!(token.flags & CPP_TFLAG_PP_BODY)){ + state->in_pp_body = false; state->wrap_x = state->plane_wrap_x; } } if (!state->in_pp_body){ - if (state->token_ptr->flags & CPP_TFLAG_PP_DIRECTIVE){ - state->in_pp_body = 1; + if (token.flags & CPP_TFLAG_PP_DIRECTIVE){ + state->in_pp_body = true; state->plane_wrap_x = state->wrap_x; state->wrap_x = null_wrap_x; } @@ -967,8 +975,7 @@ wrap_state_consume_token(System_Functions *system, Render_Font *font, Code_Wrap_ i32 line_start = state->line_starts[state->line_index]; b32 still_looping = 0; - i32 end = state->token_ptr->start + state->token_ptr->size; - + i32 end = token.start + token.size; if (fixed_end_point >= 0 && end > fixed_end_point){ end = fixed_end_point; } @@ -1015,7 +1022,7 @@ wrap_state_consume_token(System_Functions *system, Render_Font *font, Code_Wrap_ if (!skipping_whitespace){ if (!recorded_start_x){ result.start_x = state->x; - recorded_start_x = 1; + recorded_start_x = true; } state->x += adv; } @@ -1028,13 +1035,14 @@ wrap_state_consume_token(System_Functions *system, Render_Font *font, Code_Wrap_ state->i = i; - b32 consume_token = 0; - if (state->token_ptr < state->end_token && i >= state->token_ptr->start + state->token_ptr->size){ - consume_token = 1; + b32 consume_token = false; + if (state->token_ptr < state->end_token && i >= token.start + token.size){ + consume_token = true; } result.this_token = state->token_ptr; if (consume_token){ + Assert(state->token_ptr < state->end_token); switch (state->token_ptr->type){ case CPP_TOKEN_BRACE_OPEN: { @@ -1088,7 +1096,7 @@ wrap_state_consume_token(System_Functions *system, Render_Font *font, Code_Wrap_ if (!recorded_start_x){ result.start_x = state->x; - recorded_start_x = 1; + recorded_start_x = true; } return(result); @@ -1262,6 +1270,11 @@ get_current_shift(Code_Wrap_State *wrap_state, i32 next_line_start){ result.shift = wrap_state->wrap_x.paren_nesting[wrap_state->wrap_x.paren_safe_top]; + Cpp_Token next_token = {0}; + if (wrap_state->token_ptr < wrap_state->end_token){ + next_token = *wrap_state->token_ptr; + } + if (wrap_state->token_ptr > wrap_state->token_array.tokens){ Cpp_Token prev_token = *(wrap_state->token_ptr-1); @@ -1286,18 +1299,18 @@ get_current_shift(Code_Wrap_State *wrap_state, i32 next_line_start){ } } - switch (wrap_state->token_ptr->type){ + switch (next_token.type){ case CPP_TOKEN_BRACE_CLOSE: case CPP_TOKEN_BRACE_OPEN: break; default: result.shift += statement_continuation_indent; break; } } - if (wrap_state->token_ptr->start < next_line_start){ - if (wrap_state->token_ptr->flags & CPP_TFLAG_PP_DIRECTIVE){ + if (next_token.start < next_line_start){ + if (next_token.flags & CPP_TFLAG_PP_DIRECTIVE){ result.shift = 0; } else{ - switch (wrap_state->token_ptr->type){ + switch (next_token.type){ case CPP_TOKEN_BRACE_CLOSE: { if (wrap_state->wrap_x.paren_safe_top == 0){ @@ -1496,8 +1509,8 @@ file_measure_wraps(System_Functions *system, Models *models, Editing_File *file, for (; wrap_state.token_ptr < wrap_state.end_token; ){ Code_Wrap_Step step = {0}; - b32 emit_comment_position = 0; - b32 first_word = 1; + b32 emit_comment_position = false; + b32 first_word = true; if (wrap_state.token_ptr->type == CPP_TOKEN_COMMENT || wrap_state.token_ptr->type == CPP_TOKEN_STRING_CONSTANT){ i32 i = wrap_state.token_ptr->start; @@ -1626,29 +1639,39 @@ file_measure_wraps(System_Functions *system, Models *models, Editing_File *file, step = wrap_state_consume_token(system, font, &wrap_state, next_line_start); } - b32 need_to_choose_a_wrap = 0; + b32 need_to_choose_a_wrap = false; if (step.final_x > current_width){ - need_to_choose_a_wrap = 1; + need_to_choose_a_wrap = true; } current_shift = get_current_shift(&wrap_state, next_line_start); - b32 next_token_is_on_line = 0; - if (wrap_state.token_ptr->start < next_line_start){ - next_token_is_on_line = 1; + b32 next_token_is_on_line = false; + if (wrap_state.token_ptr < wrap_state.end_token){ + if (wrap_state.token_ptr->start < next_line_start){ + next_token_is_on_line = true; + } } i32 next_wrap_position = step.position_end; f32 wrap_x = step.final_x; - if (wrap_state.token_ptr->start > step.position_start && next_wrap_position < wrap_state.token_ptr->start && next_token_is_on_line){ - next_wrap_position = wrap_state.token_ptr->start; + if (next_token_is_on_line){ + if (wrap_state.token_ptr < wrap_state.end_token){ + i32 pos_i = wrap_state.token_ptr->start; + if (pos_i > step.position_start && next_wrap_position < pos_i){ + next_wrap_position = pos_i; + } + } } if (!need_to_choose_a_wrap){ i32 wrappable_score = 1; Cpp_Token *this_token = step.this_token; - Cpp_Token *next_token = wrap_state.token_ptr; + Cpp_Token *next_token = 0; + if (wrap_state.token_ptr < wrap_state.end_token){ + next_token = wrap_state.token_ptr; + } Cpp_Token_Type this_type = this_token->type; Cpp_Token_Type next_type = CPP_TOKEN_JUNK; diff --git a/platform_all/4ed_shared_library_constants.h b/platform_all/4ed_shared_library_constants.h index 0b4b07f5..2ca59a3b 100644 --- a/platform_all/4ed_shared_library_constants.h +++ b/platform_all/4ed_shared_library_constants.h @@ -42,7 +42,7 @@ system_load_library(Library *library, char *name, Load_Library_Location location if (!match(extension, DLL)){ String full_name = make_fixed_width_string(space); append(&full_name, name); - append(&full_name, "."DLL); + append(&full_name, "." DLL); if (terminate_with_null(&full_name)){ name = space; } diff --git a/platform_all/4ed_system_shared.cpp b/platform_all/4ed_system_shared.cpp index bb5d502d..955147f2 100644 --- a/platform_all/4ed_system_shared.cpp +++ b/platform_all/4ed_system_shared.cpp @@ -227,18 +227,18 @@ sysshared_to_binary_path(String *out_filename, char *filename){ // inline void -draw_safe_push(Render_Target *target, i32 size, void *x){ - if (size + target->size <= target->max){ - memcpy(target->push_buffer + target->size, x, size); - target->size += size; +draw_safe_push(Render_Target *t, i32 size, void *x){ + if (size + t->size <= t->max){ + memcpy(t->push_buffer + t->size, x, size); + t->size += size; } } -#define PutStruct(s,x) draw_safe_push(target, sizeof(s), &x) +#define PutStruct(s,x) draw_safe_push(t, sizeof(s), &x) internal void -draw_push_piece(Render_Target *target, Render_Piece_Combined piece){ - if (!target->clip_all){ +draw_push_piece(Render_Target *t, Render_Piece_Combined piece){ + if (!t->clip_all){ PutStruct(Render_Piece_Header, piece.header); switch (piece.header.type){ @@ -263,13 +263,13 @@ draw_push_piece(Render_Target *target, Render_Piece_Combined piece){ }break; } - Assert(target->size <= target->max); + Assert(t->size <= t->max); } } internal void -draw_push_piece_clip(Render_Target *target, i32_Rect clip_box){ - if (!target->clip_all){ +draw_push_piece_clip(Render_Target *t, i32_Rect clip_box){ + if (!t->clip_all){ // TODO(allen): optimize out if there are two clip box changes in a row Render_Piece_Change_Clip clip; Render_Piece_Header header; @@ -283,24 +283,24 @@ draw_push_piece_clip(Render_Target *target, i32_Rect clip_box){ } internal void -draw_push_clip(Render_Target *target, i32_Rect clip_box){ - Assert(target->clip_top == -1 || fits_inside(clip_box, target->clip_boxes[target->clip_top])); - Assert(target->clip_top+1 < ArrayCount(target->clip_boxes)); - target->clip_boxes[++target->clip_top] = clip_box; +draw_push_clip(Render_Target *t, i32_Rect clip_box){ + Assert(t->clip_top == -1 || fits_inside(clip_box, t->clip_boxes[t->clip_top])); + Assert(t->clip_top+1 < ArrayCount(t->clip_boxes)); + t->clip_boxes[++t->clip_top] = clip_box; - target->clip_all = (clip_box.x0 >= clip_box.x1 || clip_box.y0 >= clip_box.y1); - draw_push_piece_clip(target, clip_box); + t->clip_all = (clip_box.x0 >= clip_box.x1 || clip_box.y0 >= clip_box.y1); + draw_push_piece_clip(t, clip_box); } internal i32_Rect -draw_pop_clip(Render_Target *target){ - Assert(target->clip_top > 0); - i32_Rect result = target->clip_boxes[target->clip_top]; - --target->clip_top; - i32_Rect clip_box = target->clip_boxes[target->clip_top]; +draw_pop_clip(Render_Target *t){ + Assert(t->clip_top > 0); + i32_Rect result = t->clip_boxes[t->clip_top]; + --t->clip_top; + i32_Rect clip_box = t->clip_boxes[t->clip_top]; - target->clip_all = (clip_box.x0 >= clip_box.x1 || clip_box.y0 >= clip_box.y1); - draw_push_piece_clip(target, clip_box); + t->clip_all = (clip_box.x0 >= clip_box.x1 || clip_box.y0 >= clip_box.y1); + draw_push_piece_clip(t, clip_box); return(result); } @@ -319,31 +319,31 @@ link_rendering(){ #define ExtractStruct(s) ((s*)cursor); cursor += sizeof(s) inline void -draw_set_clip(Render_Target *target, i32_Rect clip_box){ - glScissor(clip_box.x0, target->height - clip_box.y1, clip_box.x1 - clip_box.x0, clip_box.y1 - clip_box.y0); +draw_set_clip(Render_Target *t, i32_Rect clip_box){ + glScissor(clip_box.x0, t->height - clip_box.y1, clip_box.x1 - clip_box.x0, clip_box.y1 - clip_box.y0); } inline void -draw_bind_texture(Render_Target *target, i32 texid){ - if (target->bound_texture != texid){ +draw_bind_texture(Render_Target *t, i32 texid){ + if (t->bound_texture != texid){ glBindTexture(GL_TEXTURE_2D, texid); - target->bound_texture = texid; + t->bound_texture = texid; } } inline void -draw_set_color(Render_Target *target, u32 color){ - if (target->color != color){ - target->color = color; +draw_set_color(Render_Target *t, u32 color){ + if (t->color != color){ + t->color = color; Vec4 c = unpack_color4(color); glColor4f(c.r, c.g, c.b, c.a); } } inline void -private_draw_rectangle(Render_Target *target, f32_Rect rect, u32 color){ - draw_set_color(target, color); - draw_bind_texture(target, 0); +private_draw_rectangle(Render_Target *t, f32_Rect rect, u32 color){ + draw_set_color(t, color); + draw_bind_texture(t, 0); glBegin(GL_QUADS); { glVertex2f(rect.x0, rect.y0); @@ -355,10 +355,10 @@ private_draw_rectangle(Render_Target *target, f32_Rect rect, u32 color){ } inline void -private_draw_rectangle_outline(Render_Target *target, f32_Rect rect, u32 color){ +private_draw_rectangle_outline(Render_Target *t, f32_Rect rect, u32 color){ f32_Rect r = get_inner_rect(rect, .5f); - draw_set_color(target, color); - draw_bind_texture(target, 0); + draw_set_color(t, color); + draw_bind_texture(t, 0); glBegin(GL_LINE_STRIP); { glVertex2f(r.x0, r.y0); @@ -371,11 +371,11 @@ private_draw_rectangle_outline(Render_Target *target, f32_Rect rect, u32 color){ } inline void -private_draw_gradient(Render_Target *target, f32_Rect rect, Vec4 color_left, Vec4 color_right){ +private_draw_gradient(Render_Target *t, f32_Rect rect, Vec4 color_left, Vec4 color_right){ Vec4 cl = color_left; Vec4 cr = color_right; - draw_bind_texture(target, 0); + draw_bind_texture(t, 0); glBegin(GL_QUADS); { glColor4f(cl.r, cl.g, cl.b, cl.a); @@ -433,13 +433,13 @@ get_exact_render_quad(Glyph_Bounds *b, i32 pw, i32 ph, float xpos, float ypos){ } inline void -private_draw_glyph(System_Functions *system, Render_Target *target, Render_Font *font, u32 codepoint, f32 x, f32 y, u32 color){ +private_draw_glyph(System_Functions *system, Render_Target *t, Render_Font *font, u32 codepoint, f32 x, f32 y, u32 color){ Glyph_Data glyph = font_get_glyph(system, font, codepoint); if (glyph.tex != 0){ Render_Quad q = get_render_quad(&glyph.bounds, glyph.tex_width, glyph.tex_height, x, y); - draw_set_color(target, color); - draw_bind_texture(target, glyph.tex); + draw_set_color(t, color); + draw_bind_texture(t, glyph.tex); glBegin(GL_QUADS); { glTexCoord2f(q.s0, q.t1); glVertex2f(q.x0, q.y1); @@ -452,7 +452,7 @@ private_draw_glyph(System_Functions *system, Render_Target *target, Render_Font } inline void -private_draw_glyph_mono(System_Functions *system, Render_Target *target, Render_Font *font, u32 codepoint, f32 x, f32 y, f32 advance, u32 color){ +private_draw_glyph_mono(System_Functions *system, Render_Target *t, Render_Font *font, u32 codepoint, f32 x, f32 y, f32 advance, u32 color){ Glyph_Data glyph = font_get_glyph(system, font, codepoint); if (glyph.tex != 0){ f32 left = glyph.bounds.x0; @@ -464,8 +464,8 @@ private_draw_glyph_mono(System_Functions *system, Render_Target *target, Render_ Render_Quad q = get_exact_render_quad(&glyph.bounds, glyph.tex_width, glyph.tex_height, x, y); - draw_set_color(target, color); - draw_bind_texture(target, glyph.tex); + draw_set_color(t, color); + draw_bind_texture(t, glyph.tex); glBegin(GL_QUADS); { glTexCoord2f(q.s0, q.t1); glVertex2f(q.x0, q.y1); @@ -478,15 +478,15 @@ private_draw_glyph_mono(System_Functions *system, Render_Target *target, Render_ } inline void -private_draw_glyph_mono(System_Functions *system, Render_Target *target, Render_Font *font, u32 character, f32 x, f32 y, u32 color){ +private_draw_glyph_mono(System_Functions *system, Render_Target *t, Render_Font *font, u32 character, f32 x, f32 y, u32 color){ f32 advance = (f32)font_get_advance(font); - private_draw_glyph_mono(system, target, font, character, x, y, advance, color); + private_draw_glyph_mono(system, t, font, character, x, y, advance, color); } internal void -launch_rendering(System_Functions *system, Render_Target *target){ - char *cursor = target->push_buffer; - char *cursor_end = cursor + target->size; +launch_rendering(System_Functions *system, Render_Target *t){ + char *cursor = t->push_buffer; + char *cursor_end = cursor + t->size; for (; cursor < cursor_end;){ Render_Piece_Header *header = ExtractStruct(Render_Piece_Header); @@ -496,19 +496,19 @@ launch_rendering(System_Functions *system, Render_Target *target){ case piece_type_rectangle: { Render_Piece_Rectangle *rectangle = ExtractStruct(Render_Piece_Rectangle); - private_draw_rectangle(target, rectangle->rect, rectangle->color); + private_draw_rectangle(t, rectangle->rect, rectangle->color); }break; case piece_type_outline: { Render_Piece_Rectangle *rectangle = ExtractStruct(Render_Piece_Rectangle); - private_draw_rectangle_outline(target, rectangle->rect, rectangle->color); + private_draw_rectangle_outline(t, rectangle->rect, rectangle->color); }break; case piece_type_gradient: { Render_Piece_Gradient *gradient = ExtractStruct(Render_Piece_Gradient); - private_draw_gradient(target, gradient->rect, unpack_color4(gradient->left_color), unpack_color4(gradient->right_color)); + private_draw_gradient(t, gradient->rect, unpack_color4(gradient->left_color), unpack_color4(gradient->right_color)); }break; case piece_type_glyph: @@ -517,7 +517,7 @@ launch_rendering(System_Functions *system, Render_Target *target){ Render_Font *font = system->font.get_render_data_by_id(glyph->font_id); Assert(font != 0); - private_draw_glyph(system, target, font, glyph->codepoint, glyph->pos.x, glyph->pos.y, glyph->color); + private_draw_glyph(system, t, font, glyph->codepoint, glyph->pos.x, glyph->pos.y, glyph->color); }break; case piece_type_mono_glyph: @@ -526,7 +526,7 @@ launch_rendering(System_Functions *system, Render_Target *target){ Render_Font *font = system->font.get_render_data_by_id(glyph->font_id); Assert(font != 0); - private_draw_glyph_mono(system, target, font, glyph->codepoint, glyph->pos.x, glyph->pos.y, glyph->color); + private_draw_glyph_mono(system, t, font, glyph->codepoint, glyph->pos.x, glyph->pos.y, glyph->color); }break; case piece_type_mono_glyph_advance: @@ -535,13 +535,13 @@ launch_rendering(System_Functions *system, Render_Target *target){ Render_Font *font = system->font.get_render_data_by_id(glyph->font_id); Assert(font != 0); - private_draw_glyph_mono(system, target, font, glyph->codepoint, glyph->pos.x, glyph->pos.y, glyph->advance, glyph->color); + private_draw_glyph_mono(system, t, font, glyph->codepoint, glyph->pos.x, glyph->pos.y, glyph->advance, glyph->color); }break; case piece_type_change_clip: { Render_Piece_Change_Clip *clip = ExtractStruct(Render_Piece_Change_Clip); - draw_set_clip(target, clip->box); + draw_set_clip(t, clip->box); }break; } }