# HG changeset patch # User John W. Eaton # Date 1516601036 18000 # Node ID 81c84fd1ae57346c29bbcb57c02ec8c077cd17ce # Parent 57f36275e605fa2adbd7c867b835ca1fe29930f1 identify functions that are intended to execute in interpreter thread * main-window.cc (main_window::save_workspace_callback, main_window::load_workspace_callback, main_window::rename_variable_callback, main_window::command_window_undo_callback, main_window::clear_command_window_callback, main_window::resize_command_window_callback, main_window::set_screen_size_callback, main_window::clear_workspace_callback, main_window::clear_history_callback, main_window::new_figure_callback, main_window::force_refresh_workspace): Tag with comment indicating that the function is intended to run in the interpeter thread. diff -r 57f36275e605 -r 81c84fd1ae57 libgui/src/main-window.cc --- a/libgui/src/main-window.cc Mon Jan 22 00:45:11 2018 -0500 +++ b/libgui/src/main-window.cc Mon Jan 22 01:03:56 2018 -0500 @@ -2527,12 +2527,16 @@ void main_window::save_workspace_callback (const std::string& file) { + // INTERPRETER THREAD + Fsave (ovl (file)); } void main_window::load_workspace_callback (const std::string& file) { + // INTERPRETER THREAD + Fload (ovl (file)); octave::symbol_scope scope @@ -2545,6 +2549,8 @@ void main_window::rename_variable_callback (const main_window::name_pair& names) { + // INTERPRETER THREAD + octave::symbol_scope scope = octave::__get_current_scope__ ("main_window::rename_variable_callback"); @@ -2562,6 +2568,8 @@ void main_window::command_window_undo_callback (void) { + // INTERPRETER THREAD + octave::command_editor::undo (); octave::command_editor::redisplay (); } @@ -2569,6 +2577,8 @@ void main_window::clear_command_window_callback (void) { + // INTERPRETER THREAD + octave::command_editor::kill_full_line (); octave::command_editor::clear_screen (); } @@ -2576,18 +2586,24 @@ void main_window::resize_command_window_callback (void) { + // INTERPRETER THREAD + octave::command_editor::resize_terminal (); } void main_window::set_screen_size_callback (const int_pair& sz) { + // INTERPRETER THREAD + octave::command_editor::set_screen_size (sz.first, sz.second); } void main_window::clear_workspace_callback (void) { + // INTERPRETER THREAD + octave::interpreter& interp = octave::__get_interpreter__ ("main_window::clear_workspace_callback"); @@ -2597,6 +2613,8 @@ void main_window::clear_history_callback (void) { + // INTERPRETER THREAD + Fhistory (ovl ("-c")); } @@ -2610,6 +2628,8 @@ void main_window::new_figure_callback (void) { + // INTERPRETER THREAD + octave::interpreter& interp = octave::__get_interpreter__ ("main_window::new_figure_callback"); @@ -2705,6 +2725,8 @@ void main_window::force_refresh_workspace (void) { + // INTERPRETER THREAD + octave::symbol_scope scope = octave::__get_current_scope__ ("main_window::load_workspace_callback");