octave: libinterp/dldfcn/__init_fltk_

annotate libinterp/dldfcn/__init_fltk__.cc @ 22622:4191f8b5070c

Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). * QtHandlesUtils.cc (computeFont): get_fontsize_points -> get___fontsize_points__. * gl-render.cc (opengl_renderer::set_font): fontsize_points -> __fontsize_points__. * gl2ps-print.cc (gl2ps_renderer::set_font): fontsize_points -> __fontsize_points__. * graphics.cc (axes::properties::init, axes::properties::set_xlabel, axes::properties::set_ylabel, axes::properties::set_zlabel, axes::properties::set_title, axes::properties::set_defaults, text::properties::update_text_extent, text::properties::request_autopos): autopos_tag -> __autopos_tag__. * graphics.cc (axes::properties::update_font, text::properties::get___fontsize_points__, uicontrol::properties::get___fontsize_points__, uibuttongroup::properties::get___fontsize_points__, uipanel::properties::get___fontsize_points__): fontsize_points -> __fontsize_points__. * graphics.in.h: fontsize_points -> __fontsize_points__. autopos_tag -> __autopos_tag__. fltk_label -> __fltk_label__. * __init_fltk__.cc: fltk_label -> __fltk_label__. * plotyy.m, hdl2struct.m, struct2hdl.m: autopos_tag -> __autopos_tag__.

author	Rik <rik@octave.org>
date	Fri, 14 Oct 2016 14:46:25 -0700
parents	34ce5be04942
children	3a2b891d0b33

