Mercurial > hg > octave-nkf
view src/lex.h @ 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 | 1bfca2bbea8b |
children | 2c664266e9d0 |
line wrap: on
line source
/* Copyright (C) 1993-2011 John W. Eaton 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/>. */ #if !defined (octave_lex_h) #define octave_lex_h 1 #include <list> #include <stack> // FIXME -- these input buffer things should be members of a // parser input stream class. typedef struct yy_buffer_state *YY_BUFFER_STATE; // Associate a buffer with a new file to read. extern OCTINTERP_API YY_BUFFER_STATE create_buffer (FILE *f); // Report the current buffer. extern OCTINTERP_API YY_BUFFER_STATE current_buffer (void); // Connect to new buffer buffer. extern OCTINTERP_API void switch_to_buffer (YY_BUFFER_STATE buf); // Delete a buffer. extern OCTINTERP_API void delete_buffer (YY_BUFFER_STATE buf); // Is the given string a keyword? extern bool is_keyword (const std::string& s); extern void prep_lexer_for_script_file (void); extern void prep_lexer_for_function_file (void); // For communication between the lexer and parser. class lexical_feedback { public: lexical_feedback (void) : bracketflag (0), braceflag (0), looping (0), convert_spaces_to_comma (true), at_beginning_of_statement (true), defining_func (0), looking_at_function_handle (0), looking_at_anon_fcn_args (true), looking_at_return_list (false), looking_at_parameter_list (false), looking_at_decl_list (false), looking_at_initializer_expression (false), looking_at_matrix_or_assign_lhs (false), looking_at_object_index (), looking_for_object_index (false), do_comma_insert (false), looking_at_indirect_ref (false), parsed_function_name (), parsing_class_method (false), maybe_classdef_get_set_method (false), parsing_classdef (false), quote_is_transpose (false), pending_local_variables () { init (); } ~lexical_feedback (void) { } void init (void); // Square bracket level count. int bracketflag; // Curly brace level count. int braceflag; // TRUE means we're in the middle of defining a loop. int looping; // TRUE means that we should convert spaces to a comma inside a // matrix definition. bool convert_spaces_to_comma; // TRUE means we are at the beginning of a statement, where a // command name is possible. bool at_beginning_of_statement; // Nonzero means we're in the middle of defining a function. int defining_func; // Nonzero means we are parsing a function handle. int looking_at_function_handle; // TRUE means we are parsing an anonymous function argument list. bool looking_at_anon_fcn_args; // TRUE means we're parsing the return list for a function. bool looking_at_return_list; // TRUE means we're parsing the parameter list for a function. bool looking_at_parameter_list; // TRUE means we're parsing a declaration list (global or // persistent). bool looking_at_decl_list; // TRUE means we are looking at the initializer expression for a // parameter list element. bool looking_at_initializer_expression; // TRUE means we're parsing a matrix or the left hand side of // multi-value assignment statement. bool looking_at_matrix_or_assign_lhs; // If the front of the list is TRUE, the closest paren, brace, or // bracket nesting is an index for an object. std::list<bool> looking_at_object_index; // Object index not possible until we've seen something. bool looking_for_object_index; // GAG. Stupid kludge so that [[1,2][3,4]] will work. bool do_comma_insert; // TRUE means we're looking at an indirect reference to a // structure element. bool looking_at_indirect_ref; // If the top of the stack is TRUE, then we've already seen the name // of the current function. Should only matter if // current_function_level > 0 std::stack<bool> parsed_function_name; // TRUE means we are parsing a class method in function or classdef file. bool parsing_class_method; // TRUE means we are parsing a class method declaration line in a // classdef file and can accept a property get or set method name. // For example, "get.PropertyName" is recognized as a function name. bool maybe_classdef_get_set_method; // TRUE means we are parsing a classdef file bool parsing_classdef; // Return transpose or start a string? bool quote_is_transpose; // Set of identifiers that might be local variable names. std::set<std::string> pending_local_variables; private: lexical_feedback (const lexical_feedback&); lexical_feedback& operator = (const lexical_feedback&); }; class stream_reader { public: virtual int getc (void) = 0; virtual int ungetc (int c) = 0; protected: stream_reader (void) { } ~stream_reader (void) { } private: // No copying! stream_reader (const stream_reader&); stream_reader& operator = (const stream_reader&); }; extern std::string grab_comment_block (stream_reader& reader, bool at_bol, bool& eof); // TRUE means that we have encountered EOF on the input stream. extern bool parser_end_of_input; // Flags that need to be shared between the lexer and parser. extern lexical_feedback lexer_flags; #endif