From 9ed2af1cb7a58f9286c5bc833d95d45b0b603296 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Wed, 24 Feb 2016 11:58:02 -0500 Subject: [PATCH] a3.4.2 version --- 4coder_custom.cpp | 6 +++--- 4coder_custom.h | 18 +++++++++--------- 4ed.cpp | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/4coder_custom.cpp b/4coder_custom.cpp index 33080f27..84de61ab 100644 --- a/4coder_custom.cpp +++ b/4coder_custom.cpp @@ -109,7 +109,7 @@ CUSTOM_COMMAND_SIG(open_long_braces){ File_View_Summary view; Buffer_Summary buffer; - view = app->get_active_view(cmd_context); + view = app->get_active_file_view(cmd_context); if (view.exists){ buffer = app->get_active_buffer(cmd_context); @@ -134,7 +134,7 @@ CUSTOM_COMMAND_SIG(ifdef_off){ File_View_Summary view; Buffer_Summary buffer; - view = app->get_active_view(cmd_context); + view = app->get_active_file_view(cmd_context); if (view.exists){ buffer = app->get_active_buffer(cmd_context); @@ -158,7 +158,7 @@ CUSTOM_COMMAND_SIG(ifdef_off){ exec_command(cmd_context, cmdid_auto_tab_range); - app->refresh_view(cmd_context, &view); + app->refresh_file_view(cmd_context, &view); c = view.cursor.pos; m = view.mark.pos; pos = (c>m)?(c):(m); diff --git a/4coder_custom.h b/4coder_custom.h index 533ec527..c85d7907 100644 --- a/4coder_custom.h +++ b/4coder_custom.h @@ -295,10 +295,10 @@ extern "C"{ // File view manipulation #define GET_VIEW_MAX_INDEX_SIG(name) int name(void *cmd_context) -#define GET_VIEW_SIG(name) File_View_Summary name(void *cmd_context, int index) -#define GET_ACTIVE_VIEW_SIG(name) File_View_Summary name(void *cmd_context) +#define GET_FILE_VIEW_SIG(name) File_View_Summary name(void *cmd_context, int index) +#define GET_ACTIVE_FILE_VIEW_SIG(name) File_View_Summary name(void *cmd_context) -#define REFRESH_VIEW_SIG(name) int name(void *cmd_context, File_View_Summary *view) +#define REFRESH_FILE_VIEW_SIG(name) int name(void *cmd_context, File_View_Summary *view) #define VIEW_SET_CURSOR_SIG(name) int name(void *cmd_context, File_View_Summary *view, Buffer_Seek seek, int set_preferred_x) #define VIEW_SET_MARK_SIG(name) int name(void *cmd_context, File_View_Summary *view, Buffer_Seek seek) #define VIEW_SET_FILE_SIG(name) int name(void *cmd_context, File_View_Summary *view, int file_id) @@ -328,10 +328,10 @@ extern "C"{ // View manipulation typedef GET_VIEW_MAX_INDEX_SIG(Get_View_Max_Index_Function); - typedef GET_VIEW_SIG(Get_View_Function); - typedef GET_ACTIVE_VIEW_SIG(Get_Active_View_Function); + typedef GET_FILE_VIEW_SIG(Get_File_View_Function); + typedef GET_ACTIVE_FILE_VIEW_SIG(Get_Active_File_View_Function); - typedef REFRESH_VIEW_SIG(Refresh_View_Function); + typedef REFRESH_FILE_VIEW_SIG(Refresh_File_View_Function); typedef VIEW_SET_CURSOR_SIG(View_Set_Cursor_Function); typedef VIEW_SET_MARK_SIG(View_Set_Mark_Function); typedef VIEW_SET_FILE_SIG(View_Set_File_Function); @@ -362,10 +362,10 @@ struct Application_Links{ // View manipulation Get_View_Max_Index_Function *get_view_max_index; - Get_View_Function *get_view; - Get_Active_View_Function *get_active_view; + Get_File_View_Function *get_file_view; + Get_Active_File_View_Function *get_active_file_view; - Refresh_View_Function *refresh_view; + Refresh_File_View_Function *refresh_file_view; View_Set_Cursor_Function *view_set_cursor; View_Set_Mark_Function *view_set_mark; View_Set_File_Function *view_set_file; diff --git a/4ed.cpp b/4ed.cpp index 8d14992f..2c7b76ba 100644 --- a/4ed.cpp +++ b/4ed.cpp @@ -2291,7 +2291,7 @@ extern "C"{ return(max); } - GET_VIEW_SIG(external_get_view){ + GET_FILE_VIEW_SIG(external_get_file_view){ Command_Data *cmd = (Command_Data*)cmd_context; Live_Views *live_set = cmd->live_set; int max = live_set->max; @@ -2310,7 +2310,7 @@ extern "C"{ return(view); } - GET_ACTIVE_VIEW_SIG(external_get_active_view){ + GET_ACTIVE_FILE_VIEW_SIG(external_get_active_file_view){ Command_Data *cmd = (Command_Data*)cmd_context; File_View_Summary view = {}; File_View *file_view; @@ -2323,9 +2323,9 @@ extern "C"{ return(view); } - REFRESH_VIEW_SIG(external_refresh_view){ + REFRESH_FILE_VIEW_SIG(external_refresh_file_view){ int result; - *view = external_get_view(cmd_context, view->view_id); + *view = external_get_file_view(cmd_context, view->view_id); result = view->exists; return(result); } @@ -2436,10 +2436,10 @@ app_links_init(System_Functions *system){ app_links.buffer_replace_range = external_buffer_replace_range; app_links.get_view_max_index = external_get_view_max_index; - app_links.get_view = external_get_view; - app_links.get_active_view = external_get_active_view; + app_links.get_file_view = external_get_file_view; + app_links.get_active_file_view = external_get_active_file_view; - app_links.refresh_view = external_refresh_view; + app_links.refresh_file_view = external_refresh_file_view; app_links.view_set_cursor = external_view_set_cursor; app_links.view_set_mark = external_view_set_mark; app_links.view_set_file = external_view_set_file;