ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed 'touch' from the dact system

This commit is contained in:
Allen Webster 2016-05-29 16:50:07 -04:00
parent 37e0b17e7c
commit cd6614b215
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
4ed.cpp
View File

@ -4312,13 +4312,12 @@ App_Step_Sig(app_step){
// TODO(allen): Paramter checking in each DACT case. // TODO(allen): Paramter checking in each DACT case.
switch (act->type){ switch (act->type){
#if 0
case DACT_TOUCH_FILE: case DACT_TOUCH_FILE:
{ {
if (file){
touch_file(working_set, file);
}
}break; }break;
#endif
#if 0 #if 0
case DACT_OPEN: case DACT_OPEN:
case DACT_OPEN_BACKGROUND: case DACT_OPEN_BACKGROUND:
@ -4326,7 +4325,7 @@ App_Step_Sig(app_step){
}break; }break;
#endif #endif
case DACT_SET_LINE: case DACT_SET_LINE:
{ {
// TODO(allen): deduplicate // TODO(allen): deduplicate

2
4ed_delay.cpp
View File

@ -2,7 +2,6 @@ enum Action_Type{
DACT_SET_LINE, DACT_SET_LINE,
DACT_SWITCH, DACT_SWITCH,
DACT_TRY_KILL, DACT_TRY_KILL,
DACT_TOUCH_FILE,
DACT_CLOSE, DACT_CLOSE,
}; };
@ -124,5 +123,4 @@ delayed_action_repush(Delay *delay, Delayed_Action *act){
#define delayed_set_line(delay, ...) delayed_action_(delay, DACT_SET_LINE, ##__VA_ARGS__) #define delayed_set_line(delay, ...) delayed_action_(delay, DACT_SET_LINE, ##__VA_ARGS__)
#define delayed_switch(delay, ...) delayed_action_(delay, DACT_SWITCH, ##__VA_ARGS__) #define delayed_switch(delay, ...) delayed_action_(delay, DACT_SWITCH, ##__VA_ARGS__)
#define delayed_try_kill(delay, ...) delayed_action_(delay, DACT_TRY_KILL, ##__VA_ARGS__) #define delayed_try_kill(delay, ...) delayed_action_(delay, DACT_TRY_KILL, ##__VA_ARGS__)
#define delayed_touch_file(delay, ...) delayed_action_(delay, DACT_TOUCH_FILE, ##__VA_ARGS__)
#define delayed_close(delay, ...) delayed_action_(delay, DACT_CLOSE, ##__VA_ARGS__) #define delayed_close(delay, ...) delayed_action_(delay, DACT_CLOSE, ##__VA_ARGS__)

8
4ed_file.cpp
View File

@ -488,9 +488,11 @@ working_set_lookup_file(Working_Set *working_set, String string){
internal void internal void
touch_file(Working_Set *working_set, Editing_File *file){ touch_file(Working_Set *working_set, Editing_File *file){
Assert(!file->state.is_dummy); if (file){
dll_remove(&file->node); Assert(!file->state.is_dummy);
dll_insert(&working_set->used_sentinel, &file->node); dll_remove(&file->node);
dll_insert(&working_set->used_sentinel, &file->node);
}
} }
// Hot Directory // Hot Directory

4
4ed_file_view.cpp
View File

@ -3178,7 +3178,7 @@ interactive_view_complete(System_Functions *system, View *view, String dest, i32
switch (view->action){ switch (view->action){
case IAct_Open: case IAct_Open:
view_open_file(system, models, view, dest); view_open_file(system, models, view, dest);
delayed_touch_file(&models->delay1, old_file); touch_file(&models->working_set, old_file);
break; break;
case IAct_Save_As: case IAct_Save_As:
@ -3194,7 +3194,7 @@ interactive_view_complete(System_Functions *system, View *view, String dest, i32
case IAct_Switch: case IAct_Switch:
delayed_switch(&models->delay1, dest, panel); delayed_switch(&models->delay1, dest, panel);
delayed_touch_file(&models->delay1, old_file); touch_file(&models->working_set, old_file);
break; break;
case IAct_Kill: case IAct_Kill:

2
4ed_metagen.cpp
View File

@ -160,8 +160,8 @@ char *daction_enum[] = {
"TRY_KILL", "TRY_KILL",
#if 0 #if 0
"KILL", "KILL",
#endif
"TOUCH_FILE", "TOUCH_FILE",
#endif
"CLOSE", "CLOSE",
}; };