Mercurial > hg > octave-nkf
view src/pt-bp.cc @ 13281:834f904a3dcb
Add support for full asynchronous graphics toolkit running in a separate
thread. Add uicontrol and uipanel implementation.
* oct-mutex.h (octave_base_mutex::try_lock): New method.
(octave_mutex::try_lock): Likewise.
(octave_auto_lock::octave_auto_lock): New argument for
blocking/non-blocking locks.
(octave_auto_lock::ok): New method to test locking state.
(octave_auto_lock::operator bool): Likewise.
(octave_thread): New utility class.
* oct-mutex.cc (octave_base_mutex::try_lock): New method.
(octave_w32_mutex::try_lock): Implement it for Win32.
(octave_pthread_mutex::try_lock): Implement it for pthread.
(octave_thread): Implement new utility class.
* octave.cc (octave_main): Initialize octave_thread.
* genprops.awk (emit_get_string_array): New function.
(emit_declarations): Use it for string_array_property.
* graphics.h.in (base_property::set): New argument to control toolkit
notifying.
(property::set): Likewise.
(string_array_property::string_vector_value): New method.
(radio_property::do_set): Add warning about abbreviated radio values.
(base_graphics_toolkit::initialize): Returns bool.
(graphics_toolkit::initialize): Likewise.
(base_graphics_object::toolkit_flag): New member.
(base_graphics_object::base_graphics_object): Initialize it.
(base_graphics_object::valid_toolkit_object): New method.
(base_graphics_object::initialize, base_graphics_object::finalize,
base_graphics_object::update): Likewise.
(graphics_object::initialize, graphics_object::finalize,
graphics_object::update): Likewise.
(figure::properties::set_toolkit): Move implementation to source file.
(base_properties::get_boundingbox): Add parent size argument for optimization.
(figure::properties::get_boundingbox): Likewise.
(axes::properties::get_boundingbox): Likewise.
(figure::properties::map_from_boundingbox): New utility method.
(figure::properties::map_to_boundingbox): Likewise.
(axes::properties::get_fontsize_points): New utility method.
(text::properties::get_fontsize_points): Likewise.
(axes::properties::xlabel, axes::properties::ylabel, axes::properties::zlabel,
axes::properties::title): Don't notify toolkit on initialization.
(axes::initialize): New method override.
(uicontrol): New class.
(uipanel): Likewise.
(graphics_event::create_callback_event): New static method overload.
(graphics_event::create_set_event): New argument to prevent circular
behavior when property change is triggered from the toolkit.
(gh_manager::post_set): Likewise.
(gh_manager::do_post_set): Likewise.
(gh_manager::make_graphics_handle): New argument controlling toolkit notify.
(gh_manager::make_figure_handle): Likewise.
(gh_manager::do_make_graphics_handle): Likewise.
(gh_manager::do_make_figure_handle): Likewise.
(gh_manager::try_lock): New static method.
(gh_manager::execute_listener): Likewise.
(gh_manager::enable_event_processing): Likewise.
(gh_manager::do_try_lock): New method.
(gh_manager::do_execute_listener): Likewise.
(gh_manager::do_enable_event_processing): Likewise.
(gh_manager::event_processing): New member.
(gh_manager::execute_callback): Protect graphics_object access.
(gh_manager::auto_lock): Inherits from octave_autolock. Renamed from autolock.
(gh_manager::auto_lock::auto_lock): New blocking/non-blocking argument.
* graphics.cc (default_control_position, default_control_sliderstep,
default_panel_position): New utility functions.
(convert_font_size): New utility function.
(convert_position): Support 2D-only positions.
(lookup_object_name): Support uicontrol and uipanel.
(make_graphics_object_from_type): Likewise.
(root_figure::init_factory_properties): Likewise.
(property_list::set, property_list::lookup): Likewise.
(base_property::set): New argument controlling toolkit notifying.
(base_property::run_listeners): Call gh_manager::execute_listener, allowing
to set a property from another thread and run listeners synchronously with
octave.
(color_property::do_set): Add warning about abbreviated radio value.
(double_radio_property::do_set): Likewise.
(finalize_r, initialize_r, xinitialize): New utility functions.
(gh_manager::do_free): Calls graphics_object::finalize.
(base_graphics_toolkit::initialize): Returns bool.
(gnuplot_toolkit::initialize): Likewise.
(figure::properties::set_toolkit): Move implementation from header.
(figure::properties::get_boundingbox): New argument for parent size.
(axes::properties::get_boundingbox): Likewise.
(figure::properties::map_from_boundingbox): New utility method.
(figure::properties::map_to_boundingbox): Likewise.
(axes::properties::update_fontunits): Use convert_font_size.
(axes::properties::get_fontsize_points): New utility method.
(text::properties::get_fontsize_points): Likewise.
(axes::initialize): New method override to trigger initialization of
labels and title.
(uicontrol): New class.
(uipanel): Likewise.
(gh_manager::gh_manager): Initialize new event_processing member.
(gh_manager::do_make_graphics_handle): New argument controlling toolkit
notifying.
(gh_manager::do_make_figure_handle): Likewise.
(callback_event::callback): New member.
(callback_event::callback_event): Initialize it.
(callback_event::execute): Use it.
(set_event::notify_toolkit): New member.
(set_event::set_event): Initialize it.
(set_event::execute): Use it. Also allow to set read-only properties.
(graphics_event::create_callback_event): New static method overload.
(graphics_event::create_set_event): New argument controlling toolkit notifying.
(gh_manager::do_restore_gcbo): Rename autolock to auto_lock.
(gh_manager::do_post_callback, gh_manager::do_post_function): Likewise.
(Fishandle, Fset, Fget, F__get__): Likewise.
(F__go_figure__, F__calc_dimensions__, GO_BODY): Likewise.
(F__go_delete__, F__go_axes_init__, F__go_handles__, F__go_figure_handles__,
Favailable_graphics_toolkits, Faddlistener, Fdellistener, Faddproperty):
Likewise.
(get_property_from_handle, set_property_in_handle): Likewise.
(gh_manager::do_post_set): Likewise. New argument controlling toolkit
notifying.
(gh_manager::do_execute_listener): New method.
(gh_manager::do_enable_event_processing): Likewise.
(gh_manager::do_execute_callback): Check callback argument validity.
Rename autolock to auto_lock.
(gh_manager::do_process_events): Execute drawnow at the end of event
processing loop, avoiding recursivity. Maintain the input event hook
if gh_manager::event_processing is non zero.
(make_graphics_object): Postpone object's toolkit initialization at
the end of the object creation.
(F__go_figure__): Likewise.
(F__go_uicontrol__, F__go_uipanel__): New functions.
* __init_fltk__.cc (fltk_graphics_toolkit::initialise): New method.
* gl-render.h (opengl_renderer::draw): New argument to identify top-level
calls.
(opengl_renderer::draw_uipanel): New method.
(opengl_renderer::init_gl_context): Likewise.
* gl-render.cc (opengl_renderer::draw): New argument to identify top-level
calls. Skip uicontrol objects. Handle uipanel objects when top-level.
(opengl_renderer::init_gl_context): New method.
(opengl_renderer::draw_figure): Use it.
(opengl_renderer::draw_uipanel): New method.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Thu, 06 Oct 2011 16:44:18 +0100 |
parents | 12df7854fa7c |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 2001-2011 Ben Sapp This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "ov-usr-fcn.h" #include "pager.h" #include "pt-all.h" // TRUE means SIGINT should put us in the debugger at the next // available breakpoint. bool octave_debug_on_interrupt_state = false; void tree_breakpoint::visit_while_command (tree_while_command& cmd) { if (cmd.line () >= line) take_action (cmd); if (! found) { tree_statement_list *lst = cmd.body (); if (lst) lst->accept (*this); } } void tree_breakpoint::visit_do_until_command (tree_do_until_command& cmd) { if (! found) { tree_statement_list *lst = cmd.body (); if (lst) lst->accept (*this); if (! found) { if (cmd.line () >= line) take_action (cmd); } } } void tree_breakpoint::visit_argument_list (tree_argument_list&) { panic_impossible (); } void tree_breakpoint::visit_binary_expression (tree_binary_expression&) { panic_impossible (); } void tree_breakpoint::visit_break_command (tree_break_command& cmd) { if (cmd.line () >= line) take_action (cmd); } void tree_breakpoint::visit_colon_expression (tree_colon_expression&) { panic_impossible (); } void tree_breakpoint::visit_continue_command (tree_continue_command& cmd) { if (cmd.line () >= line) take_action (cmd); } void tree_breakpoint::do_decl_command (tree_decl_command& cmd) { if (cmd.line () >= line) take_action (cmd); } void tree_breakpoint::visit_global_command (tree_global_command& cmd) { do_decl_command (cmd); } void tree_breakpoint::visit_static_command (tree_static_command& cmd) { do_decl_command (cmd); } void tree_breakpoint::visit_decl_elt (tree_decl_elt&) { panic_impossible (); } void tree_breakpoint::visit_decl_init_list (tree_decl_init_list&) { panic_impossible (); } void tree_breakpoint::visit_simple_for_command (tree_simple_for_command& cmd) { if (cmd.line () >= line) take_action (cmd); if (! found) { tree_statement_list *lst = cmd.body (); if (lst) lst->accept (*this); } } void tree_breakpoint::visit_complex_for_command (tree_complex_for_command& cmd) { if (cmd.line () >= line) take_action (cmd); if (! found) { tree_statement_list *lst = cmd.body (); if (lst) lst->accept (*this); } } void tree_breakpoint::visit_octave_user_script (octave_user_script& fcn) { tree_statement_list *cmd_list = fcn.body (); if (cmd_list) cmd_list->accept (*this); } void tree_breakpoint::visit_octave_user_function (octave_user_function& fcn) { tree_statement_list *cmd_list = fcn.body (); if (cmd_list) cmd_list->accept (*this); } void tree_breakpoint::visit_octave_user_function_header (octave_user_function&) { panic_impossible (); } void tree_breakpoint::visit_octave_user_function_trailer (octave_user_function&) { panic_impossible (); } void tree_breakpoint::visit_function_def (tree_function_def& fdef) { octave_value fcn = fdef.function (); octave_function *f = fcn.function_value (); if (f) f->accept (*this); } void tree_breakpoint::visit_identifier (tree_identifier&) { panic_impossible (); } void tree_breakpoint::visit_if_clause (tree_if_clause&) { panic_impossible (); } void tree_breakpoint::visit_if_command (tree_if_command& cmd) { if (cmd.line () >= line) take_action (cmd); if (! found) { tree_if_command_list *lst = cmd.cmd_list (); if (lst) lst->accept (*this); } } void tree_breakpoint::visit_if_command_list (tree_if_command_list& lst) { for (tree_if_command_list::iterator p = lst.begin (); p != lst.end (); p++) { tree_if_clause *t = *p; if (t->line () >= line) take_action (*t); if (! found) { tree_statement_list *stmt_lst = t->commands (); if (stmt_lst) stmt_lst->accept (*this); } if (found) break; } } void tree_breakpoint::visit_index_expression (tree_index_expression&) { panic_impossible (); } void tree_breakpoint::visit_matrix (tree_matrix&) { panic_impossible (); } void tree_breakpoint::visit_cell (tree_cell&) { panic_impossible (); } void tree_breakpoint::visit_multi_assignment (tree_multi_assignment&) { panic_impossible (); } void tree_breakpoint::visit_no_op_command (tree_no_op_command& cmd) { if (cmd.is_end_of_fcn_or_script () && cmd.line () >= line) take_action (cmd); } void tree_breakpoint::visit_anon_fcn_handle (tree_anon_fcn_handle&) { panic_impossible (); } void tree_breakpoint::visit_constant (tree_constant&) { panic_impossible (); } void tree_breakpoint::visit_fcn_handle (tree_fcn_handle&) { panic_impossible (); } void tree_breakpoint::visit_parameter_list (tree_parameter_list&) { panic_impossible (); } void tree_breakpoint::visit_postfix_expression (tree_postfix_expression&) { panic_impossible (); } void tree_breakpoint::visit_prefix_expression (tree_prefix_expression&) { panic_impossible (); } void tree_breakpoint::visit_return_command (tree_return_command& cmd) { if (cmd.line () >= line) take_action (cmd); } void tree_breakpoint::visit_return_list (tree_return_list&) { panic_impossible (); } void tree_breakpoint::visit_simple_assignment (tree_simple_assignment&) { panic_impossible (); } void tree_breakpoint::visit_statement (tree_statement& stmt) { if (stmt.is_command ()) { tree_command *cmd = stmt.command (); cmd->accept (*this); } else { if (stmt.line () >= line) take_action (stmt); } } void tree_breakpoint::visit_statement_list (tree_statement_list& lst) { for (tree_statement_list::iterator p = lst.begin (); p != lst.end (); p++) { tree_statement *elt = *p; if (elt) { elt->accept (*this); if (found) break; } } } void tree_breakpoint::visit_switch_case (tree_switch_case&) { panic_impossible (); } void tree_breakpoint::visit_switch_case_list (tree_switch_case_list& lst) { for (tree_switch_case_list::iterator p = lst.begin (); p != lst.end (); p++) { tree_switch_case *t = *p; if (t->line () >= line) take_action (*t); if (! found) { tree_statement_list *stmt_lst = t->commands (); if (stmt_lst) stmt_lst->accept (*this); } if (found) break; } } void tree_breakpoint::visit_switch_command (tree_switch_command& cmd) { if (cmd.line () >= line) take_action (cmd); if (! found) { tree_switch_case_list *lst = cmd.case_list (); if (lst) lst->accept (*this); } } void tree_breakpoint::visit_try_catch_command (tree_try_catch_command& cmd) { tree_statement_list *try_code = cmd.body (); if (try_code) try_code->accept (*this); if (! found) { tree_statement_list *catch_code = cmd.cleanup (); if (catch_code) catch_code->accept (*this); } } void tree_breakpoint::visit_unwind_protect_command (tree_unwind_protect_command& cmd) { tree_statement_list *body = cmd.body (); if (body) body->accept (*this); if (! found) { tree_statement_list *cleanup = cmd.cleanup (); if (cleanup) cleanup->accept (*this); } } void tree_breakpoint::take_action (tree& tr) { if (act == set) { tr.set_breakpoint (); line = tr.line (); found = true; } else if (act == clear) { if (tr.is_breakpoint ()) { tr.delete_breakpoint (); found = true; } } else if (act == list) { if (tr.is_breakpoint ()) bp_list.append (octave_value (tr.line ())); } else panic_impossible (); } void tree_breakpoint::take_action (tree_statement& stmt) { int lineno = stmt.line (); if (act == set) { stmt.set_breakpoint (); line = lineno; found = true; } else if (act == clear) { if (stmt.is_breakpoint ()) { stmt.delete_breakpoint (); found = true; } } else if (act == list) { if (stmt.is_breakpoint ()) bp_list.append (octave_value (lineno)); } else panic_impossible (); }