mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

got file loading working without exchange system

master
Allen Webster 2016-05-28 18:12:27 -04:00
parent 4f55fca356
commit d5a07a9732
5 changed files with 133 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
4ed.cpp
View File

@ -36,15 +36,6 @@ struct CLI_List{
#define SysAppCreateView 0x1
#define SysAppCreateNewBuffer 0x2
struct Sys_App_Binding{
i32 sys_id;
i32 app_id;
u32 success;
u32 fail;
Panel *panel;
};
struct Complete_State{
Search_Set set;
Search_Iter iter;
@ -75,9 +66,6 @@ struct App_Vars{
CLI_List cli_processes;
Sys_App_Binding *sys_app_bindings;
i32 sys_app_count, sys_app_max;
Live_Views live_set;
App_State state;
@ -85,9 +73,6 @@ struct App_Vars{
Complete_State complete_state;
Command_Data command_data;
File_Slot slots[32];
char filename_space[32 * FileNameMax];
};
enum Coroutine_Type{
@ -815,23 +800,6 @@ COMMAND_DECL(interactive_new){
IAct_New, IInt_Sys_File_List, make_lit_string("New: "));
}
internal Sys_App_Binding*
app_push_file_binding(App_Vars *vars, int sys_id, int app_id){
Sys_App_Binding *binding;
Assert(vars->sys_app_count < vars->sys_app_max);
binding = vars->sys_app_bindings + vars->sys_app_count++;
binding->sys_id = sys_id;
binding->app_id = app_id;
return(binding);
}
struct App_Open_File_Result{
Editing_File *file;
i32 sys_id;
i32 file_index;
b32 is_new;
};
COMMAND_DECL(interactive_open){
USE_MODELS(models);
@ -908,30 +876,53 @@ view_file_in_panel(Command_Data *cmd, Panel *panel, Editing_File *file){
panel->view->map = get_map(models, file->settings.base_map_id);
}
internal void
init_normal_file(System_Functions *system, Models *models, Editing_File *file,
char *buffer, i32 size){
General_Memory *general = &models->mem.general;
String val = make_string(buffer, size);
file_create_from_string(system, models, file, file->name.source_path.str, val);
if (file->settings.tokens_exist){
file_first_lex_parallel(system, general, file);
}
for (View_Iter iter = file_view_iter_init(&models->layout, file, 0);
file_view_iter_good(iter);
iter = file_view_iter_next(iter)){
view_measure_wraps(general, iter.view);
}
}
// TODO(allen): Improvements to reopen
// - Preserve existing token stack
// - Keep current version open and do some sort of diff to keep
// the cursor position correct
COMMAND_DECL(reopen){
USE_VARS(vars);
USE_MODELS(models);
USE_VIEW(view);
REQ_FILE(file, view);
if (match(file->name.source_path, file->name.live_name)) return;
i32 file_id = exchange_request_file(&models->files, expand_str(file->name.source_path));
i32 index = 0;
if (file_id){
file_set_to_loading(file);
index = file->id.id;
app_push_file_binding(vars, file_id, index);
view_set_file(view, file, models);
view_show_file(view);
}
else{
do_feedback_message(system, models, make_lit_string("ERROR: no file load slot available\n"));
File_Loading loading = system->file_load_begin(file->name.source_path.str);
if (loading.exists){
Partition *part = &models->mem.part;
Temp_Memory temp = begin_temp_memory(part);
char *buffer = push_array(part, char, loading.size);
if (system->file_load_end(loading, buffer)){
General_Memory *general = &models->mem.general;
file_close(system, general, file);
init_normal_file(system, models, file, buffer, loading.size);
}
end_temp_memory(temp);
}
}
@ -963,9 +954,6 @@ COMMAND_DECL(save){
}
}
#if 0
#endif
if (buffer_id != -1){
file = working_set_get_active_file(&models->working_set, buffer_id);
}
@ -3214,41 +3202,6 @@ App_Init_Sig(app_init){
partition = &models->mem.part;
target->partition = partition;
{
File_Exchange *files = &models->files;
File_Slot *slots = vars->slots;
i32 max = ArrayCount(vars->slots);
{
char *filename_space;
i32 i;
files->max = max;
files->available = file_slot_zero();
files->available.next = &files->available;
files->available.prev = &files->available;
files->active = file_slot_zero();
files->active.next = &files->active;
files->active.prev = &files->active;
files->free_list = file_slot_zero();
files->free_list.next = &files->free_list;
files->free_list.prev = &files->free_list;
files->files = slots;
memset(slots, 0, sizeof(File_Slot)*max);
filename_space = vars->filename_space;
File_Slot *slot = slots;
for (i = 0; i < files->max; ++i, ++slot){
ex__file_insert(&files->available, slot);
slot->filename = filename_space;
filename_space += FileNameMax;
}
}
}
{
i32 i;
@ -3559,11 +3512,6 @@ App_Init_Sig(app_init){
vars->cli_processes.max = max_children;
vars->cli_processes.count = 0;
// NOTE(allen): sys app binding setup
vars->sys_app_max = models->files.max;
vars->sys_app_count = 0;
vars->sys_app_bindings = (Sys_App_Binding*)push_array(partition, Sys_App_Binding, vars->sys_app_max);
// NOTE(allen): parameter setup
models->buffer_param_max = 1;
models->buffer_param_count = 0;
@ -4425,6 +4373,7 @@ App_Step_Sig(app_step){
Temp_Memory file_temp = begin_temp_memory(&models->mem.part);
#if 0
// NOTE(allen): Simulate what use to happen on the system side
// for processing file exchange.
{
@ -4490,7 +4439,7 @@ App_Step_Sig(app_step){
ex__check(files);
}
// NOTE(allen): processing sys app bindings
{
File_Exchange *files = &models->files;
@ -4582,27 +4531,28 @@ App_Step_Sig(app_step){
}
}
}
#endif
end_temp_memory(file_temp);
// NOTE(allen): process as many delayed actions as possible
if (models->delay1.count > 0){
File_Exchange *files = &models->files;
Working_Set *working_set = &models->working_set;
Mem_Options *mem = &models->mem;
General_Memory *general = &mem->general;
Partition *part = &mem->part;
i32 count = models->delay1.count;
models->delay1.count = 0;
models->delay2.count = 0;
Delayed_Action *act = models->delay1.acts;
for (i32 i = 0; i < count; ++i, ++act){
String string = act->string;
Panel *panel = act->panel;
Editing_File *file = act->file;
i32 integer = act->integer;
// TODO(allen): Paramter checking in each DACT case.
switch (act->type){
case DACT_TOUCH_FILE:
@ -4611,18 +4561,49 @@ App_Step_Sig(app_step){
touch_file(working_set, file);
}
}break;
case DACT_OPEN:
case DACT_OPEN_BACKGROUND:
{
App_Open_File_Result result = {};
String filename = string;
Editing_File *file = working_set_contains(system, working_set, filename);
if (file == 0){
File_Loading loading = system->file_load_begin(filename.str);
if (loading.exists){
Temp_Memory temp = begin_temp_memory(part);
char *buffer = push_array(part, char, loading.size);
if (system->file_load_end(loading, buffer)){
file = working_set_alloc_always(working_set, general);
if (file){
file_init_strings(file);
file_set_name(working_set, file, filename.str);
working_set_add(system, working_set, file, general);
init_normal_file(system, models, file,
buffer, loading.size);
}
}
end_temp_memory(temp);
}
}
if (file){
if (act->type == DACT_OPEN){
view_file_in_panel(cmd, panel, file);
}
}
#if 0
{
String filename = string;
i32 file_id;
result.file = working_set_contains(system, working_set, filename);
if (result.file == 0){
result.is_new = 1;
result.file = working_set_alloc_always(working_set, general);
if (result.file){
file_id = exchange_request_file(files, filename.str, filename.size);
@ -4643,7 +4624,7 @@ App_Step_Sig(app_step){
}
}
}
if (result.is_new){
if (result.file){
Assert(result.sys_id);
@ -4661,6 +4642,7 @@ App_Step_Sig(app_step){
}
}
}
#endif
}break;
case DACT_SET_LINE:
@ -4686,6 +4668,7 @@ App_Step_Sig(app_step){
case DACT_SAVE:
case DACT_SAVE_AS:
{
#if 0
if (!file){
if (panel){
View *view = panel->view;
@ -4712,6 +4695,7 @@ App_Step_Sig(app_step){
delayed_action_repush(&models->delay2, act);
}
}
#endif
}break;
case DACT_NEW:

2
4ed_app_models.h
View File

@ -65,7 +65,9 @@ struct Models{
Custom_API config_api;
Scroll_Rule_Function *scroll_rule;
#if 0
File_Exchange files;
#endif
};
// BOTTOM

18
4ed_exchange.cpp
View File

@ -9,6 +9,7 @@
// TOP
#if 0
enum File_Exchange_Flag{
FEx_Request = 0x1,
FEx_Ready = 0x2,
@ -18,6 +19,22 @@ enum File_Exchange_Flag{
FEx_Save_Failed = 0x20
};
#define FileNameMax (1 << 9)
struct File_Slot{
File_Slot *next, *prev;
byte *data;
i32 size, max;
char *filename;
i32 filename_len;
u32 flags;
};
inline File_Slot
file_slot_zero(){
File_Slot slot={0};
return(slot);
}
struct File_Exchange{
File_Slot available, active, free_list;
File_Slot *files;
@ -237,6 +254,7 @@ exchange_clear_file(File_Exchange *files, i32 file_id){
ex__clear(file);
}
}
#endif
internal b32
queue_job_is_pending(Work_Queue *queue, u32 job_id){

66
4ed_file_view.cpp
View File

@ -436,45 +436,48 @@ file_synchronize_times(System_Functions *system, Editing_File *file, char *filen
}
internal i32
file_save(System_Functions *system, File_Exchange *files, Mem_Options *mem,
Editing_File *file, char *filename){
file_save(System_Functions *system, Mem_Options *mem, Editing_File *file, char *filename){
i32 result = 0;
i32 max, size;
b32 dos_write_mode = file->settings.dos_write_mode;
char *data;
Buffer_Type *buffer = &file->state.buffer;
if (dos_write_mode)
if (dos_write_mode){
max = buffer_size(buffer) + buffer->line_count + 1;
else
max = buffer_size(buffer);
data = (char*)general_memory_allocate(&mem->general, max, 0);
Assert(data);
if (dos_write_mode)
size = buffer_convert_out(buffer, data, max);
else
buffer_stringify(buffer, 0, size = max, data);
result = exchange_save_file(files, filename, str_size(filename), (byte*)data, size, max);
if (result == 0){
general_memory_free(&mem->general, data);
}
else{
max = buffer_size(buffer);
}
Temp_Memory temp = begin_temp_memory(&mem->part);
data = (char*)push_array(&mem->part, char, max);
Assert(data);
if (dos_write_mode){
size = buffer_convert_out(buffer, data, max);
}
else{
size = max;
buffer_stringify(buffer, 0, size, data);
}
result = system->file_save(filename, data, size);
file_synchronize_times(system, file, filename);
end_temp_memory(temp);
return(result);
}
inline b32
file_save_and_set_names(System_Functions *system, File_Exchange *files,
Mem_Options *mem, Working_Set *working_set, Editing_File *file,
file_save_and_set_names(System_Functions *system, Mem_Options *mem,
Working_Set *working_set, Editing_File *file,
char *filename){
b32 result = 0;
result = file_save(system, files, mem, file, filename);
result = file_save(system, mem, file, filename);
if (result){
file_set_name(working_set, file, filename);
}
@ -731,17 +734,6 @@ file_create_from_string(System_Functions *system, Models *models,
open_hook(&models->app_links);
models->buffer_param_count = 0;
file->settings.is_initialized = 1;
#if 0
if (file){
if (open_hook && file->settings.is_initialized == 0){
models->buffer_param_indices[models->buffer_param_count++] = file->id.id;
open_hook(app);
models->buffer_param_count = 0;
file->settings.is_initialized = 1;
}
}
#endif
}
internal b32
@ -892,9 +884,9 @@ file_first_lex_parallel(System_Functions *system,
job.data[1] = general;
job.memory_request = Kbytes(64);
file->state.lex_job = system->post_job(BACKGROUND_THREADS, job);
#endif
}
}
#endif
internal void
file_relex_parallel(System_Functions *system,

20
4ed_system.h
View File

@ -266,31 +266,17 @@ struct System_Functions{
char slash;
};
#define FileNameMax (1 << 9)
struct File_Slot{
File_Slot *next, *prev;
byte *data;
i32 size, max;
char *filename;
i32 filename_len;
u32 flags;
};
inline File_Slot
file_slot_zero(){
File_Slot slot={0};
return(slot);
}
#if 0
struct Write_Event{
Write_Event *next, *prev;
String filename;
u64 time_stamp;
};
#endif
struct Exchange{
Thread_Exchange thread;
Write_Event write_event_sentinel;
// Write_Event write_event_sentinel;
};
// BOTTOM