From ede9083e719c8c3deed5ec576d045bb28effceb2 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Mon, 27 Nov 2017 12:14:59 -0500 Subject: [PATCH] Big pastes on Mac --- platform_mac/mac_4ed.m | 15 +++++++++++---- platform_mac/osx_objective_c_to_cpp_links.h | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/platform_mac/mac_4ed.m b/platform_mac/mac_4ed.m index 7ee6f6ed..e7447046 100644 --- a/platform_mac/mac_4ed.m +++ b/platform_mac/mac_4ed.m @@ -185,10 +185,17 @@ static i32 did_update_for_clipboard = true; if (data != nil){ u32 copy_length = data.length; if (copy_length > 0){ - // TODO(allen): Grow clipboard memory if needed. - if (copy_length+1 < osx_objc.clipboard_max){ + if (copy_length + 1 >= osx_objc.clipboard_max){ + osx_free(osx_objc.clipboard_data, osx_objc.clipboard_max); + osx_objc.clipboard_max = l_round_up_u32(copy_length + 1, KB(4)); + osx_objc.clipboard_data = osx_allocate(osx_objc.clipboard_max); + } + + if (copy_length + 1 < osx_objc.clipboard_max){ osx_objc.clipboard_size = copy_length; - [data getBytes: osx_objc.clipboard_data length: copy_length]; + [data + getBytes: osx_objc.clipboard_data + length: copy_length]; ((char*)osx_objc.clipboard_data)[copy_length] = 0; osx_objc.has_clipboard_item = true; } @@ -828,7 +835,7 @@ int main(int argc, char **argv){ memset(&osx_objc, 0, sizeof(osx_objc)); - umem clipboard_size = MB(4); + u32 clipboard_size = KB(16); osx_objc.clipboard_data = osx_allocate(clipboard_size); osx_objc.clipboard_max = clipboard_size; osx_objc.argc = argc; diff --git a/platform_mac/osx_objective_c_to_cpp_links.h b/platform_mac/osx_objective_c_to_cpp_links.h index 92f9f5f9..8fbb10dd 100644 --- a/platform_mac/osx_objective_c_to_cpp_links.h +++ b/platform_mac/osx_objective_c_to_cpp_links.h @@ -43,7 +43,8 @@ typedef struct OSX_Objective_C_Vars{ u32 prev_clipboard_change_count; b32 has_clipboard_item; void *clipboard_data; - umem clipboard_size, clipboard_max; + u32 clipboard_size; + u32 clipboard_max; b32 just_posted_to_clipboard; char *clipboard_space;