diff libgui/src/octave-adapter/octave-main-thread.cc @ 16350:d4b6ad43bc87

use direct callbacks instead to handle history and workspace list updates * history-docwidget.h, history-dockwidget.cc (history_dock_widget::_update_event_enabled): Delete data member and all uses. * history-dockwidget.cc (history_dock_widget::construct): Don't install a timer. (history_dock_widget::update_history_callback): Now public. * workspace-model.cc (workspace_model::workspace_model): Don't install a timer. (workspace_model::_update_event_enabled): Delete data member and all uses. (workspace_model::update_workspace_callback): Now public. * workspace-view (workspace_view::model_changed): call workspace_model::update_workspace_callback. * main-window.h, main-window.cc (main_window::update_workspace, main_window::update_history): New functions. (main_window::construct): Connect them to corresponding signals. * octave-event-listener.h (octave_event_listener::update_workspace, octave_event_listener::update_history): New virtual functions. * octave-link.h, octave-link.cc (octave_link::update_workspace, octave_link::update_history, octave_link::do_update_workspace, octave_link::do_update_history, octave_link::post_input_event_hook_fcn, octave_link::do_post_input_event_hook_fcn): New functions. * octave-main-thread.cc (pre_input_event_hook_fcn, post_input_event_hook_fcn): New functions. (octave_main_thread::run): Install pre- and post- input event callback functions. * octave-qt-event-listener.h, octave-qt-event-listener.cc (octave_qt_event_listener::update_workspace octave_qt_event_listener::update_history): New functions. (octave_qt_event_listener::update_workspace_signal, octave_qt_event_listener::update_history_signal): New signals.
author John W. Eaton <jwe@octave.org>
date Thu, 21 Mar 2013 02:28:48 -0400
parents 636fd9832f31
children 8430ea8c1594
line wrap: on
line diff
--- a/libgui/src/octave-adapter/octave-main-thread.cc
+++ b/libgui/src/octave-adapter/octave-main-thread.cc
@@ -27,11 +27,34 @@
 #include <clocale>
 #include <string>
 
+#include "builtin-defun-decls.h"
 #include "octave.h"
+#include "ov-builtin.h"
+#include "ov-fcn-handle.h"
 
 #include "octave-main-thread.h"
 #include "octave-link.h"
 
+static octave_value_list
+pre_input_event_hook_fcn (const octave_value_list&, int)
+{
+  octave_value_list retval;
+
+  octave_link::pre_input_event_hook_fcn ();
+
+  return retval;
+}
+
+static octave_value_list
+post_input_event_hook_fcn (const octave_value_list&, int)
+{
+  octave_value_list retval;
+
+  octave_link::post_input_event_hook_fcn ();
+
+  return retval;
+}
+
 octave_main_thread::octave_main_thread () : QThread ()
 {
 }
@@ -47,5 +70,16 @@
   octave_initialize_interpreter (octave_cmdline_argc, octave_cmdline_argv,
                                  octave_embedded);
 
+  octave_value pre_fcn (new octave_builtin (pre_input_event_hook_fcn));
+  octave_value pre_fcn_handle (new octave_fcn_handle (pre_fcn));
+  Fadd_pre_input_event_hook (pre_fcn_handle);
+
+  octave_value post_fcn (new octave_builtin (post_input_event_hook_fcn));
+  octave_value post_fcn_handle (new octave_fcn_handle (post_fcn));
+  Fadd_post_input_event_hook (post_fcn_handle);
+
+  // Prime the history list.
+  octave_link::update_history ();
+
   octave_execute_interpreter ();
 }