rev	line source
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1 /*
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3 Copyright (C) 2007-2016 Shai Ayal
bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4 Copyright (C) 2014-2016 Andreas Weber
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	5
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	6 This file is part of Octave.
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	7
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	9 under the terms of the GNU General Public License as published by the
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	11 option) any later version.
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	12
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	16 for more details.
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	17
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	18 You should have received a copy of the GNU General Public License
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	19 along with Octave; see the file COPYING. If not, see
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	20 <http://www.gnu.org/licenses/>.
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	21
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	22 */
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	23
7874 e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	24 /*
e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	25
e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	26 To initialize:
e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	27
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	28 graphics_toolkit ("fltk");
7874 e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	29 plot (randn (1e3, 1));
e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	30
e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	31 */
e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	32
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	33 // PKG_ADD: if (__have_feature__ ("FLTK") && __have_feature__ ("OPENGL") && have_window_system ()) register_graphics_toolkit ("fltk"); endif
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14020 diff changeset	34
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21723 diff changeset	35 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	36 # include "config.h"
7874 e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	37 #endif
e3a502930e2a eliminate src/graphics subdirectory John W. Eaton <jwe@octave.org> parents: 7869 diff changeset	38
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	39 #include "builtin-defun-decls.h"
14111 c5222658dc3c doc: Build documentation for functions even when they are unavailable Rik <octave@nomad.inbox5.com> parents: 14021 diff changeset	40 #include "defun-dld.h"
c5222658dc3c doc: Build documentation for functions even when they are unavailable Rik <octave@nomad.inbox5.com> parents: 14021 diff changeset	41 #include "error.h"
21126 ba0a4b4f021d include errwarn.h in files that use err_disabled_feature conditionally John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	42 #include "errwarn.h"
21196 bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	43 #include "oct-opengl.h"
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	44 #include "ov-fcn-handle.h"
14111 c5222658dc3c doc: Build documentation for functions even when they are unavailable Rik <octave@nomad.inbox5.com> parents: 14021 diff changeset	45
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21723 diff changeset	46 #if defined (HAVE_FLTK)
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7874 diff changeset	47
18618 c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	48 #if defined (HAVE_X_WINDOWS)
21196 bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	49 # include <X11/Xlib.h>
18618 c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	50 #endif
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	51
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	52 #include <map>
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	53 #include <set>
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	54 #include <sstream>
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	55 #include <iostream>
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	56
21196 bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	57 #if defined (WIN32)
bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	58 # define WIN32_LEAN_AND_MEAN
13721 ca90a6d59ab6 Prevent auto-inclusion of winsock.h in WIN32. Michael Goffioul <michael.goffioul@gmail.com> parents: 13281 diff changeset	59 #endif
ca90a6d59ab6 Prevent auto-inclusion of winsock.h in WIN32. Michael Goffioul <michael.goffioul@gmail.com> parents: 13281 diff changeset	60
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	61 #include <FL/Fl.H>
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	62 #include <FL/Fl_Box.H>
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	63 #include <FL/Fl_Button.H>
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	64 #include <FL/Fl_Choice.H>
12565 0f71b9639207 Correct typo in #include path for FLTK header files (bug #32972). Rik <octave@nomad.inbox5.com> parents: 12539 diff changeset	65 #include <FL/Fl_File_Chooser.H>
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	66 #include <FL/Fl_Gl_Window.H>
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	67 #include <FL/names.h>
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	68 #include <FL/Fl_Menu_Bar.H>
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	69 #include <FL/Fl_Menu_Button.H>
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	70 #include <FL/Fl_Output.H>
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	71 #include <FL/Fl_Window.H>
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	72 #include <FL/fl_ask.H>
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	73 #include <FL/fl_draw.H>
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	74 #include <FL/gl.h>
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	75
12205 be90f9e4548e #undef Complex after including FLTK headers John W. Eaton <jwe@octave.org> parents: 12183 diff changeset	76 // FLTK headers may include X11/X.h which defines Complex, and that
be90f9e4548e #undef Complex after including FLTK headers John W. Eaton <jwe@octave.org> parents: 12183 diff changeset	77 // conflicts with Octave's Complex typedef. We don't need the X11
be90f9e4548e #undef Complex after including FLTK headers John W. Eaton <jwe@octave.org> parents: 12183 diff changeset	78 // Complex definition in this file, so remove it before including Octave
be90f9e4548e #undef Complex after including FLTK headers John W. Eaton <jwe@octave.org> parents: 12183 diff changeset	79 // headers which may require Octave's Complex typedef.
be90f9e4548e #undef Complex after including FLTK headers John W. Eaton <jwe@octave.org> parents: 12183 diff changeset	80 #undef Complex
be90f9e4548e #undef Complex after including FLTK headers John W. Eaton <jwe@octave.org> parents: 12183 diff changeset	81
8060 09f32aac8fbc Interface for backend switch/initialization John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	82 #include "cmd-edit.h"
9652 ecdb275bd41b make drawnow work for fltk backend John W. Eaton <jwe@octave.org> parents: 9640 diff changeset	83 #include "lo-ieee.h"
18618 c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	84 #include "oct-env.h"
9652 ecdb275bd41b make drawnow work for fltk backend John W. Eaton <jwe@octave.org> parents: 9640 diff changeset	85
17881 7aadb87f599a Display warning and don't init FLTK toolkit if no DISPLAY available (bug #40423). Rik <rik@octave.org> parents: 17861 diff changeset	86 #include "display.h"
11590 4ced6b90fffb style fixes for warning and error messages in source files John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	87 #include "file-ops.h"
19657 0cdda69dc2b4 Fix compilation error when building with FLTK but without gl2ps Mike Miller <mtmiller@ieee.org> parents: 19639 diff changeset	88 #include "gl-render.h"
21199 dd6605e1eaea make gl2ps_renderer implementation private John W. Eaton <jwe@octave.org> parents: 21196 diff changeset	89 #include "gl2ps-print.h"
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7874 diff changeset	90 #include "graphics.h"
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	91 #include "parse.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	92 #include "interpreter.h"
9216 9d4b84b14bf0 call mlock in __fltk_init__ John W. Eaton <jwe@octave.org> parents: 9060 diff changeset	93 #include "variables.h"
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	94
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	95 #define FLTK_GRAPHICS_TOOLKIT_NAME "fltk"
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	96
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	97 const char* help_text = "\
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	98 Keyboard Shortcuts\n\
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	99 a - autoscale\n\
10792 91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	100 p - pan/zoom\n\
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	101 r - rotate\n\
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	102 g - toggle grid\n\
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	103 \n\
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	104 Mouse\n\
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	105 left drag - pan\n\
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	106 mouse wheel - zoom\n\
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	107 right drag - rectangle zoom\n\
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	108 left double click - autoscale\n\
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	109 ";
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	110
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	111 class OpenGL_fltk : public Fl_Gl_Window
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	112 {
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	113 public:
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	114 OpenGL_fltk (int xx, int yy, int ww, int hh, double num)
10555 a80207303549 style fixes John W. Eaton <jwe@octave.org> parents: 10553 diff changeset	115 : Fl_Gl_Window (xx, yy, ww, hh, 0), number (num), renderer (),
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	116 in_zoom (false), zoom_box ()
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	117 {
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	118 #if defined (HAVE_OPENGL)
9951 d64d15e12e6b print immediately in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9802 diff changeset	119 // Ask for double buffering and a depth buffer.
18293 c6e5466d74fe Ensure anti-aliasing in fltk plots (patch #8259) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17945 diff changeset	120 mode (FL_DEPTH \| FL_DOUBLE \| FL_MULTISAMPLE);
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	121 #else
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	122 err_disabled_feature ("OpenGL_fltk", "OpenGL");
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	123 #endif
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	124 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	125
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	126 ~OpenGL_fltk (void) { }
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	127
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	128 void zoom (bool z)
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	129 {
2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	130 in_zoom = z;
2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	131 if (! in_zoom)
2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	132 hide_overlay ();
2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	133 }
2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	134
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	135 bool zoom (void) { return in_zoom; }
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	136 void set_zoom_box (const Matrix& zb) { zoom_box = zb; }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	137
12449 2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12324 diff changeset	138 void print (const std::string& cmd, const std::string& term)
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	139 {
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	140 //std::cout << "OpenGL_fltk::print(cmd=" << cmd << ", term=" << term << ") canvas size = " << w () << "x" << h () << std::endl;
19639 61cc00ebac60 move opengl printing code from __init_fltk__.cc to gl2ps-renderer.cc John W. Eaton <jwe@octave.org> parents: 19456 diff changeset	141
61cc00ebac60 move opengl printing code from __init_fltk__.cc to gl2ps-renderer.cc John W. Eaton <jwe@octave.org> parents: 19456 diff changeset	142 gl2ps_print (gh_manager::get_object (number), cmd, term);
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	143 }
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	144
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	145 void resize (int xx, int yy, int ww, int hh)
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	146 {
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	147 #if defined (HAVE_OPENGL)
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	148
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	149 Fl_Gl_Window::resize (xx, yy, ww, hh);
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	150
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	151 #else
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	152 // This shouldn't happen because construction of Opengl_fltk
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	153 // objects is supposed to be impossible if OpenGL is not available.
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	154
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	155 panic_impossible ();
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	156 #endif
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	157 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	158
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	159 bool renumber (double new_number)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	160 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	161 bool retval = false;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	162
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	163 if (number != new_number)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	164 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	165 number = new_number;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	166 retval = true;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	167 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	168
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	169 return retval;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	170 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	171
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	172 private:
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	173 double number;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	174 octave::opengl_renderer renderer;
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	175 bool in_zoom;
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	176 // (x1,y1,x2,y2)
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	177 Matrix zoom_box;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	178
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	179 void draw (void)
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	180 {
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	181 #if defined (HAVE_OPENGL)
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	182
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	183 if (! valid ())
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	184 {
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	185 glMatrixMode (GL_PROJECTION);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	186 glLoadIdentity ();
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	187 glViewport (0, 0, w (), h ());
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	188 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	189
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	190 renderer.draw (gh_manager::get_object (number));
12323 c8da31f12c1d avoid using new to create temporary gl2ps_renderer object John W. Eaton <jwe@octave.org> parents: 12226 diff changeset	191
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	192 if (zoom ())
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	193 overlay ();
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	194
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	195 #else
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	196 // This shouldn't happen because construction of Opengl_fltk
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	197 // objects is supposed to be impossible if OpenGL is not available.
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	198
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	199 panic_impossible ();
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	200 #endif
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	201 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	202
9802 9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	203 void zoom_box_vertex (void)
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	204 {
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	205 #if defined (HAVE_OPENGL)
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	206
9802 9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	207 glVertex2d (zoom_box(0), h () - zoom_box(1));
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	208 glVertex2d (zoom_box(0), h () - zoom_box(3));
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	209 glVertex2d (zoom_box(2), h () - zoom_box(3));
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	210 glVertex2d (zoom_box(2), h () - zoom_box(1));
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	211 glVertex2d (zoom_box(0), h () - zoom_box(1));
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	212
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	213 #else
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	214 // This shouldn't happen because construction of Opengl_fltk
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	215 // objects is supposed to be impossible if OpenGL is not available.
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	216
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	217 panic_impossible ();
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	218 #endif
9802 9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	219 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	220
9802 9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	221 void overlay (void)
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	222 {
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	223 #if defined (HAVE_OPENGL)
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	224
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	225 glPushMatrix ();
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	226
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	227 glMatrixMode (GL_MODELVIEW);
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	228 glLoadIdentity ();
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	229
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	230 glMatrixMode (GL_PROJECTION);
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	231 glLoadIdentity ();
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	232 gluOrtho2D (0.0, w (), 0.0, h ());
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	233
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	234 glPushAttrib (GL_DEPTH_BUFFER_BIT \| GL_CURRENT_BIT);
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	235 glDisable (GL_DEPTH_TEST);
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	236
9802 9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	237 glBegin (GL_POLYGON);
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	238 glColor4f (0.45, 0.62, 0.81, 0.1);
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	239 zoom_box_vertex ();
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	240 glEnd ();
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	241
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	242 glBegin (GL_LINE_STRIP);
9802 9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	243 glLineWidth (1.5);
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	244 glColor4f (0.45, 0.62, 0.81, 0.9);
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	245 zoom_box_vertex ();
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	246 glEnd ();
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	247
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	248 glPopAttrib ();
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	249 glPopMatrix ();
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	250
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	251 #else
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	252 // This shouldn't happen because construction of Opengl_fltk
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	253 // objects is supposed to be impossible if OpenGL is not available.
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	254
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	255 panic_impossible ();
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	256 #endif
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	257 }
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	258
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	259 int handle (int event)
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	260 {
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	261 #if defined (HAVE_OPENGL)
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	262
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	263 switch (event)
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	264 {
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	265 case FL_ENTER:
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	266 cursor (FL_CURSOR_CROSS);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	267 return 1;
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	268
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	269 case FL_LEAVE:
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	270 cursor (FL_CURSOR_DEFAULT);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	271 return 1;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	272 }
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	273
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	274 return Fl_Gl_Window::handle (event);
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	275
1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	276 #else
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	277 // This shouldn't happen because construction of Opengl_fltk
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	278 // objects is supposed to be impossible if OpenGL is not available.
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	279
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	280 panic_impossible ();
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	281 #endif
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	282 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	283 };
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	284
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	285 void script_cb (Fl_Widget, void data)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	286 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	287 static_cast<uimenu::properties*> (data)->execute_callback ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	288 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	289
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	290
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	291 class fltk_uimenu
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	292 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	293 public:
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	294 fltk_uimenu (int xx, int yy, int ww, int hh)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	295 {
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	296 menubar = new Fl_Menu_Bar (xx, yy, ww, hh);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	297 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	298
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	299 int items_to_show (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	300 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	301 //returns the number of visible menu items
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	302 int len = menubar->size ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	303 int n = 0;
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18618 diff changeset	304 for (int t = 0; t < len; t++)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	305 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	306 const Fl_Menu_Item m = static_cast<const Fl_Menu_Item> (&
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	307 (menubar->menu ()[t]));
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	308 if (m->label () && m->visible ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	309 n++;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	310 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	311
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	312 return n;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	313 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	314
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	315 void show (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	316 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	317 menubar->show ();
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	318 menubar->redraw ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	319 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	320
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	321 void hide (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	322 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	323 menubar->hide ();
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	324 menubar->redraw ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	325 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	326
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	327 bool is_visible (void)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	328 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	329 return menubar->visible ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	330 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	331
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	332 int find_index_by_name (const std::string& findname)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	333 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	334 // This function is derived from Greg Ercolano's function
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	335 // int GetIndexByName(...), see:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	336 // http://seriss.com/people/erco/fltk/#Menu_ChangeLabel
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	337 // He agreed via PM that it can be included in octave using GPLv3
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	338 // Kai Habel (14.10.2010)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	339
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	340 std::string menupath;
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18618 diff changeset	341 for (int t = 0; t < menubar->size (); t++)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	342 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	343 Fl_Menu_Item m = const_cast<Fl_Menu_Item> (&(menubar->menu ()[t]));
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	344 if (m->submenu ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	345 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	346 // item has submenu
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	347 if (! menupath.empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	348 menupath += "/";
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	349 menupath += m->label ();
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	350
21021 a5b99b09f8fd maint: Use comparison operators rather than compare() for strings. Rik <rik@octave.org> parents: 21006 diff changeset	351 if (menupath == findname)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	352 return (t);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	353 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	354 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	355 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	356 // End of submenu? Pop back one level.
17900 8e9532632838 * __init_fltk__.cc: Fix typo in previous change. John W. Eaton <jwe@octave.org> parents: 17898 diff changeset	357 if (! m->label ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	358 {
19872 d575cd1e0da7 Replace std::size_t with bare size_t for conformity to rest of code. Rik <rik@octave.org> parents: 19867 diff changeset	359 size_t idx = menupath.find_last_of ("/");
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	360 if (idx != std::string::npos)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	361 menupath.erase (idx);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	362 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	363 menupath.clear ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	364 continue;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	365 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	366 // Menu item?
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	367 std::string itempath = menupath;
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	368 if (! itempath.empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	369 itempath += "/";
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	370 itempath += m->label ();
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	371
21021 a5b99b09f8fd maint: Use comparison operators rather than compare() for strings. Rik <rik@octave.org> parents: 21006 diff changeset	372 if (itempath == findname)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	373 return (t);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	374 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	375 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	376 return (-1);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	377 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	378
11170 a2437f70fe6c Remove template to allow compilation for MacOS Kai Habel <kai.habel@gmx.de> parents: 11155 diff changeset	379 Matrix find_uimenu_children (uimenu::properties& uimenup) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	380 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	381 Matrix uimenu_childs = uimenup.get_all_children ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	382 Matrix retval = do_find_uimenu_children (uimenu_childs);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	383 return retval;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	384 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	385
11170 a2437f70fe6c Remove template to allow compilation for MacOS Kai Habel <kai.habel@gmx.de> parents: 11155 diff changeset	386 Matrix find_uimenu_children (figure::properties& figp) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	387 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	388 Matrix uimenu_childs = figp.get_all_children ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	389 Matrix retval = do_find_uimenu_children (uimenu_childs);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	390 return retval;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	391 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	392
11170 a2437f70fe6c Remove template to allow compilation for MacOS Kai Habel <kai.habel@gmx.de> parents: 11155 diff changeset	393 Matrix do_find_uimenu_children (Matrix uimenu_childs) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	394 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	395 octave_idx_type k = 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	396
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	397 Matrix pos = Matrix (uimenu_childs.numel (), 1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	398
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	399 for (octave_idx_type ii = 0; ii < uimenu_childs.numel (); ii++)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	400 {
11207 51e6ac3e5afc Code fixes for uimenu Kai Habel <kai.habel@gmx.de> parents: 11170 diff changeset	401 graphics_object kidgo = gh_manager::get_object (uimenu_childs (ii));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	402
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	403 if (kidgo.valid_object () && kidgo.isa ("uimenu"))
11207 51e6ac3e5afc Code fixes for uimenu Kai Habel <kai.habel@gmx.de> parents: 11170 diff changeset	404 {
51e6ac3e5afc Code fixes for uimenu Kai Habel <kai.habel@gmx.de> parents: 11170 diff changeset	405 uimenu_childs(k) = uimenu_childs(ii);
51e6ac3e5afc Code fixes for uimenu Kai Habel <kai.habel@gmx.de> parents: 11170 diff changeset	406 pos(k++) =
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	407 dynamic_cast<uimenu::properties&>
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	408 (kidgo.get_properties ()).get_position ();
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	409 }
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	410 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	411
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	412 uimenu_childs.resize (k, 1);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	413 pos.resize (k, 1);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	414 Matrix retval = Matrix (k, 1);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	415 // Don't know if this is the best method to sort.
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	416 // Can we avoid the for loop?
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	417 Array<octave_idx_type> sidx = pos.sort_rows_idx (DESCENDING);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	418 for (octave_idx_type ii = 0; ii < k; ii++)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	419 retval(ii) = uimenu_childs (sidx(ii));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	420
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	421 return retval;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	422 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	423
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	424 void delete_entry (uimenu::properties& uimenup)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	425 {
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	426 std::string fltk_label = uimenup.get___fltk_label__ ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	427 int idx = find_index_by_name (fltk_label.c_str ());
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	428
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	429 if (idx >= 0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	430 menubar->remove (idx);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	431 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	432
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	433 void update_accelerator (uimenu::properties& uimenup)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	434 {
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	435 std::string fltk_label = uimenup.get___fltk_label__ ();
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	436 if (! fltk_label.empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	437 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	438 Fl_Menu_Item* item = const_cast<Fl_Menu_Item*> (menubar->find_item (
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	439 fltk_label.c_str ()));
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	440 if (item)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	441 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	442 std::string acc = uimenup.get_accelerator ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	443 if (acc.length () > 0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	444 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	445 int key = FL_CTRL + acc[0];
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	446 item->shortcut (key);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	447 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	448 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	449 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	450 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	451
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	452 void update_callback (uimenu::properties& uimenup)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	453 {
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	454 std::string fltk_label = uimenup.get___fltk_label__ ();
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	455 if (! fltk_label.empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	456 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	457 Fl_Menu_Item* item = const_cast<Fl_Menu_Item*> (menubar->find_item (
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	458 fltk_label.c_str ()));
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	459 if (item)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	460 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	461 if (! uimenup.get_callback ().is_empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	462 item->callback (static_cast<Fl_Callback*> (script_cb),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	463 static_cast<void*> (&uimenup));
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	464 else
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	465 item->callback (0, static_cast<void*> (0));
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	466 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	467 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	468 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	469
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	470 void update_enable (uimenu::properties& uimenup)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	471 {
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	472 std::string fltk_label = uimenup.get___fltk_label__ ();
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	473 if (! fltk_label.empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	474 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	475 Fl_Menu_Item* item = const_cast<Fl_Menu_Item*> (menubar->find_item (
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	476 fltk_label.c_str ()));
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	477 if (item)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	478 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	479 if (uimenup.is_enable ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	480 item->activate ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	481 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	482 item->deactivate ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	483 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	484 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	485 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	486
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	487 void update_foregroundcolor (uimenu::properties& uimenup)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	488 {
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	489 std::string fltk_label = uimenup.get___fltk_label__ ();
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	490 if (! fltk_label.empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	491 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	492 Fl_Menu_Item* item = const_cast<Fl_Menu_Item*> (menubar->find_item (
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	493 fltk_label.c_str ()));
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	494 if (item)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	495 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	496 Matrix rgb = uimenup.get_foregroundcolor_rgb ();
12539 ccd0572e5e93 use gnulib:: functions as needed John W. Eaton <jwe@octave.org> parents: 12507 diff changeset	497
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	498 uchar r = static_cast<uchar> (std::floor (rgb (0) * 255));
aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	499 uchar g = static_cast<uchar> (std::floor (rgb (1) * 255));
aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	500 uchar b = static_cast<uchar> (std::floor (rgb (2) * 255));
12539 ccd0572e5e93 use gnulib:: functions as needed John W. Eaton <jwe@octave.org> parents: 12507 diff changeset	501
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	502 item->labelcolor (fl_rgb_color (r, g, b));
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	503 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	504 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	505 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	506
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	507 void update_seperator (const uimenu::properties& uimenup)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	508 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	509 // Matlab places the separator before the current
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21732 diff changeset	510 // menu entry, while fltk places it after. So we need to find
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	511 // the previous item in this menu/submenu. (Kai)
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	512 std::string fltk_label = uimenup.get___fltk_label__ ();
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	513 if (! fltk_label.empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	514 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	515 int itemflags = 0, idx;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	516 int curr_idx = find_index_by_name (fltk_label.c_str ());
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	517
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	518 for (idx = curr_idx - 1; idx >= 0; idx--)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	519 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	520 Fl_Menu_Item* item
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	521 = const_cast<Fl_Menu_Item*> (&menubar->menu () [idx]);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	522 itemflags = item->flags;
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	523 if (item->label ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	524 break;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	525 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	526
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	527 if (idx >= 0 && idx < menubar->size ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	528 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	529 if (uimenup.is_separator ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	530 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	531 if (idx >= 0 && !(itemflags & FL_SUBMENU))
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	532 menubar->mode (idx, itemflags \| FL_MENU_DIVIDER);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	533 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	534 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	535 menubar->mode (idx, itemflags & (~FL_MENU_DIVIDER));
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	536 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	537 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	538 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	539
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	540 void update_visible (uimenu::properties& uimenup)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	541 {
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	542 std::string fltk_label = uimenup.get___fltk_label__ ();
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	543 if (! fltk_label.empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	544 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	545 Fl_Menu_Item* item
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	546 = const_cast<Fl_Menu_Item*> (menubar->find_item (fltk_label.c_str ()));
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	547 if (item)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	548 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	549 if (uimenup.is_visible ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	550 item->show ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	551 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	552 item->hide ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	553 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	554 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	555 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	556
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	557 void update_position (uimenu::properties& uimenup, int pos)
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	558 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	559 uimenup.get_property ("position").set (octave_value (static_cast<double> (pos)),
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	560 true, false);
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	561 }
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	562
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	563 void add_entry (uimenu::properties& uimenup)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	564 {
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	565
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	566 std::string fltk_label = uimenup.get___fltk_label__ ();
11207 51e6ac3e5afc Code fixes for uimenu Kai Habel <kai.habel@gmx.de> parents: 11170 diff changeset	567
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	568 if (! fltk_label.empty ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	569 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	570 bool item_added = false;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	571 do
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	572 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	573 const Fl_Menu_Item* item
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	574 = menubar->find_item (fltk_label.c_str ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	575
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	576 if (item)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	577 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	578 //avoid duplicate menulabels
19872 d575cd1e0da7 Replace std::size_t with bare size_t for conformity to rest of code. Rik <rik@octave.org> parents: 19867 diff changeset	579 size_t idx1 = fltk_label.find_last_of ("(");
d575cd1e0da7 Replace std::size_t with bare size_t for conformity to rest of code. Rik <rik@octave.org> parents: 19867 diff changeset	580 size_t idx2 = fltk_label.find_last_of (")");
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	581 int len = idx2 - idx1;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	582 int val = 1;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	583 if (len > 0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	584 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	585 std::string valstr = fltk_label.substr (idx1 + 1, len - 1);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	586 fltk_label.erase (idx1, len + 1);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	587 val = atoi (valstr.c_str ());
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	588 if (val > 0 && val < 99)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	589 val++;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	590 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	591 std::ostringstream valstream;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	592 valstream << val;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	593 fltk_label += "(" + valstream.str () + ")";
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	594 }
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	595 else
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	596 {
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	597 Matrix uimenu_ch = find_uimenu_children (uimenup);
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	598 int len = uimenu_ch.numel ();
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	599 int flags = 0;
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	600 if (len > 0)
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	601 flags = FL_SUBMENU;
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	602 if (len == 0 && uimenup.is_checked ())
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	603 flags += FL_MENU_TOGGLE + FL_MENU_VALUE;
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	604 menubar->add (fltk_label.c_str (), 0, 0, 0, flags);
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	605 item_added = true;
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17881 diff changeset	606 }
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	607 }
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	608 while (! item_added);
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	609 uimenup.set___fltk_label__ (fltk_label);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	610 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	611 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	612
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	613 void add_to_menu (uimenu::properties& uimenup)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	614 {
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	615 std::vector<int> delayed_menus;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	616 Matrix kids = find_uimenu_children (uimenup);
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20181 diff changeset	617 int len = kids.numel ();
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	618 std::string fltk_label = uimenup.get___fltk_label__ ();
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	619 int count = 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	620
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	621 add_entry (uimenup);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	622 update_foregroundcolor (uimenup);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	623 update_callback (uimenup);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	624 update_accelerator (uimenup);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	625 update_enable (uimenup);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	626 update_visible (uimenup);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	627 update_seperator (uimenup);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	628
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	629 for (octave_idx_type ii = 0; ii < len; ii++)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	630 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	631 graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1)));
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	632 if (kgo.valid_object ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	633 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	634 uimenu::properties& kprop = dynamic_cast<uimenu::properties&>
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	635 (kgo.get_properties ());
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	636
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	637 // if no pos yet, delay adding menu until after other menus
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	638 int pos = kprop.get_position ();
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	639 if (pos <= 0)
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20119 diff changeset	640 delayed_menus.push_back ((len - (ii + 1)));
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	641 else
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	642 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	643 add_to_menu (kprop);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	644 }
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	645 }
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	646 }
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	647
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	648 // create any delayed menus
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	649 for (size_t ii = 0; ii < delayed_menus.size (); ii++)
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	650 {
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	651 graphics_object kgo = gh_manager::get_object (kids (delayed_menus[ii]));
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	652
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	653 if (kgo.valid_object ())
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	654 {
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	655 uimenu::properties& kprop = dynamic_cast<uimenu::properties&>
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	656 (kgo.get_properties ());
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	657 add_to_menu (kprop);
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	658 update_position (kprop, ++count);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	659 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	660 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	661 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	662
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	663 void add_to_menu (figure::properties& figp)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	664 {
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	665 std::vector<int> delayed_menus;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	666 Matrix kids = find_uimenu_children (figp);
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20181 diff changeset	667 int len = kids.numel ();
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	668 int count = 0;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	669 menubar->clear ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	670 for (octave_idx_type ii = 0; ii < len; ii++)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	671 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	672 graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1)));
11207 51e6ac3e5afc Code fixes for uimenu Kai Habel <kai.habel@gmx.de> parents: 11170 diff changeset	673
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	674 if (kgo.valid_object ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	675 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	676 uimenu::properties& kprop = dynamic_cast<uimenu::properties&>
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	677 (kgo.get_properties ());
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	678
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	679 // if no pos yet, delay adding menu until after other menus
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	680 int pos = kprop.get_position ();
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	681 if (pos <= 0)
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20119 diff changeset	682 delayed_menus.push_back ((len - (ii + 1)));
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	683 else
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	684 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	685 add_to_menu (kprop);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	686 update_position (kprop, ++count);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	687 }
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	688 }
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	689 }
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	690
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	691 // create any delayed menus
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	692 for (size_t ii = 0; ii < delayed_menus.size (); ii++)
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	693 {
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	694 graphics_object kgo = gh_manager::get_object (kids (delayed_menus[ii]));
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	695
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	696 if (kgo.valid_object ())
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	697 {
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	698 uimenu::properties& kprop = dynamic_cast<uimenu::properties&>
ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	699 (kgo.get_properties ());
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	700 add_to_menu (kprop);
20053 ac59136f1f10 update fltk uimenu position when adding to figure John Donoghue <john.donoghue@ieee.org> parents: 19998 diff changeset	701 update_position (kprop, ++count);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	702 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	703 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	704 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	705
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21126 diff changeset	706 template <typename T_prop>
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	707 void remove_from_menu (T_prop& prop)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	708 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	709 Matrix kids;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	710 std::string type = prop.get_type ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	711 kids = find_uimenu_children (prop);
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20181 diff changeset	712 int len = kids.numel ();
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	713
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	714 for (octave_idx_type ii = 0; ii < len; ii++)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	715 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	716 graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1)));
11207 51e6ac3e5afc Code fixes for uimenu Kai Habel <kai.habel@gmx.de> parents: 11170 diff changeset	717
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	718 if (kgo.valid_object ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	719 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	720 uimenu::properties kprop = dynamic_cast<uimenu::properties&>
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	721 (kgo.get_properties ());
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	722 remove_from_menu (kprop);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	723 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	724 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	725
21021 a5b99b09f8fd maint: Use comparison operators rather than compare() for strings. Rik <rik@octave.org> parents: 21006 diff changeset	726 if (type == "uimenu")
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	727 delete_entry (dynamic_cast<uimenu::properties&> (prop));
21021 a5b99b09f8fd maint: Use comparison operators rather than compare() for strings. Rik <rik@octave.org> parents: 21006 diff changeset	728 else if (type == "figure")
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	729 menubar->clear ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	730 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	731
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	732 ~fltk_uimenu (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	733 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	734 delete menubar;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	735 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	736
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	737 private:
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	738
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	739 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	740
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	741 fltk_uimenu (const fltk_uimenu&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	742
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	743 fltk_uimenu operator = (const fltk_uimenu&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	744
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	745 Fl_Menu_Bar* menubar;
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	746 };
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	747
18618 c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	748 #if defined (HAVE_X_WINDOWS)
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	749 static int
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	750 xerror_handler (Display , XErrorEvent )
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	751 {
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	752 return 0;
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	753 }
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	754 #endif
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	755
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	756 class plot_window : public Fl_Window
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	757 {
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	758 friend class fltk_uimenu;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	759 public:
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	760 plot_window (int xx, int yy, int ww, int hh, figure::properties& xfp,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	761 bool internal)
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	762 : Fl_Window (xx, yy, ww, hh + menu_h + status_h + 2, "octave"),
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	763 window_label (), fp (xfp), canvas (0),
17131 ea19ea629a09 Proper placement of the menubar, the toolbar and plot canvas. Ben Abbott <bpabbott@mac.com> parents: 17079 diff changeset	764 autoscale (0), togglegrid (0), panzoom (0), rotate (0), help (0),
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	765 status (0), resize_dummy (0), ax_obj (), pos_x (0), pos_y (0)
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	766 {
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	767 callback (window_close, static_cast<void*> (this));
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	768
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	769 // The size of the resize_dummy box also determines the minimum window size
22370 0a2961d5893c Fix calculation of window height in Qt, FLTK (bug #48833, bug #48522). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22326 diff changeset	770 resize_dummy = new Fl_Box (5 * status_h, menu_h,
0a2961d5893c Fix calculation of window height in Qt, FLTK (bug #48833, bug #48522). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22326 diff changeset	771 ww - 5 * status_h, hh);
18985 f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	772 // See http://fltk.org/articles.php?L415+I0+T+M1000+P1
f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	773 // for how resizable works
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	774 resizable (resize_dummy);
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	775
14447 c97416a0f657 Allow window managers to group FLTK plot windows (bug #35199) Colin Macdonald <macdonald@maths.ox.ac.uk> parents: 14418 diff changeset	776 // FIXME: The function below is only available in FLTK >= 1.3
c97416a0f657 Allow window managers to group FLTK plot windows (bug #35199) Colin Macdonald <macdonald@maths.ox.ac.uk> parents: 14418 diff changeset	777 // At some point support for FLTK 1.1 will be dropped in Octave.
c97416a0f657 Allow window managers to group FLTK plot windows (bug #35199) Colin Macdonald <macdonald@maths.ox.ac.uk> parents: 14418 diff changeset	778 // At that point this function should be uncommented.
c97416a0f657 Allow window managers to group FLTK plot windows (bug #35199) Colin Macdonald <macdonald@maths.ox.ac.uk> parents: 14418 diff changeset	779 // The current solution is to call xclass() before show() for each window.
c97416a0f657 Allow window managers to group FLTK plot windows (bug #35199) Colin Macdonald <macdonald@maths.ox.ac.uk> parents: 14418 diff changeset	780 // Set WM_CLASS which allows window managers to properly group related
c97416a0f657 Allow window managers to group FLTK plot windows (bug #35199) Colin Macdonald <macdonald@maths.ox.ac.uk> parents: 14418 diff changeset	781 // windows. Otherwise, the class is just "FLTK"
c97416a0f657 Allow window managers to group FLTK plot windows (bug #35199) Colin Macdonald <macdonald@maths.ox.ac.uk> parents: 14418 diff changeset	782 //default_xclass ("Octave");
c97416a0f657 Allow window managers to group FLTK plot windows (bug #35199) Colin Macdonald <macdonald@maths.ox.ac.uk> parents: 14418 diff changeset	783
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	784 uimenu = new fltk_uimenu (0, 0, ww, menu_h);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	785 canvas = new OpenGL_fltk (0, menu_h, ww, hh, number ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	786
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	787 // The bottom toolbar is a composite of "autoscale", "togglegrid",
18985 f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	788 // "panzoom", "rotate", "help", and "status".
f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	789 // Only "status" should be resized.
12621 c99d6785a27e instantiate canvas before menubar Kai Habel <kai.habel@gmx.de> parents: 12565 diff changeset	790
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	791 int toolbar_y = menu_h + hh + 1;
22370 0a2961d5893c Fix calculation of window height in Qt, FLTK (bug #48833, bug #48522). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22326 diff changeset	792 status = new Fl_Output (5 * status_h, toolbar_y,
0a2961d5893c Fix calculation of window height in Qt, FLTK (bug #48833, bug #48522). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22326 diff changeset	793 ww - 5 * status_h, status_h, "");
17131 ea19ea629a09 Proper placement of the menubar, the toolbar and plot canvas. Ben Abbott <bpabbott@mac.com> parents: 17079 diff changeset	794
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	795 status->textcolor (FL_BLACK);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	796 status->color (FL_GRAY);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	797 status->textfont (FL_COURIER);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	798 status->textsize (10);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	799 status->box (FL_ENGRAVED_BOX);
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	800
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	801 autoscale = new Fl_Button (0, toolbar_y, status_h, status_h, "A");
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	802 autoscale->callback (button_callback, static_cast<void*> (this));
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	803 autoscale->tooltip ("Autoscale");
7856 cf672485be43 Add toggle grid button & handle the 'a' & 'g' keys for auto axis and toggle Shai Ayal <shaiay@users.sourceforge.net> parents: 7852 diff changeset	804
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	805 togglegrid = new Fl_Button (status_h, toolbar_y, status_h, status_h, "G");
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	806 togglegrid->callback (button_callback, static_cast<void*> (this));
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	807 togglegrid->tooltip ("Toggle Grid");
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	808
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	809 panzoom = new Fl_Button (2* status_h, toolbar_y, status_h, status_h, "P");
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	810 panzoom->callback (button_callback, static_cast<void*> (this));
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	811 panzoom->tooltip ("Mouse Pan/Zoom");
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10865 diff changeset	812
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	813 rotate = new Fl_Button (3 * status_h, toolbar_y, status_h, status_h, "R");
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	814 rotate->callback (button_callback, static_cast<void*> (this));
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	815 rotate->tooltip ("Mouse Rotate");
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10865 diff changeset	816
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	817 help = new Fl_Button (4 * status_h, toolbar_y, status_h, status_h, "?");
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	818 help->callback (button_callback, static_cast<void*> (this));
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	819 help->tooltip ("Help");
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	820
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	821 end ();
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	822
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	823 set_name ();
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	824 uimenu->add_to_menu (fp);
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	825 if (fp.menubar_is ("none") \|\| ! uimenu->items_to_show ())
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	826 hide_menubar ();
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	827
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	828 update_boundingbox (internal);
12507 41d183070c04 revert changes from 2011-02-26 Konstantinos Poulios <logari81@googlemail.com> parents: 12484 diff changeset	829
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	830 if (fp.is_visible ())
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	831 {
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	832 // FIXME: This code should be removed when Octave drops support
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	833 // for FLTK 1.1. Search for default_xclass in this file to find
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	834 // code that should be uncommented to take its place.
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	835 //
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	836 // Set WM_CLASS which allows window managers to properly group
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	837 // related windows. Otherwise, the class is just "FLTK"
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	838 xclass ("Octave");
18618 c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	839
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	840 show ();
18618 c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	841
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	842 #if defined (HAVE_X_WINDOWS)
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	843 std::string show_gui_msgs
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	844 = octave::sys::env::getenv ("OCTAVE_SHOW_GUI_MESSAGES");
18618 c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	845
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	846 // Installing our handler suppresses the messages.
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	847 if (show_gui_msgs.empty ())
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	848 XSetErrorHandler (xerror_handler);
18618 c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	849 #endif
c644cfa9cb3b suppress all X11 and Qt error messages by default John W. Eaton <jwe@octave.org> parents: 18293 diff changeset	850
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	851 if (fp.get_currentaxes ().ok ())
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	852 show_canvas ();
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	853 else
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	854 hide_canvas ();
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	855 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	856 }
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	857
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	858 ~plot_window (void)
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	859 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	860 this->hide ();
19020 d74cdfc5d5c3 Fix problem that FLTK figure stays visible after "close" Andreas Weber <andy.weber.aw@gmail.com> parents: 19013 diff changeset	861 Fl::check ();
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	862 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	863
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	864 double number (void) { return fp.get___myhandle__ ().value (); }
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	865
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	866 void renumber (double new_number)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	867 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	868 if (! canvas)
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	869 error ("unable to renumber figure");
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	870
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	871 if (canvas->renumber (new_number))
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20957 diff changeset	872 mark_modified ();
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	873 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	874
12449 2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12324 diff changeset	875 void print (const std::string& cmd, const std::string& term)
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	876 {
12449 2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12324 diff changeset	877 canvas->print (cmd, term);
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	878 }
2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	879
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	880 void show_menubar (void)
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	881 {
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	882 uimenu->show ();
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	883 update_toolbar_position ();
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	884 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	885
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	886 void hide_menubar (void)
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	887 {
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	888 uimenu->hide ();
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	889 update_toolbar_position ();
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	890 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	891
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	892 void uimenu_update (const graphics_handle& gh, int id)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	893 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	894 graphics_object uimenu_obj = gh_manager::get_object (gh);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	895
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	896 if (uimenu_obj.valid_object () && uimenu_obj.isa ("uimenu"))
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	897 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	898 uimenu::properties& uimenup =
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	899 dynamic_cast<uimenu::properties&> (uimenu_obj.get_properties ());
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	900 std::string fltk_label = uimenup.get___fltk_label__ ();
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	901 graphics_object fig = uimenu_obj.get_ancestor ("figure");
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	902 figure::properties& figp =
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	903 dynamic_cast<figure::properties&> (fig.get_properties ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	904
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	905 switch (id)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	906 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	907 case base_properties::ID_BEINGDELETED:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	908 uimenu->remove_from_menu (uimenup);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	909 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	910
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	911 case base_properties::ID_VISIBLE:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	912 uimenu->update_visible (uimenup);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	913 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	914
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	915 case uimenu::properties::ID_ACCELERATOR:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	916 uimenu->update_accelerator (uimenup);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	917 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	918
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	919 case uimenu::properties::ID_CALLBACK:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	920 uimenu->update_callback (uimenup);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	921 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	922
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	923 case uimenu::properties::ID_CHECKED:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	924 uimenu->add_to_menu (figp);//rebuilding entire menu
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	925 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	926
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	927 case uimenu::properties::ID_ENABLE:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	928 uimenu->update_enable (uimenup);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	929 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	930
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	931 case uimenu::properties::ID_FOREGROUNDCOLOR:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	932 uimenu->update_foregroundcolor (uimenup);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	933 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	934
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	935 case uimenu::properties::ID_LABEL:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	936 uimenu->add_to_menu (figp);//rebuilding entire menu
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	937 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	938
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	939 case uimenu::properties::ID_POSITION:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	940 uimenu->add_to_menu (figp);//rebuilding entire menu
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	941 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	942
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	943 case uimenu::properties::ID_SEPARATOR:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	944 uimenu->update_seperator (uimenup);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	945 break;
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	946 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	947
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	948 if (uimenu->items_to_show ())
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	949 show_menubar ();
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	950 else
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	951 hide_menubar ();
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	952 }
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	953 }
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	954
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	955 void show_canvas (void)
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	956 {
19454 8dbd55742112 Prevent segfault when video card has insufficient OpenGL support (bug #41747). Andreas Weber <andy.weber.aw@gmail.com> parents: 18618 diff changeset	957 if (! canvas->can_do ())
8dbd55742112 Prevent segfault when video card has insufficient OpenGL support (bug #41747). Andreas Weber <andy.weber.aw@gmail.com> parents: 18618 diff changeset	958 error ("unable to plot due to insufficient OpenGL support");
8dbd55742112 Prevent segfault when video card has insufficient OpenGL support (bug #41747). Andreas Weber <andy.weber.aw@gmail.com> parents: 18618 diff changeset	959 else if (fp.is_visible ())
12903 35ea8b9b2a8e __init_fltk__.cc: show canvas only, when figure is visible (bug #33321) Kai Habel <kai.habel@gmx.de> parents: 12621 diff changeset	960 {
35ea8b9b2a8e __init_fltk__.cc: show canvas only, when figure is visible (bug #33321) Kai Habel <kai.habel@gmx.de> parents: 12621 diff changeset	961 canvas->show ();
35ea8b9b2a8e __init_fltk__.cc: show canvas only, when figure is visible (bug #33321) Kai Habel <kai.habel@gmx.de> parents: 12621 diff changeset	962 canvas->make_current ();
35ea8b9b2a8e __init_fltk__.cc: show canvas only, when figure is visible (bug #33321) Kai Habel <kai.habel@gmx.de> parents: 12621 diff changeset	963 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	964 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	965
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	966 void hide_canvas (void)
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	967 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	968 canvas->hide ();
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	969 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	970
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	971 // Move the toolbar at the bottom of the plot_window.
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	972 // The only reason for moving the toolbar is hiding and
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21732 diff changeset	973 // showing the menubar. All other resizing is done by fltk.
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	974
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	975 void update_toolbar_position ()
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	976 {
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	977 int old_canvas_h = canvas->h ();
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	978
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	979 // keep position fix, change outerposition accordingly
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	980 update_boundingbox (true);
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	981 canvas->resize (0, menu_dy (), w (), old_canvas_h);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	982
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	983 int toolbar_y = canvas->h () + menu_dy () + 1;
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	984 autoscale->position (0, toolbar_y);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	985 togglegrid->position (status_h, toolbar_y);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	986 panzoom->position (2 * status_h, toolbar_y);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	987 rotate->position (3 * status_h, toolbar_y);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	988 help->position (4 * status_h, toolbar_y);
22370 0a2961d5893c Fix calculation of window height in Qt, FLTK (bug #48833, bug #48522). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22326 diff changeset	989 status->resize (5 * status_h, toolbar_y,
0a2961d5893c Fix calculation of window height in Qt, FLTK (bug #48833, bug #48522). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22326 diff changeset	990 w () - 5 * status_h, status_h);
18985 f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	991 init_sizes ();
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	992 redraw ();
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	993 }
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	994
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	995 Matrix outerposition2position (const Matrix& outerpos)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	996 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	997 Matrix pos = outerpos;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	998 pos(1) += menu_dy ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	999 pos(3) -= menu_dy () + status_h + 2;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1000 return pos;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1001 }
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	1002
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1003 Matrix position2outerposition (const Matrix& pos)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1004 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1005 Matrix outerpos = pos;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1006 outerpos(1) -= menu_dy ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1007 outerpos(3) += menu_dy () + status_h + 2;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1008 return outerpos;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1009 }
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1010
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1011 // Called from figure::properties::ID_POSITION if internal = true
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1012 // or ID_OUTERPOSITION if false.
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1013 // (someone has requested a position change with set (h, "position", [...])
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1014 // or set (h, "outerposition", [...])
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1015
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1016 void update_boundingbox (bool internal)
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	1017 {
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1018 Matrix bb = fp.get_boundingbox (internal);
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1019 if (internal)
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1020 bb = position2outerposition (bb);
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1021 resize (bb(0), bb(1), bb(2), bb(3));
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	1022 }
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	1023
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1024 void mark_modified (void)
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1025 {
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	1026 canvas->redraw ();
7840 2c8f693c32fd convert_position not static anymore Shai Ayal <shaiay@sourceforge.net> parents: 7839 diff changeset	1027 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1028
10008 b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1029 void set_name (void)
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1030 {
10009 360de61b2722 corrected redundency in title setting introduced in previous changeset Shai Ayal <shaiay@users.sourceforge.net> parents: 10008 diff changeset	1031 window_label = fp.get_title ();
10008 b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1032 label (window_label.c_str ());
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1033 }
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1034
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1035 private:
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	1036
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	1037 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	1038
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	1039 plot_window (const plot_window&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	1040
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	1041 plot_window& operator = (const plot_window&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11590 diff changeset	1042
9973 cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1043 // window name -- this must exists for the duration of the window's
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1044 // life
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1045 std::string window_label;
9951 d64d15e12e6b print immediately in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9802 diff changeset	1046
d64d15e12e6b print immediately in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9802 diff changeset	1047 // Figure properties.
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	1048 figure::properties& fp;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1049
9951 d64d15e12e6b print immediately in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9802 diff changeset	1050 // Status area height.
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1051 static const int status_h = 20;
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1052
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1053 // Menu height
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	1054 static const int menu_h = 25;
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1055
9951 d64d15e12e6b print immediately in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9802 diff changeset	1056 // Window callback.
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1057 static void window_close (Fl_Widget, void data)
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1058 {
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1059 octave_value_list args;
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1060 args(0) = static_cast<plot_window*> (data)->number ();
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1061 feval ("close", args);
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1062 }
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1063
9951 d64d15e12e6b print immediately in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9802 diff changeset	1064 // Button callbacks.
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1065 static void button_callback (Fl_Widget* ww, void* data)
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1066 {
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1067 static_cast<plot_window*> (data)->button_press (ww, data);
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1068 }
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1069
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1070 void button_press (Fl_Widget* widg, void*)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1071 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1072 if (widg == autoscale)
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1073 axis_auto ();
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1074 else if (widg == togglegrid)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1075 toggle_grid ();
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1076 else if (widg == panzoom)
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1077 fp.set___mouse_mode__ ("pan");
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1078 else if (widg == rotate)
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1079 fp.set___mouse_mode__ ("rotate");
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1080 else if (widg == help)
9060 de7cef39f505 fltk_backend.cc: don't pass arbitrary string as format John W. Eaton <jwe@octave.org> parents: 8333 diff changeset	1081 fl_message ("%s", help_text);
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1082 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1083
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1084 void set_on_ax_obj (const std::string& name, const std::string& value)
52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1085 {
52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1086 // ax_obj is the last clicked axes object
21643 9191c24fb329 Fix autoscale affecting legend axes objects (bug #47765). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20181 diff changeset	1087 if (ax_obj && ax_obj.isa ("axes")
9191c24fb329 Fix autoscale affecting legend axes objects (bug #47765). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20181 diff changeset	1088 && ax_obj.get_properties ().get_tag () != "legend"
9191c24fb329 Fix autoscale affecting legend axes objects (bug #47765). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20181 diff changeset	1089 && ax_obj.get_properties ().get_tag () != "colorbar")
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1090 {
18985 f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	1091 axes::properties& ap =
f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	1092 dynamic_cast<axes::properties&>(ax_obj.get_properties ());
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1093 ap.set (name, value);
52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1094 }
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1095 else // no axes object clicked so far, take currentaxes
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1096 {
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1097 graphics_handle gh = fp.get_currentaxes ();
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1098 if (gh.ok ())
52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1099 {
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1100 graphics_object go = gh_manager::get_object (gh);
18985 f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	1101 axes::properties& ap =
f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	1102 dynamic_cast<axes::properties&>(go.get_properties ());
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1103 ap.set (name, value);
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1104 }
52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1105 }
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1106 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1107
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1108 fltk_uimenu* uimenu;
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1109 OpenGL_fltk* canvas;
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1110 Fl_Button* autoscale;
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1111 Fl_Button* togglegrid;
10792 91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1112 Fl_Button* panzoom;
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1113 Fl_Button* rotate;
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1114 Fl_Button* help;
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1115 Fl_Output* status;
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	1116 Fl_Box* resize_dummy;
14020 caf69ec5b94c eliminate static data from fltk plot_window member function John W. Eaton <jwe@octave.org> parents: 14014 diff changeset	1117 graphics_object ax_obj;
caf69ec5b94c eliminate static data from fltk plot_window member function John W. Eaton <jwe@octave.org> parents: 14014 diff changeset	1118 int pos_x;
caf69ec5b94c eliminate static data from fltk plot_window member function John W. Eaton <jwe@octave.org> parents: 14014 diff changeset	1119 int pos_y;
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1120
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1121 void axis_auto (void)
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	1122 {
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1123 octave_value_list args;
18968 0257a936dc4a Fix FLTK redraw and event issue Andreas Weber <andy.weber.aw@gmail.com> parents: 18966 diff changeset	1124 if (fp.get_currentaxes ().ok ())
0257a936dc4a Fix FLTK redraw and event issue Andreas Weber <andy.weber.aw@gmail.com> parents: 18966 diff changeset	1125 {
0257a936dc4a Fix FLTK redraw and event issue Andreas Weber <andy.weber.aw@gmail.com> parents: 18966 diff changeset	1126 args(0) = fp.get_currentaxes ().as_octave_value ();
0257a936dc4a Fix FLTK redraw and event issue Andreas Weber <andy.weber.aw@gmail.com> parents: 18966 diff changeset	1127 args(1) = "auto";
0257a936dc4a Fix FLTK redraw and event issue Andreas Weber <andy.weber.aw@gmail.com> parents: 18966 diff changeset	1128 feval ("axis", args);
0257a936dc4a Fix FLTK redraw and event issue Andreas Weber <andy.weber.aw@gmail.com> parents: 18966 diff changeset	1129 mark_modified ();
0257a936dc4a Fix FLTK redraw and event issue Andreas Weber <andy.weber.aw@gmail.com> parents: 18966 diff changeset	1130 }
7852 4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	1131 }
4dc3e0ff730a Added zoombox (mouse button 1) & autoscale (button marked A and mouse button 3) Shai Ayal <shaiay@users.sourceforge.net> parents: 7842 diff changeset	1132
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1133 void toggle_grid (void)
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1134 {
9974 118158f10628 fix fltk backend window buttons Shai Ayal <shaiay@users.sourceforge.net> parents: 9973 diff changeset	1135 octave_value_list args;
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1136 if (fp.get_currentaxes ().ok ())
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1137 args(0) = fp.get_currentaxes ().as_octave_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1138
9974 118158f10628 fix fltk backend window buttons Shai Ayal <shaiay@users.sourceforge.net> parents: 9973 diff changeset	1139 feval ("grid", args);
7856 cf672485be43 Add toggle grid button & handle the 'a' & 'g' keys for auto axis and toggle Shai Ayal <shaiay@users.sourceforge.net> parents: 7852 diff changeset	1140 mark_modified ();
cf672485be43 Add toggle grid button & handle the 'a' & 'g' keys for auto axis and toggle Shai Ayal <shaiay@users.sourceforge.net> parents: 7852 diff changeset	1141 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1142
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1143 void pixel2pos (const graphics_handle& ax, int px, int py, double& xx,
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1144 double& yy) const
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1145 {
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18618 diff changeset	1146 pixel2pos (gh_manager::get_object (ax), px, py, xx, yy);
9640 110863cd3371 more bug fixes in fltk zoom shaiay@users.sourceforge.net parents: 9455 diff changeset	1147 }
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1148
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1149 void pixel2pos (graphics_object ax, int px, int py, double& xx,
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1150 double& yy) const
9640 110863cd3371 more bug fixes in fltk zoom shaiay@users.sourceforge.net parents: 9455 diff changeset	1151 {
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1152 if (ax && ax.isa ("axes"))
7842 1357bcae6e29 added pixel<->coord transform in axes and use it for display of cursor Shai Ayal <shaiay@users.sourceforge.net> parents: 7841 diff changeset	1153 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1154 axes::properties& ap =
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1155 dynamic_cast<axes::properties&> (ax.get_properties ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1156 ColumnVector pp = ap.pixel2coord (px, py);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1157 xx = pp(0);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1158 yy = pp(1);
7842 1357bcae6e29 added pixel<->coord transform in axes and use it for display of cursor Shai Ayal <shaiay@users.sourceforge.net> parents: 7841 diff changeset	1159 }
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1160 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1161
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18618 diff changeset	1162 graphics_handle pixel2axes_or_ca (int px, int py)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1163 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1164 Matrix kids = fp.get_children ();
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20181 diff changeset	1165 int len = kids.numel ();
9442 2d73b19c5507 improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	1166
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	1167 for (int k = 0; k < len; k++)
9443 8f9d8776d11c undo previous commit John W. Eaton <jwe@octave.org> parents: 9442 diff changeset	1168 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1169 graphics_handle hnd = gh_manager::lookup (kids(k));
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	1170
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1171 if (hnd.ok ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1172 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1173 graphics_object kid = gh_manager::get_object (hnd);
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	1174
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1175 if (kid.valid_object () && kid.isa ("axes"))
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1176 {
19296 8ba8f3d22189 __init_fltk__.cc: Allow selection of axes from whole plot area Andreas Weber <andy.weber.aw@gmail.com> parents: 19152 diff changeset	1177 Matrix bb = kid.get_properties ().get_boundingbox (false);
7842 1357bcae6e29 added pixel<->coord transform in axes and use it for display of cursor Shai Ayal <shaiay@users.sourceforge.net> parents: 7841 diff changeset	1178
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1179 if (bb(0) <= px && px < (bb(0)+bb(2))
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1180 && bb(1) <= py && py < (bb(1)+bb(3)))
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1181 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1182 return hnd;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1183 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1184 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1185 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1186 }
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	1187 return fp.get_currentaxes ();
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1188 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1189
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1190 void pixel2status (const graphics_handle& ax, int px0, int py0,
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1191 int px1 = -1, int py1 = -1)
9640 110863cd3371 more bug fixes in fltk zoom shaiay@users.sourceforge.net parents: 9455 diff changeset	1192 {
110863cd3371 more bug fixes in fltk zoom shaiay@users.sourceforge.net parents: 9455 diff changeset	1193 pixel2status (gh_manager::get_object (ax), px0, py0, px1, py1);
110863cd3371 more bug fixes in fltk zoom shaiay@users.sourceforge.net parents: 9455 diff changeset	1194 }
9802 9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	1195
9b4a301d88ed fix for fltk zoom box problems Shai Ayal <shaiay@users.sourceforge.net> parents: 9798 diff changeset	1196 void pixel2status (graphics_object ax, int px0, int py0,
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1197 int px1 = -1, int py1 = -1)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1198 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1199 double x0, y0, x1, y1;
21723 bae585228161 use namespace for numeric_limits John W. Eaton <jwe@octave.org> parents: 21721 diff changeset	1200 x0 = y0 = x1 = y1 = octave::numeric_limits<double>::NaN ();
7842 1357bcae6e29 added pixel<->coord transform in axes and use it for display of cursor Shai Ayal <shaiay@users.sourceforge.net> parents: 7841 diff changeset	1201 std::stringstream cbuf;
10792 91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1202 cbuf.precision (4);
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1203 cbuf.width (6);
9640 110863cd3371 more bug fixes in fltk zoom shaiay@users.sourceforge.net parents: 9455 diff changeset	1204 pixel2pos (ax, px0, py0, x0, y0);
7842 1357bcae6e29 added pixel<->coord transform in axes and use it for display of cursor Shai Ayal <shaiay@users.sourceforge.net> parents: 7841 diff changeset	1205 cbuf << "[" << x0 << ", " << y0 << "]";
1357bcae6e29 added pixel<->coord transform in axes and use it for display of cursor Shai Ayal <shaiay@users.sourceforge.net> parents: 7841 diff changeset	1206 if (px1 >= 0)
1357bcae6e29 added pixel<->coord transform in axes and use it for display of cursor Shai Ayal <shaiay@users.sourceforge.net> parents: 7841 diff changeset	1207 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1208 pixel2pos (ax, px1, py1, x1, y1);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	1209 cbuf << " -> ["<< x1 << ", " << y1 << "]";
7842 1357bcae6e29 added pixel<->coord transform in axes and use it for display of cursor Shai Ayal <shaiay@users.sourceforge.net> parents: 7841 diff changeset	1210 }
7840 2c8f693c32fd convert_position not static anymore Shai Ayal <shaiay@sourceforge.net> parents: 7839 diff changeset	1211
7842 1357bcae6e29 added pixel<->coord transform in axes and use it for display of cursor Shai Ayal <shaiay@users.sourceforge.net> parents: 7841 diff changeset	1212 status->value (cbuf.str ().c_str ());
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1213 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1214
10792 91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1215 void view2status (graphics_object ax)
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1216 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1217 if (ax && ax.isa ("axes"))
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1218 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1219 axes::properties& ap =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1220 dynamic_cast<axes::properties&> (ax.get_properties ());
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1221 std::stringstream cbuf;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1222 cbuf.precision (4);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1223 cbuf.width (6);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1224 Matrix v (1,2,0);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1225 v = ap.get ("view").matrix_value ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1226 cbuf << "[azimuth: " << v(0) << ", elevation: " << v(1) << "]";
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1227
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1228 status->value (cbuf.str ().c_str ());
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1229 }
10792 91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1230 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1231
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1232 void set_currentpoint (int px, int py)
9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1233 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	1234 if (! fp.is_beingdeleted ())
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1235 {
19028 c419e5487d0d Fix set_currentpoint in FLTK that figures units property is respected. Andreas Weber <andy.weber.aw@gmail.com> parents: 19027 diff changeset	1236 Matrix pos = fp.map_from_boundingbox (px, py);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1237 fp.set_currentpoint (pos);
17144 88616c872933 Set the root property "currentfigure", and figure property "currentaxes". Ben Abbott <bpabbott@mac.com> parents: 17143 diff changeset	1238 graphics_object robj = gh_manager::get_object (fp.get_parent ());
88616c872933 Set the root property "currentfigure", and figure property "currentaxes". Ben Abbott <bpabbott@mac.com> parents: 17143 diff changeset	1239 root_figure::properties& rp =
88616c872933 Set the root property "currentfigure", and figure property "currentaxes". Ben Abbott <bpabbott@mac.com> parents: 17143 diff changeset	1240 dynamic_cast<root_figure::properties&> (robj.get_properties ());
88616c872933 Set the root property "currentfigure", and figure property "currentaxes". Ben Abbott <bpabbott@mac.com> parents: 17143 diff changeset	1241 rp.set_currentfigure (fp.get___myhandle__ ().value ());
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1242 }
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1243 }
9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1244
9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1245 void set_axes_currentpoint (graphics_object ax, int px, int py)
9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1246 {
19027 0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1247 if (ax.valid_object () && ax.isa ("axes"))
10593 26d51c6e1c4c fixed fltk_backend bug when clicking on empty figure Shai Ayal <shaiay@users.sourceforge.net> parents: 10555 diff changeset	1248 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1249 axes::properties& ap =
10593 26d51c6e1c4c fixed fltk_backend bug when clicking on empty figure Shai Ayal <shaiay@users.sourceforge.net> parents: 10555 diff changeset	1250 dynamic_cast<axes::properties&> (ax.get_properties ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1251
19027 0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1252 Matrix x_zlim = ap.get_transform_zlim ();
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1253 Matrix pos (2, 3, 0.0);
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1254
19027 0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1255 // front point (nearest to the viewer)
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1256 ColumnVector tmp = ap.get_transform ().untransform (px, py, x_zlim(0));
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1257 pos(0,0) = tmp(0);
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1258 pos(0,1) = tmp(1);
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1259 pos(0,2) = tmp(2);
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1260
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1261 // back point (furthest from the viewer)
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1262 tmp = ap.get_transform ().untransform (px, py, x_zlim(1));
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1263 pos(1,0) = tmp(0);
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1264 pos(1,1) = tmp(1);
0ee9daa71273 Fix axes property "currentpoint" for FLTK, extend documentation Andreas Weber <andy.weber.aw@gmail.com> parents: 19021 diff changeset	1265 pos(1,2) = tmp(2);
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1266
10593 26d51c6e1c4c fixed fltk_backend bug when clicking on empty figure Shai Ayal <shaiay@users.sourceforge.net> parents: 10555 diff changeset	1267 ap.set_currentpoint (pos);
21643 9191c24fb329 Fix autoscale affecting legend axes objects (bug #47765). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20181 diff changeset	1268 if (ap.get_tag () != "legend" && ap.get_tag () != "colorbar")
9191c24fb329 Fix autoscale affecting legend axes objects (bug #47765). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20181 diff changeset	1269 fp.set_currentaxes (ap.get___myhandle__ ().value ());
10593 26d51c6e1c4c fixed fltk_backend bug when clicking on empty figure Shai Ayal <shaiay@users.sourceforge.net> parents: 10555 diff changeset	1270 }
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1271 }
9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1272
17213 4407606d0939 FLTK toolkit: Simplify conditionals for uimenu presence. Ben Abbott <bpabbott@mac.com> parents: 17201 diff changeset	1273 int menu_dy ()
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1274 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1275 if (uimenu->is_visible ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1276 return menu_h;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1277 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1278 return 0;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1279 }
17213 4407606d0939 FLTK toolkit: Simplify conditionals for uimenu presence. Ben Abbott <bpabbott@mac.com> parents: 17201 diff changeset	1280
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1281 octave_scalar_map format_key_event (int e_key, const char* e_text, int e_state)
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1282 {
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1283 octave_scalar_map evt;
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1284
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1285 evt.assign ("Character", octave_value (e_text));
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1286 evt.assign ("Modifier", octave_value (modifier2cell (e_state)));
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1287
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1288 std::string key_str;
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1289 std::ostringstream tmp_str;
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1290
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1291 if (e_key == FL_Escape)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1292 key_str = "escape";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1293 else if (e_key == FL_Tab)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1294 key_str = "tab";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1295 else if (e_key == FL_Caps_Lock)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1296 key_str = "capslock";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1297 else if (e_key == FL_Shift_L \|\| e_key == FL_Shift_R)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1298 key_str = "shift";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1299 else if (e_key == FL_Control_L \|\| e_key == FL_Control_R)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1300 key_str = "control";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1301 else if (e_key == FL_Meta_L \|\| e_key == FL_Meta_R)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1302 key_str = "windows";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1303 else if (e_key == FL_Alt_L \|\| e_key == FL_Alt_R)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1304 key_str = "alt";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1305 else if (e_key == 32)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1306 key_str = "space";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1307 else if (e_key == FL_Enter)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1308 key_str = "return";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1309 else if (e_key == FL_BackSpace)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1310 key_str = "backspace";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1311 else if (e_key == FL_Print)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1312 key_str = "printscreen";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1313 else if (e_key == FL_Pause)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1314 key_str = "pause";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1315 else if (e_key == FL_Home)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1316 key_str = "home";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1317 else if (e_key == FL_End)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1318 key_str = "end";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1319 else if (e_key == FL_Insert)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1320 key_str = "insert";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1321 else if (e_key == FL_Page_Up)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1322 key_str = "pageup";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1323 else if (e_key == FL_Delete)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1324 key_str = "delete";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1325 else if (e_key == FL_Page_Down)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1326 key_str = "pagedown";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1327 else if (e_key == FL_Left)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1328 key_str = "leftarrow";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1329 else if (e_key == FL_Up)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1330 key_str = "uparrow";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1331 else if (e_key == FL_Right)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1332 key_str = "rightarrow";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1333 else if (e_key == FL_Down)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1334 key_str = "downarrow";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1335 else if (e_key == FL_Num_Lock)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1336 key_str = "numlock";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1337 else if (e_key == 0xffaf)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1338 key_str = "divide";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1339 else if (e_key == 0xffaa)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1340 key_str = "multiply";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1341 else if (e_key == 0xffad)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1342 key_str = "subtract";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1343 else if (e_key == 0xffab)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1344 key_str = "add";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1345 else if (e_key == 0xff8d)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1346 key_str = "return";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1347 else if (e_key == 0xffac)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1348 key_str = "separator";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1349 else if (e_key >= 0xffb0 && e_key <= 0xffb9)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1350 {
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1351 tmp_str << "numpad" << (e_key - 0xffb0);
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1352 key_str = tmp_str.str ();
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1353 }
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1354 else if (e_key >= (FL_F + 1) && e_key <= (FL_F + 12))
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1355 {
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1356 tmp_str << "f" << (e_key - FL_F);
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1357 key_str = tmp_str.str ();
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1358 }
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1359 else if (e_key == ',')
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1360 key_str = "comma";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1361 else if (e_key == '.')
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1362 key_str = "period";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1363 else if (e_key == '-')
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1364 key_str = "hyphen";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1365 else if (e_key == '^' \|\| e_key == '+' \|\| e_key == '#'
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1366 \|\| e_key == '<' \|\| e_key == 0xfe03 /AltGr/)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1367 key_str = "0";
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1368 else if (isalnum (e_key))
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1369 key_str = std::tolower (e_key);
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1370 else if (isprint (e_text[0]))
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1371 key_str = "0";
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1372
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1373 evt.assign ("Key", octave_value (key_str));
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1374 return evt;
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1375 }
9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1376
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1377 Cell modifier2cell (int e_state)
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1378 {
9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1379 string_vector mod;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1380
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1381 if (e_state & FL_SHIFT)
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1382 mod.append (std::string ("shift"));
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1383 if (e_state & FL_CTRL)
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1384 mod.append (std::string ("control"));
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1385 if (e_state & FL_ALT)
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1386 mod.append (std::string ("alt"));
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1387 if (e_state & FL_COMMAND)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1388 mod.append (std::string ("command"));
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1389 return Cell (mod);
9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1390 }
9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1391
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	1392 void resize (int xx, int yy, int ww, int hh)
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1393 {
10555 a80207303549 style fixes John W. Eaton <jwe@octave.org> parents: 10553 diff changeset	1394 Fl_Window::resize (xx, yy, ww, hh);
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1395
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1396 Matrix bb (1, 4);
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1397 bb(0) = xx;
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1398 bb(1) = yy;
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1399 bb(2) = ww;
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1400 bb(3) = hh;
14357 e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14314 diff changeset	1401
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1402 // update outerposition
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1403 fp.set_boundingbox (bb, false, false);
17131 ea19ea629a09 Proper placement of the menubar, the toolbar and plot canvas. Ben Abbott <bpabbott@mac.com> parents: 17079 diff changeset	1404
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1405 // update position
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1406 fp.set_boundingbox (outerposition2position (bb), true, false);
7839 71eb1793f0db fltk_backend can now handle figure.position changes Shai Ayal <shaiay@sourceforge.net> parents: 7834 diff changeset	1407 }
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1408
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1409 bool pan_enabled (void)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1410 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1411 // Getting pan mode property:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1412 octave_value ov_pm = fp.get___pan_mode__ ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1413
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1414 octave_scalar_map pm = ov_pm.scalar_map_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1415
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1416 return pm.contents ("Enable").string_value () == "on";
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1417 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1418
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1419 std::string pan_mode (void)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1420 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1421 // Getting pan mode property:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1422 octave_value ov_pm = fp.get___pan_mode__ ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1423
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1424 octave_scalar_map pm = ov_pm.scalar_map_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1425
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1426 return pm.contents ("Motion").string_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1427 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1428
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1429 bool rotate_enabled (void)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1430 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1431 // Getting rotate mode property:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1432 octave_value ov_rm = fp.get___rotate_mode__ ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1433
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1434 octave_scalar_map rm = ov_rm.scalar_map_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1435
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1436 return rm.contents ("Enable").string_value () == "on";
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1437 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1438
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1439 int handle (int event)
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1440 {
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1441 if (event == FL_FOCUS)
b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1442 return 1;
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1443
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1444 graphics_handle gh;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1445
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20845 diff changeset	1446 if (! fp.is_beingdeleted ())
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1447 {
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1448 //std::cout << "plot_window::handle event = " << fl_eventnames[event] << std::endl;
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1449
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1450 // FLTK resends keyboard events with flipped case if all
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1451 // widgets rejects the event.
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1452 // See Event Propagation http://www.fltk.org/doc-1.3/events.html
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1453 static bool key_resent_detected = false;
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1454
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1455 switch (event)
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1456 {
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1457 case FL_SHORTCUT:
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1458 {
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1459 // check if it a resent event with switched case
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1460 static int last_event_key = 0;
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1461 static char last_event_text = 0;
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1462
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1463 int e_key = Fl::event_key ();
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1464 char e_text = Fl::event_text ()[0];
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1465 key_resent_detected = (e_key == last_event_key
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1466 && std::tolower (last_event_text) == std::tolower (e_text)
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1467 && ((islower (last_event_text) && isupper (e_text))
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1468 \|\| (isupper (last_event_text) && islower (e_text))));
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1469
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1470 last_event_key = e_key;
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1471 last_event_text = e_text;
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1472 }
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1473 break;
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1474
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1475 case FL_KEYDOWN:
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1476 {
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1477 int e_key = Fl::event_key ();
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1478 const char *e_text = Fl::event_text ();
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1479 int e_state = Fl::event_state ();
20118 144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1480 octave_scalar_map evt = format_key_event (e_key, e_text, e_state);
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1481
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1482 fp.set_currentcharacter (std::string (e_text));
20118 144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1483
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1484 if (! fp.get_keypressfcn ().is_empty ()
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1485 && (evt.contents ("Key").length () > 0))
20118 144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1486 {
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1487 // Update CurrentPoint before callback
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1488 if (Fl::event_inside (canvas))
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1489 {
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1490 pos_x = Fl::event_x ();
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1491 pos_y = Fl::event_y () - menu_dy ();
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1492
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1493 set_currentpoint (pos_x, pos_y);
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1494
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1495 gh = pixel2axes_or_ca (pos_x, pos_y);
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1496
20118 144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1497 if (gh.ok ())
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1498 {
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1499 ax_obj = gh_manager::get_object (gh);
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1500 set_axes_currentpoint (ax_obj, pos_x, pos_y);
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1501 }
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	1502 }
20118 144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1503
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1504 fp.execute_keypressfcn (evt);
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1505 }
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1506
144498565de9 Return correct x,y coordinates for keystroke with ginput in FLTK (bug #44834). Rik <rik@octave.org> parents: 20108 diff changeset	1507 // Handle special keys used in toolbar
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1508 switch (e_key)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1509 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1510 case 'a':
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1511 case 'A':
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1512 axis_auto ();
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1513 return 1;
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1514
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1515 case 'g':
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1516 case 'G':
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1517 toggle_grid ();
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1518 return 1;
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1519
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1520 case 'p':
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1521 case 'P':
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1522 fp.set___mouse_mode__ ("pan");
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1523 return 1;
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1524
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1525 case 'r':
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1526 case 'R':
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19657 diff changeset	1527 fp.set___mouse_mode__ ("rotate");
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1528 return 1;
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1529 }
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1530 }
10792 91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1531 break;
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1532
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1533 case FL_KEYUP:
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1534 {
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1535 int e_key = Fl::event_key ();
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1536 int e_state = Fl::event_state ();
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1537 octave_scalar_map evt;
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1538 if (key_resent_detected && Fl::event_length () == 1)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1539 {
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1540 // FLTK flipped the case of Fl::event_text because no
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1541 // widget wanted the FL_KEYDOWN event.
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1542 char tmp_e_text[2];
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1543 tmp_e_text[0] = Fl::event_text ()[0];
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1544 tmp_e_text[1] = 0;
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1545 // Undo the case flip
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1546 if (std::islower (tmp_e_text[0]))
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1547 tmp_e_text[0] = std::toupper (tmp_e_text[0]);
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1548 else
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1549 tmp_e_text[0] = std::tolower (tmp_e_text[0]);
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1550 evt = format_key_event (e_key, tmp_e_text, e_state);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1551 }
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1552 else
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1553 {
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1554 const char *e_text = Fl::event_text ();
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1555 evt = format_key_event (e_key, e_text, e_state);
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1556 }
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1557
20119 f46f6d906654 Avoid unnecessarily calling graphics callbacks in FLTK. Rik <rik@octave.org> parents: 20118 diff changeset	1558 if (! fp.get_keyreleasefcn ().is_empty ()
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1559 && (evt.contents ("Key").length () > 0))
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1560 fp.execute_keyreleasefcn (evt);
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	1561 return 1;
10517 9cdd6c8c05a4 [mq]: fltk_cb Shai Ayal <shaiay@users.sourceforge.net> parents: 10346 diff changeset	1562 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1563 break;
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1564 }
7856 cf672485be43 Add toggle grid button & handle the 'a' & 'g' keys for auto axis and toggle Shai Ayal <shaiay@users.sourceforge.net> parents: 7852 diff changeset	1565
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1566 // Events we only handle if they are in the canvas area.
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1567 if (Fl::event_inside (canvas))
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1568 switch (event)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1569 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1570 case FL_MOVE:
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1571 pixel2status (pixel2axes_or_ca (Fl::event_x (),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1572 Fl::event_y () - menu_dy ()),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1573 Fl::event_x (), Fl::event_y () - menu_dy ());
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1574 return 1;
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1575
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1576 case FL_PUSH:
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1577 pos_x = Fl::event_x ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1578 pos_y = Fl::event_y () - menu_dy ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1579
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1580 set_currentpoint (pos_x, pos_y);
19021 9609f345823e Implement figure property SelectionType for FLTK Andreas Weber <andy.weber.aw@gmail.com> parents: 19020 diff changeset	1581
19998 91e2212b060d Fix FLTK SelectionType for Middle Button and double clicks (bug #44669). Rik <rik@octave.org> parents: 19976 diff changeset	1582 if (Fl::event_clicks ())
91e2212b060d Fix FLTK SelectionType for Middle Button and double clicks (bug #44669). Rik <rik@octave.org> parents: 19976 diff changeset	1583 fp.set_selectiontype ("open");
91e2212b060d Fix FLTK SelectionType for Middle Button and double clicks (bug #44669). Rik <rik@octave.org> parents: 19976 diff changeset	1584 else if (Fl::event_button () == FL_MIDDLE_MOUSE
91e2212b060d Fix FLTK SelectionType for Middle Button and double clicks (bug #44669). Rik <rik@octave.org> parents: 19976 diff changeset	1585 \|\| (Fl::event_button () == FL_LEFT_MOUSE
91e2212b060d Fix FLTK SelectionType for Middle Button and double clicks (bug #44669). Rik <rik@octave.org> parents: 19976 diff changeset	1586 && Fl::event_shift ()))
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1587 fp.set_selectiontype ("extend");
19998 91e2212b060d Fix FLTK SelectionType for Middle Button and double clicks (bug #44669). Rik <rik@octave.org> parents: 19976 diff changeset	1588 else if (Fl::event_button () == FL_RIGHT_MOUSE
91e2212b060d Fix FLTK SelectionType for Middle Button and double clicks (bug #44669). Rik <rik@octave.org> parents: 19976 diff changeset	1589 \|\| (Fl::event_button () == FL_LEFT_MOUSE
91e2212b060d Fix FLTK SelectionType for Middle Button and double clicks (bug #44669). Rik <rik@octave.org> parents: 19976 diff changeset	1590 && Fl::event_ctrl ()))
19976 f902855f870a Fix right click zoom in fltk after cset f134ee404041 (bug #44522) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19946 diff changeset	1591 fp.set_selectiontype ("alt");
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1592 else
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1593 fp.set_selectiontype ("normal");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1594
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1595 gh = pixel2axes_or_ca (pos_x, pos_y);
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1596
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1597 if (gh.ok ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1598 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1599 ax_obj = gh_manager::get_object (gh);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1600 set_axes_currentpoint (ax_obj, pos_x, pos_y);
19946 4910b70d7328 Ensure correct coordinates are available in windowbuttondownfcn callback Mike Miller <mtmiller@octave.org> parents: 19891 diff changeset	1601 }
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	1602
19946 4910b70d7328 Ensure correct coordinates are available in windowbuttondownfcn callback Mike Miller <mtmiller@octave.org> parents: 19891 diff changeset	1603 // Ensure windowbuttondownfcn is called after currentpoint
4910b70d7328 Ensure correct coordinates are available in windowbuttondownfcn callback Mike Miller <mtmiller@octave.org> parents: 19891 diff changeset	1604 // is updated but before calling buttondownfcn.
20119 f46f6d906654 Avoid unnecessarily calling graphics callbacks in FLTK. Rik <rik@octave.org> parents: 20118 diff changeset	1605 if (! fp.get_windowbuttondownfcn ().is_empty ())
19946 4910b70d7328 Ensure correct coordinates are available in windowbuttondownfcn callback Mike Miller <mtmiller@octave.org> parents: 19891 diff changeset	1606 fp.execute_windowbuttondownfcn (Fl::event_button ());
4910b70d7328 Ensure correct coordinates are available in windowbuttondownfcn callback Mike Miller <mtmiller@octave.org> parents: 19891 diff changeset	1607
4910b70d7328 Ensure correct coordinates are available in windowbuttondownfcn callback Mike Miller <mtmiller@octave.org> parents: 19891 diff changeset	1608 if (gh.ok ())
4910b70d7328 Ensure correct coordinates are available in windowbuttondownfcn callback Mike Miller <mtmiller@octave.org> parents: 19891 diff changeset	1609 {
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1610 int ndim = calc_dimensions (ax_obj);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1611
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1612 if (ndim == 3)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1613 rotate->activate ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1614 else // ndim == 2
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1615 rotate->deactivate ();
10792 91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10593 diff changeset	1616
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1617 fp.set_currentobject (ax_obj.get_handle ().value ());
19013 60e54be64f37 Fix ginput for FLTK toolkit Andreas Weber <andy.weber.aw@gmail.com> parents: 19012 diff changeset	1618
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1619 base_properties& props = ax_obj.get_properties ();
20119 f46f6d906654 Avoid unnecessarily calling graphics callbacks in FLTK. Rik <rik@octave.org> parents: 20118 diff changeset	1620 if (! props.get_buttondownfcn ().is_empty ())
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1621 props.execute_buttondownfcn (Fl::event_button ());
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1622
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1623 return 1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1624 }
20119 f46f6d906654 Avoid unnecessarily calling graphics callbacks in FLTK. Rik <rik@octave.org> parents: 20118 diff changeset	1625 else if (! fp.get_buttondownfcn ().is_empty ())
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1626 fp.execute_buttondownfcn (Fl::event_button ());
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	1627
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1628 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1629
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1630 case FL_DRAG:
20119 f46f6d906654 Avoid unnecessarily calling graphics callbacks in FLTK. Rik <rik@octave.org> parents: 20118 diff changeset	1631 if (! fp.get_windowbuttonmotionfcn ().is_empty ())
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1632 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1633 set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ());
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1634 fp.execute_windowbuttonmotionfcn ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1635 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1636
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1637 if (Fl::event_button () == 1)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1638 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1639 if (ax_obj && ax_obj.isa ("axes"))
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1640 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1641 axes::properties& ap =
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1642 dynamic_cast<axes::properties&>
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1643 (ax_obj.get_properties ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1644
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1645 // Don't pan or rotate legend
21641 6459479840ba Restore rotate capability for FLTK toolkit (bug #47698). Rik <rik@octave.org> parents: 21575 diff changeset	1646 if (ap.get_tag () != "legend")
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1647 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1648 if (rotate_enabled ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1649 view2status (ax_obj);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1650 else
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1651 pixel2status (ax_obj, pos_x, pos_y,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1652 Fl::event_x (),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1653 Fl::event_y () - menu_dy ());
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1654
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1655 double x0, y0, x1, y1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1656 Matrix pos = fp.get_boundingbox (true);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1657 pixel2pos (ax_obj, pos_x, pos_y, x0, y0);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1658 pixel2pos (ax_obj, Fl::event_x (),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1659 Fl::event_y () - menu_dy (),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1660 x1, y1);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1661
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1662 if (pan_enabled ())
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	1663 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	1664 std::string mode = pan_mode ();
19891 fa290c42197e Implement x- and y-only panning for FLTK (bug #44408). Rik <rik@octave.org> parents: 19872 diff changeset	1665
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	1666 ap.translate_view (mode, x0, x1, y0, y1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	1667 }
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1668 else if (rotate_enabled ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1669 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1670 double daz, del;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1671 daz = (Fl::event_x () - pos_x) / pos(2) * 360;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1672 del = (Fl::event_y () - menu_dy () - pos_y)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1673 / pos(3) * 360;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1674 ap.rotate_view (del, daz);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1675 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1676 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1677 else
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1678 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1679 // move the position of the legend
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1680 Matrix pos = ap.get_position ().matrix_value ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1681 pos(0) += double (Fl::event_x () - pos_x)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1682 / canvas->w ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1683 pos(1) -= double (Fl::event_y () - menu_dy () - pos_y)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1684 / canvas->h ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1685 ap.set_position (pos);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1686 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1687
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1688 pos_x = Fl::event_x ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1689 pos_y = Fl::event_y () - menu_dy ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1690 mark_modified ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1691 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1692 return 1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1693 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1694 else if (Fl::event_button () == 3)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1695 {
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1696 pixel2status (ax_obj, pos_x, pos_y,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1697 Fl::event_x (), Fl::event_y () - menu_dy ());
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1698 Matrix zoom_box (1,4,0);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1699 zoom_box (0) = pos_x;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1700 zoom_box (1) = pos_y;
21568 3d60ed163b70 maint: Eliminate bad spacing around '='. Rik <rik@octave.org> parents: 21562 diff changeset	1701 zoom_box (2) = Fl::event_x ();
3d60ed163b70 maint: Eliminate bad spacing around '='. Rik <rik@octave.org> parents: 21562 diff changeset	1702 zoom_box (3) = Fl::event_y () - menu_dy ();
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1703 canvas->set_zoom_box (zoom_box);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1704 canvas->zoom (true);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1705 mark_modified ();
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1706 return 1;
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1707 }
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1708
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1709 break;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1710
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1711 case FL_MOUSEWHEEL:
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1712 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1713 graphics_object ax =
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1714 gh_manager::get_object (pixel2axes_or_ca (Fl::event_x (),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1715 Fl::event_y ()
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1716 - menu_dy ()));
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1717 if (ax && ax.isa ("axes"))
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1718 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1719 axes::properties& ap =
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1720 dynamic_cast<axes::properties&> (ax.get_properties ());
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1721
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1722 // Control how fast to zoom when using scroll wheel.
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1723 double wheel_zoom_speed = ap.get_mousewheelzoom ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1724
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1725 // Determine if we're zooming in or out.
19867 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	1726 const double factor = (Fl::event_dy () < 0
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	1727 ? 1 / (1.0 - wheel_zoom_speed)
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	1728 : 1.0 - wheel_zoom_speed);
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	1729
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1730 // Get the point we're zooming about.
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1731 double x1, y1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1732 pixel2pos (ax, Fl::event_x (), Fl::event_y () - menu_dy (),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1733 x1, y1);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1734
19867 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	1735 // FIXME: should we only zoom about point for 2D plots?
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	1736
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1737 ap.zoom_about_point ("both", x1, y1, factor, false);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1738 mark_modified ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1739 return 1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1740 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1741 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1742
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1743 case FL_RELEASE:
20119 f46f6d906654 Avoid unnecessarily calling graphics callbacks in FLTK. Rik <rik@octave.org> parents: 20118 diff changeset	1744 if (! fp.get_windowbuttonupfcn ().is_empty ())
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1745 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1746 set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ());
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1747 fp.execute_windowbuttonupfcn ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1748 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1749
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1750 if ((Fl::event_button () == 1) && Fl::event_clicks ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1751 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1752 // Double click
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1753 set_on_ax_obj ("xlimmode", "auto");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1754 set_on_ax_obj ("ylimmode", "auto");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1755 set_on_ax_obj ("zlimmode", "auto");
20061 402e6678673b Redraw FLTK figure after double-click "zoom out". Rik <rik@octave.org> parents: 20060 diff changeset	1756 mark_modified ();
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1757 return 1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1758 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1759 if (Fl::event_button () == 3)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1760 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1761 // End of drag -- zoom.
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1762 if (canvas->zoom ())
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1763 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1764 canvas->zoom (false);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1765 double x0,y0,x1,y1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1766 if (ax_obj && ax_obj.isa ("axes"))
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1767 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1768 axes::properties& ap = dynamic_cast<axes::properties&>
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1769 (ax_obj.get_properties ());
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1770 pixel2pos (ax_obj, pos_x, pos_y, x0, y0);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1771 int pos_x1 = Fl::event_x ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1772 int pos_y1 = Fl::event_y () - menu_dy ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1773 pixel2pos (ax_obj, pos_x1, pos_y1, x1, y1);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1774 Matrix xl (1,2,0);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1775 Matrix yl (1,2,0);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1776 int dx = abs (pos_x - pos_x1);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1777 int dy = abs (pos_y - pos_y1);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1778 // Smallest zoom box must be 4 pixels square
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1779 if ((dx > 4) && (dy > 4))
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1780 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1781 if (x0 < x1)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1782 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1783 xl(0) = x0;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1784 xl(1) = x1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1785 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1786 else
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1787 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1788 xl(0) = x1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1789 xl(1) = x0;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1790 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1791 if (y0 < y1)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1792 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1793 yl(0) = y0;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1794 yl(1) = y1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1795 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1796 else
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1797 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1798 yl(0) = y1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1799 yl(1) = y0;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1800 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1801 ap.zoom ("both", xl, yl);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1802 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1803 mark_modified ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1804 return 1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1805 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1806 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1807 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1808 break;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1809 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1810 }
18966 b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1811 //std::cout << "plot_window::handle wasn't interested in event " << fl_eventnames[event] << std::endl;
b2db129c664d Fix FLTK event handling for shortcuts and mouse cursor change Andreas Weber <andy.weber.aw@gmail.com> parents: 18961 diff changeset	1812 return Fl_Window::handle (event);
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1813 }
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1814 };
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1815
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1816 class figure_manager
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1817 {
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1818 public:
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1819
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1820 static bool instance_ok (void)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1821 {
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1822 bool retval = true;
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1823
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1824 if (! instance)
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1825 instance = new figure_manager ();
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1826
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1827 if (! instance)
20825 66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	1828 error ("unable to create figure_manager object!");
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1829
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1830 return retval;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1831 }
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1832
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1833 ~figure_manager (void)
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1834 {
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1835 close_all ();
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1836 }
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1837
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1838 static void close_all (void)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1839 {
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1840 if (instance_ok ())
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1841 instance->do_close_all ();
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1842 }
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1843
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1844 static void new_window (figure::properties& fp)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1845 {
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1846 if (instance_ok ())
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1847 instance->do_new_window (fp);
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1848 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1849
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1850 static void delete_window (int idx)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1851 {
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1852 if (instance_ok ())
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1853 instance->do_delete_window (idx);
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1854 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1855
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1856 static void delete_window (const std::string& idx_str)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1857 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1858 delete_window (str2idx (idx_str));
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1859 }
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	1860
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	1861 static void renumber_figure (const std::string& idx_str, double new_number)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	1862 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	1863 if (instance_ok ())
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	1864 instance->do_renumber_figure (str2idx (idx_str), new_number);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	1865 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	1866
9973 cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1867 static void toggle_window_visibility (int idx, bool is_visible)
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1868 {
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1869 if (instance_ok ())
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1870 instance->do_toggle_window_visibility (idx, is_visible);
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1871 }
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1872
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1873 static void toggle_window_visibility (const std::string& idx_str,
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1874 bool is_visible)
9973 cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1875 {
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1876 toggle_window_visibility (str2idx (idx_str), is_visible);
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1877 }
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	1878
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1879 static void mark_modified (int idx)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1880 {
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1881 if (instance_ok ())
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1882 instance->do_mark_modified (idx);
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1883 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1884
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1885 static void mark_modified (const graphics_handle& gh)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1886 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1887 mark_modified (hnd2idx (gh));
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1888 }
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	1889
10008 b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1890 static void set_name (int idx)
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1891 {
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1892 if (instance_ok ())
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1893 instance->do_set_name (idx);
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1894 }
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1895
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1896 static void set_name (const std::string& idx_str)
10008 b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1897 {
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1898 set_name (str2idx (idx_str));
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1899 }
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	1900
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1901 static Matrix get_size (int idx)
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1902 {
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1903 return instance_ok () ? instance->do_get_size (idx) : Matrix ();
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1904 }
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1905
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1906 static Matrix get_size (const graphics_handle& gh)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1907 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1908 return get_size (hnd2idx (gh));
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1909 }
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	1910
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1911 static void print (const graphics_handle& gh, const std::string& cmd,
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1912 const std::string& term)
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	1913 {
2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	1914 if (instance_ok ())
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1915 instance->do_print (hnd2idx (gh), cmd, term);
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	1916 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1917
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1918 static void uimenu_update (const graphics_handle& figh,
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1919 const graphics_handle& uimenuh, int id)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1920 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1921 if (instance_ok ())
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1922 instance->do_uimenu_update (hnd2idx (figh), uimenuh, id);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1923 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1924
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1925 static void update_canvas (const graphics_handle& gh,
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1926 const graphics_handle& ca)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1927 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1928 if (instance_ok ())
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1929 instance->do_update_canvas (hnd2idx (gh), ca);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1930 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1931
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1932 static void update_boundingbox (const std::string& fig_idx_str,
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1933 bool internal)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1934 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1935 if (instance_ok ())
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1936 instance->do_update_boundingbox (str2idx (fig_idx_str), internal);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1937 }
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	1938
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1939 static void toggle_menubar_visibility (const std::string& fig_idx_str,
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1940 bool menubar_is_figure)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1941 {
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	1942 if (instance_ok ())
18985 f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	1943 instance->do_toggle_menubar_visibility (str2idx (fig_idx_str),
f84361735a40 maint: Use Octave coding conventions for some recent patches. Rik <rik@octave.org> parents: 18968 diff changeset	1944 menubar_is_figure);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	1945 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	1946
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1947 private:
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1948
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1949 static figure_manager *instance;
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1950
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	1951 figure_manager (void) { }
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1952
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1953 // No copying!
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1954 figure_manager (const figure_manager&);
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1955 figure_manager& operator = (const figure_manager&);
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1956
9951 d64d15e12e6b print immediately in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9802 diff changeset	1957 // Singelton -- hide all of the above.
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1958
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	1959 static int curr_index;
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	1960 typedef std::map<int, plot_window*> window_map;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1961 typedef window_map::iterator wm_iterator;;
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	1962 window_map windows;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1963
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	1964 static std::string fltk_idx_header;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	1965
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1966 void do_close_all (void)
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1967 {
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1968 wm_iterator win;
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1969 for (win = windows.begin (); win != windows.end (); win++)
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1970 delete win->second;
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1971 windows.clear ();
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1972 }
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1973
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1974 void do_new_window (figure::properties& fp)
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1975 {
13798 718f78b01de1 allow initial position to be set for fltk windows John W. Eaton <jwe@octave.org> parents: 13721 diff changeset	1976 int idx = figprops2idx (fp);
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1977
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1978 if (idx >= 0 && windows.find (idx) == windows.end ())
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1979 {
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1980 Matrix pos = fp.get_outerposition ().matrix_value ();
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1981 bool internal = false;
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1982 // check if figure::properties::outerposition is default -1.0
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1983 if (pos(2) != -1.0 && pos(3) != -1.0)
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1984 {
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1985 pos = fp.get_boundingbox (internal);
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1986 }
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1987 else
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1988 {
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1989 // use position
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1990 internal = true;
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1991 pos = fp.get_boundingbox (internal);
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	1992 }
13798 718f78b01de1 allow initial position to be set for fltk windows John W. Eaton <jwe@octave.org> parents: 13721 diff changeset	1993
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	1994 idx2figprops (curr_index, fp);
13798 718f78b01de1 allow initial position to be set for fltk windows John W. Eaton <jwe@octave.org> parents: 13721 diff changeset	1995
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1996 windows[curr_index++] = new plot_window (pos(0), pos(1), pos(2), pos(3),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19758 diff changeset	1997 fp, internal);
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1998 }
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	1999 }
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2000
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2001 void do_delete_window (int idx)
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2002 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2003 wm_iterator win = windows.find (idx);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2004
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2005 if (win != windows.end ())
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2006 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2007 delete win->second;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2008 windows.erase (win);
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2009 }
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2010 }
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2011
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2012 void do_renumber_figure (int idx, double new_number)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2013 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2014 wm_iterator win = windows.find (idx);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2015
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2016 if (win != windows.end ())
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2017 win->second->renumber (new_number);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2018 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2019
9973 cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2020 void do_toggle_window_visibility (int idx, bool is_visible)
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2021 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2022 wm_iterator win = windows.find (idx);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2023
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2024 if (win != windows.end ())
9973 cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2025 {
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2026 if (is_visible)
19453 728873ccd637 Show canvas if figure was created with visible off (bug #41895) Andreas Weber <andy.weber.aw@gmail.com> parents: 19296 diff changeset	2027 {
728873ccd637 Show canvas if figure was created with visible off (bug #41895) Andreas Weber <andy.weber.aw@gmail.com> parents: 19296 diff changeset	2028 win->second->show ();
728873ccd637 Show canvas if figure was created with visible off (bug #41895) Andreas Weber <andy.weber.aw@gmail.com> parents: 19296 diff changeset	2029 win->second->show_canvas ();
728873ccd637 Show canvas if figure was created with visible off (bug #41895) Andreas Weber <andy.weber.aw@gmail.com> parents: 19296 diff changeset	2030 }
9973 cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2031 else
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2032 win->second->hide ();
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2033
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2034 }
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2035 }
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2036
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2037 void do_toggle_menubar_visibility (int fig_idx, bool menubar_is_figure)
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2038 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2039 wm_iterator win = windows.find (fig_idx);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2040
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2041 if (win != windows.end ())
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2042 {
11585 1473d0cf86d2 untabify source files John W. Eaton <jwe@octave.org> parents: 11583 diff changeset	2043 if (menubar_is_figure)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2044 win->second->show_menubar ();
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2045 else
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2046 win->second->hide_menubar ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2047
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2048 win->second->redraw ();
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2049 }
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2050 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2051
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2052 void do_mark_modified (int idx)
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2053 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2054 wm_iterator win = windows.find (idx);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2055
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2056 if (win != windows.end ())
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2057 {
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2058 win->second->mark_modified ();
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2059 }
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2060 }
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2061
10008 b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	2062 void do_set_name (int idx)
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	2063 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2064 wm_iterator win = windows.find (idx);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2065
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2066 if (win != windows.end ())
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2067 win->second->set_name ();
10008 b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	2068 }
b6261d776a82 handle window title correctly in fltk_backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9991 diff changeset	2069
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2070 Matrix do_get_size (int idx)
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2071 {
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2072 Matrix sz (1, 2, 0.0);
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2073
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2074 wm_iterator win = windows.find (idx);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2075
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2076 if (win != windows.end ())
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2077 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2078 sz(0) = win->second->w ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2079 sz(1) = win->second->h ();
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2080 }
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2081
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2082 return sz;
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2083 }
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2084
12449 2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12324 diff changeset	2085 void do_print (int idx, const std::string& cmd, const std::string& term)
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	2086 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2087 wm_iterator win = windows.find (idx);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2088
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2089 if (win != windows.end ())
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2090 win->second->print (cmd, term);
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	2091 }
2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	2092
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2093 void do_uimenu_update (int idx, const graphics_handle& gh, int id)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2094 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2095 wm_iterator win = windows.find (idx);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2096
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2097 if (win != windows.end ())
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2098 win->second->uimenu_update (gh, id);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2099 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2100
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2101 void do_update_canvas (int idx, const graphics_handle& ca)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2102 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2103 wm_iterator win = windows.find (idx);
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2104
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2105 if (win != windows.end ())
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2106 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2107 if (ca.ok ())
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2108 win->second->show_canvas ();
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2109 else
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2110 win->second->hide_canvas ();
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2111 }
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2112 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2113
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2114 void do_update_boundingbox (int idx, bool internal)
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2115 {
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2116 wm_iterator win = windows.find (idx);
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2117
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2118 if (win != windows.end ())
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2119 win->second->update_boundingbox (internal);
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2120 }
c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2121
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2122 static int str2idx (const caseless_str& clstr)
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2123 {
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2124 int ind;
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2125 if (clstr.find (fltk_idx_header,0) == 0)
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2126 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2127 std::istringstream istr (clstr.substr (fltk_idx_header.size ()));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2128 if (istr >> ind)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2129 return ind;
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2130 }
20825 66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	2131
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2132 error ("figure_manager: could not recognize fltk index");
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2133 }
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2134
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2135 void idx2figprops (int idx, figure::properties& fp)
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2136 {
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2137 std::ostringstream ind_str;
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2138 ind_str << fltk_idx_header << idx;
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2139 fp.set___plot_stream__ (ind_str.str ());
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2140 }
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2141
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2142 static int figprops2idx (const figure::properties& fp)
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2143 {
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2144 if (fp.get___graphics_toolkit__ () == FLTK_GRAPHICS_TOOLKIT_NAME)
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2145 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2146 octave_value ps = fp.get___plot_stream__ ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2147 if (ps.is_string ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2148 return str2idx (ps.string_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2149 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2150 return 0;
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2151 }
20825 66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	2152
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2153 error ("figure_manager: figure is not fltk");
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2154 }
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2155
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2156 static int hnd2idx (double h)
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2157 {
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2158 graphics_object fobj = gh_manager::get_object (h);
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2159 if (fobj && fobj.isa ("figure"))
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2160 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2161 figure::properties& fp =
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2162 dynamic_cast<figure::properties&> (fobj.get_properties ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2163 return figprops2idx (fp);
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2164 }
20825 66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	2165
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2166 error ("figure_manager: H (= %g) is not a figure", h);
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2167 }
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2168
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2169 static int hnd2idx (const graphics_handle& fh)
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2170 {
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2171 return hnd2idx (fh.value ());
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2172 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2173 };
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2174
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2175 figure_manager *figure_manager::instance = 0;
f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2176
7841 c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2177 std::string figure_manager::fltk_idx_header="fltk index=";
c643e5c520f5 fltk_backend now indexes using an internal index instead of figure handle Shai Ayal <shaiay@users.sourceforge.net> parents: 7840 diff changeset	2178 int figure_manager::curr_index = 1;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2179
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14020 diff changeset	2180 static bool toolkit_loaded = false;
9652 ecdb275bd41b make drawnow work for fltk backend John W. Eaton <jwe@octave.org> parents: 9640 diff changeset	2181
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2182 class fltk_graphics_toolkit : public base_graphics_toolkit
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2183 {
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2184 public:
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2185 fltk_graphics_toolkit (void)
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2186 : base_graphics_toolkit (FLTK_GRAPHICS_TOOLKIT_NAME),
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2187 input_event_hook_fcn_id ()
19012 7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	2188 {
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	2189 Fl::visual (FL_RGB);
7f73293d8423 Revise FLTK keypressfcn and keyreleasefcn callbacks Andreas Weber <andy.weber.aw@gmail.com> parents: 19010 diff changeset	2190 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2191
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2192 ~fltk_graphics_toolkit (void) { }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2193
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2194 bool is_valid (void) const { return true; }
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2195
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 12968 diff changeset	2196 bool initialize (const graphics_object& go)
17079 7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2197 {
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2198 if (go.isa ("figure")
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2199 \|\| go.isa ("uimenu"))
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2200 {
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2201 if (go.isa ("uimenu"))
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2202 update (go, uimenu::properties::ID_LABEL);
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2203
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2204 return true;
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2205 }
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2206
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2207 return false;
7a67ab7c4771 Initialize uimenu objects for the fltk toolkit. Michael Goffioul <michael.goffioul@gmail.com> parents: 16871 diff changeset	2208 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 12968 diff changeset	2209
10973 a8235d26b57a improve names of base_graphics_backend methods John W. Eaton <jwe@octave.org> parents: 10972 diff changeset	2210 void finalize (const graphics_object& go)
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 7965 diff changeset	2211 {
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 7965 diff changeset	2212 if (go.isa ("figure"))
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 7965 diff changeset	2213 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2214 octave_value ov = go.get (caseless_str ("__plot_stream__"));
10972 14d16530ad59 fltk_backend::object_destroyed: don't call delete_window if __plot_stream__ is empty John W. Eaton <jwe@octave.org> parents: 10955 diff changeset	2215
14d16530ad59 fltk_backend::object_destroyed: don't call delete_window if __plot_stream__ is empty John W. Eaton <jwe@octave.org> parents: 10955 diff changeset	2216 if (! ov.is_empty ())
14d16530ad59 fltk_backend::object_destroyed: don't call delete_window if __plot_stream__ is empty John W. Eaton <jwe@octave.org> parents: 10955 diff changeset	2217 figure_manager::delete_window (ov.string_value ());
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 7965 diff changeset	2218 }
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 7965 diff changeset	2219 }
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 7965 diff changeset	2220
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	2221 void uimenu_set___fltk_label__ (graphics_object uimenu_obj)
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2222 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2223 if (uimenu_obj.valid_object ())
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2224 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2225 uimenu::properties& uimenup =
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2226 dynamic_cast<uimenu::properties&> (uimenu_obj.get_properties ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2227 std::string fltk_label = uimenup.get_label ();
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2228 graphics_object go = gh_manager::get_object (uimenu_obj.get_parent ());
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2229 if (go.isa ("uimenu"))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2230 fltk_label = dynamic_cast<const uimenu::properties&>
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	2231 (go.get_properties ()).get___fltk_label__ ()
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2232 + "/"
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2233 + fltk_label;
20108 de1377a638d7 Let annotation work with fltk again Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20061 diff changeset	2234 else if (go.isa ("figure") \|\| go.isa ("uicontextmenu"))
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2235 ;
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2236 else
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20428 diff changeset	2237 error ("invalid parent object\n");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2238
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	2239 uimenup.set___fltk_label__ (fltk_label);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2240 }
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2241 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2242
10973 a8235d26b57a improve names of base_graphics_backend methods John W. Eaton <jwe@octave.org> parents: 10972 diff changeset	2243 void update (const graphics_object& go, int id)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2244 {
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 7965 diff changeset	2245 if (go.isa ("figure"))
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 7965 diff changeset	2246 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2247 octave_value ov = go.get (caseless_str ("__plot_stream__"));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2248
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2249 if (! ov.is_empty ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2250 {
9973 cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2251 const figure::properties& fp =
cd8f355157b8 Handle figure visibility in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9951 diff changeset	2252 dynamic_cast<const figure::properties&> (go.get_properties ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2253
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2254 switch (id)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2255 {
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2256 case base_properties::ID_VISIBLE:
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2257 figure_manager::toggle_window_visibility (ov.string_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2258 fp.is_visible ());
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2259 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2260
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2261 case figure::properties::ID_MENUBAR:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2262 figure_manager::toggle_menubar_visibility
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2263 (ov.string_value (), fp.menubar_is ("figure"));
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2264 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2265
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2266 case figure::properties::ID_CURRENTAXES:
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2267 figure_manager::update_canvas (go.get_handle (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2268 fp.get_currentaxes ());
13815 0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2269 break;
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2270
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2271 case figure::properties::ID_NAME:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2272 case figure::properties::ID_NUMBERTITLE:
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2273 figure_manager::set_name (ov.string_value ());
0aba6f90f5f8 maint: __init_fltk__.cc style fixes John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2274 break;
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2275
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2276 case figure::properties::ID_INTEGERHANDLE:
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2277 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2278 std::string tmp = ov.string_value ();
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2279 graphics_handle gh = fp.get___myhandle__ ();
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2280 figure_manager::renumber_figure (tmp, gh.value ());
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2281 figure_manager::set_name (tmp);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2282 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13815 diff changeset	2283 break;
18961 52e01aa1fe8b Overhaul FLTK pan, rotate, zoom Andreas Weber <andy.weber.aw@gmail.com> parents: 18958 diff changeset	2284
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2285 case figure::properties::ID_POSITION:
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2286 figure_manager::update_boundingbox (ov.string_value (), true);
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2287 break;
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2288
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2289 case figure::properties::ID_OUTERPOSITION:
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2290 figure_manager::update_boundingbox (ov.string_value (), false);
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2291 break;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2292 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	2293 }
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 7965 diff changeset	2294 }
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2295 else if (go.isa ("uimenu"))
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2296 {
11239 5fa7667f90e5 Add prefix ID_ to property ids to avoid name clash on windows Kai Habel <kai.habel@gmx.de> parents: 11224 diff changeset	2297 if (id == uimenu::properties::ID_LABEL)
22622 4191f8b5070c Add '__' to start/end of hidden Octave-only graphics properties (bug #49205). Rik <rik@octave.org> parents: 22407 diff changeset	2298 uimenu_set___fltk_label__ (go);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2299
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2300 graphics_object fig = go.get_ancestor ("figure");
5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2301 figure_manager::uimenu_update (fig.get_handle (), go.get_handle (), id);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11045 diff changeset	2302 }
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2303 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2304
8077 a4e03f9b4b8a Fix FLTK backend update Michael Goffioul parents: 8060 diff changeset	2305 void redraw_figure (const graphics_object& go) const
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2306 {
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2307 // We scan all figures and add those which use FLTK.
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2308 graphics_object obj = gh_manager::get_object (0);
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2309 if (obj && obj.isa ("root"))
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2310 {
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2311 base_properties& props = obj.get_properties ();
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2312 Matrix children = props.get_all_children ();
9652 ecdb275bd41b make drawnow work for fltk backend John W. Eaton <jwe@octave.org> parents: 9640 diff changeset	2313
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2314 for (octave_idx_type n = 0; n < children.numel (); n++)
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2315 {
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2316 graphics_object fobj = gh_manager::get_object (children (n));
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2317 if (fobj && fobj.isa ("figure"))
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2318 {
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2319 figure::properties& fp =
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2320 dynamic_cast<figure::properties&> (fobj.get_properties ());
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2321 if (fp.get___graphics_toolkit__ ()
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2322 == FLTK_GRAPHICS_TOOLKIT_NAME)
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2323 figure_manager::new_window (fp);
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2324 }
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2325 }
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2326 }
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2327
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2328 figure_manager::mark_modified (go.get_handle ());
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2329 Fl::check ();
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2330 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2331
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	2332 void print_figure (const graphics_object& go,
10857 2224236440c0 add more terminal types to gl2ps-renderer Shai Ayal <shaiay@users.sourceforge.net> parents: 10809 diff changeset	2333 const std::string& term,
21699 21fdab18f857 Remove reference to drawnow 'mono' throughout scripts and code, update args test Daniel J Sebald <daniel.sebald@ieee.org> parents: 21644 diff changeset	2334 const std::string& file_cmd,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2335 const std::string& /debug_file/) const
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2336 {
12449 2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12324 diff changeset	2337 figure_manager::print (go.get_handle (), file_cmd, term);
9798 2d6a5af744b6 printing for fltk backend using gl2ps Shai Ayal <shaiay@users.sourceforge.net> parents: 9758 diff changeset	2338 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2339
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2340 Matrix get_canvas_size (const graphics_handle& fh) const
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2341 {
8267 f2f1d07a7f0f fltk_backend.cc (class figure_manager): implement in way consistent with other singleton classes in Octave John W. Eaton <jwe@octave.org> parents: 8263 diff changeset	2342 return figure_manager::get_size (fh);
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2343 }
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2344
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2345 /*
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2346 double get_screen_resolution (void) const
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2347 {
9951 d64d15e12e6b print immediately in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9802 diff changeset	2348 // FLTK doesn't give this info.
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2349 return 72.0;
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2350
21562 6c2fd62db1f7 maint: Eliminate accidental double spaces in code. Rik <rik@octave.org> parents: 21374 diff changeset	2351 // FIXME: FLTK >= 1.3.0 could do this with Fl::screen_dpi (h, v, n)
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2352 // but do we need it?
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2353 }
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2354 */
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2355
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2356 Matrix get_screen_size (void) const
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2357 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7861 diff changeset	2358 Matrix sz (1, 2, 0.0);
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2359 sz(0) = Fl::w ();
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2360 sz(1) = Fl::h ();
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2361 return sz;
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2362 }
14014 907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14002 diff changeset	2363
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14002 diff changeset	2364 void close (void)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14002 diff changeset	2365 {
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14020 diff changeset	2366 if (toolkit_loaded)
14014 907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14002 diff changeset	2367 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14002 diff changeset	2368 munlock ("__init_fltk__");
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14002 diff changeset	2369
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2370 octave_value_list args = input_event_hook_fcn_id;
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2371 args.append (false);
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2372 Fremove_input_event_hook (args, 0);
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2373 input_event_hook_fcn_id = octave_value_list ();
14014 907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14002 diff changeset	2374
18958 c9f960441513 Overhaul FLTK plotting and printing Andreas Weber <andy.weber.aw@gmail.com> parents: 18678 diff changeset	2375 figure_manager::close_all ();
14014 907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14002 diff changeset	2376 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14002 diff changeset	2377 }
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2378
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2379 void set_input_event_hook_id (const octave_value_list& id)
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2380 {
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2381 input_event_hook_fcn_id = id;
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2382 }
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2383
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2384 private:
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2385 octave_value_list input_event_hook_fcn_id;
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2386 };
caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2387
15507 b9b9795a7cd9 build: Build FLTK-associated DOCSTRINGS even when HAVE_FLTK is 0 (bug #37541). Rik <rik@octave.org> parents: 15506 diff changeset	2388 #endif
b9b9795a7cd9 build: Build FLTK-associated DOCSTRINGS even when HAVE_FLTK is 0 (bug #37541). Rik <rik@octave.org> parents: 15506 diff changeset	2389
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2390 DEFUN_DLD (__fltk_check__, , ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2391 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2392 @deftypefn {} {} __fltk_check__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2393 Undocumented internal function. Calls Fl::check ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2394 @end deftypefn */)
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2395 {
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21723 diff changeset	2396 #if defined (HAVE_FLTK)
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2397 Fl::check ();
20060 76b1168342c0 Redraw FLTK figure after zoom operations on linked axes (bug #44719). Rik <rik@octave.org> parents: 20053 diff changeset	2398
76b1168342c0 Redraw FLTK figure after zoom operations on linked axes (bug #44719). Rik <rik@octave.org> parents: 20053 diff changeset	2399 if (Vdrawnow_requested)
76b1168342c0 Redraw FLTK figure after zoom operations on linked axes (bug #44719). Rik <rik@octave.org> parents: 20053 diff changeset	2400 Fdrawnow ();
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	2401
9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	2402 return ovl ();
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2403 #else
21109 bd1752782e56 Use err_disabled_feature, warn_disabled_feature throughout code base. Rik <rik@octave.org> parents: 21021 diff changeset	2404 err_disabled_feature ("__fltk_check__", "OpenGL and FLTK");
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2405 #endif
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2406 }
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2407
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2408 // Initialize the fltk graphics toolkit.
9951 d64d15e12e6b print immediately in fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 9802 diff changeset	2409
15507 b9b9795a7cd9 build: Build FLTK-associated DOCSTRINGS even when HAVE_FLTK is 0 (bug #37541). Rik <rik@octave.org> parents: 15506 diff changeset	2410 DEFUN_DLD (__init_fltk__, , ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2411 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2412 @deftypefn {} {} __init_fltk__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2413 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	2414 @end deftypefn */)
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: diff changeset	2415 {
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21723 diff changeset	2416 #if defined (HAVE_FLTK)
17881 7aadb87f599a Display warning and don't init FLTK toolkit if no DISPLAY available (bug #40423). Rik <rik@octave.org> parents: 17861 diff changeset	2417 if (! display_info::display_available ())
7aadb87f599a Display warning and don't init FLTK toolkit if no DISPLAY available (bug #40423). Rik <rik@octave.org> parents: 17861 diff changeset	2418 error ("__init_fltk__: no graphics DISPLAY available");
7aadb87f599a Display warning and don't init FLTK toolkit if no DISPLAY available (bug #40423). Rik <rik@octave.org> parents: 17861 diff changeset	2419 else if (! toolkit_loaded)
8060 09f32aac8fbc Interface for backend switch/initialization John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2420 {
9216 9d4b84b14bf0 call mlock in __fltk_init__ John W. Eaton <jwe@octave.org> parents: 9060 diff changeset	2421 mlock ();
9d4b84b14bf0 call mlock in __fltk_init__ John W. Eaton <jwe@octave.org> parents: 9060 diff changeset	2422
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2423 fltk_graphics_toolkit *fltk = new fltk_graphics_toolkit ();
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2424 graphics_toolkit tk (fltk);
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14020 diff changeset	2425 gtk_manager::load_toolkit (tk);
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14020 diff changeset	2426 toolkit_loaded = true;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11585 diff changeset	2427
19010 c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2428 octave_value fcn (new octave_builtin (F__fltk_check__));
c3af040956df fix FLTK position/outerposition properties, respect units Andreas Weber <andy.weber.aw@gmail.com> parents: 18985 diff changeset	2429 octave_value fcn_handle (new octave_fcn_handle (fcn, "@__fltk_check__"));
16348 072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2430 octave_value_list id = Fadd_input_event_hook (fcn_handle, 1);
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2431
072b3e6504c4 use function handle for fltk input event hook function John W. Eaton <jwe@octave.org> parents: 15507 diff changeset	2432 fltk->set_input_event_hook_id (id);
8060 09f32aac8fbc Interface for backend switch/initialization John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2433 }
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	2434
9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	2435 return ovl ();
21109 bd1752782e56 Use err_disabled_feature, warn_disabled_feature throughout code base. Rik <rik@octave.org> parents: 21021 diff changeset	2436
15507 b9b9795a7cd9 build: Build FLTK-associated DOCSTRINGS even when HAVE_FLTK is 0 (bug #37541). Rik <rik@octave.org> parents: 15506 diff changeset	2437 #else
21109 bd1752782e56 Use err_disabled_feature, warn_disabled_feature throughout code base. Rik <rik@octave.org> parents: 21021 diff changeset	2438 err_disabled_feature ("__init_fltk__", "OpenGL and FLTK");
15507 b9b9795a7cd9 build: Build FLTK-associated DOCSTRINGS even when HAVE_FLTK is 0 (bug #37541). Rik <rik@octave.org> parents: 15506 diff changeset	2439 #endif
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2440 }
8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2441
21575 bc9aa534bc29 maint: Clean up BIST tests so they don't produce warnings. Rik <rik@octave.org> parents: 21568 diff changeset	2442 /*
bc9aa534bc29 maint: Clean up BIST tests so they don't produce warnings. Rik <rik@octave.org> parents: 21568 diff changeset	2443 ## No test needed for internal helper function.
bc9aa534bc29 maint: Clean up BIST tests so they don't produce warnings. Rik <rik@octave.org> parents: 21568 diff changeset	2444 %!assert (1)
bc9aa534bc29 maint: Clean up BIST tests so they don't produce warnings. Rik <rik@octave.org> parents: 21568 diff changeset	2445 */
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22370 diff changeset	2446

Mercurial > octave

annotate libinterp/dldfcn/__init_fltk__.cc @ 22622:4191f8b5070c