octave: libinterp/dldfcn/__init_fltk_

annotate libinterp/dldfcn/__init_fltk__.cc @ 23457:21baad6b35c4

maint: Use C++11 nullptr rather than 0 or NULL when possible. * FigureWindow.h, Logger.cc, Menu.cc, MouseModeActionGroup.h, Object.h, ObjectFactory.cc, ObjectProxy.h, color-picker.h, documentation-dock-widget.h, files-dock-widget.h, find-files-dialog.h, history-dock-widget.h, file-editor-tab.cc, file-editor.cc, file-editor.h, find-dialog.h, main-window.cc, main-window.h, octave-dock-widget.h, parser.cc, parser.h, webinfo.h, resource-manager.cc, shortcut-manager.cc, shortcut-manager.h, terminal-dock-widget.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.h, workspace-view.h, __magick_read__.cc, call-stack.cc, call-stack.h, cdisplay.c, display.cc, dlmread.cc, dynamic-ld.cc, ft-text-renderer.cc, gl2ps-print.cc, graphics.cc, graphics.in.h, input.h, interpreter.cc, interpreter.h, ls-hdf5.cc, mex.cc, mxarray.in.h, oct-errno.in.cc, oct-fstrm.cc, oct-iostrm.h, oct-procbuf.cc, oct-stdstrm.h, oct-stream.cc, oct-stream.h, octave-link.cc, pager.cc, pr-output.cc, profiler.h, qz.cc, sighandlers.cc, strfns.cc, symtab.cc, symtab.h, typecast.cc, urlwrite.cc, variables.cc, __eigs__.cc, __init_fltk__.cc, __ode15__.cc, colamd.cc, ov-base-int.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-builtin.cc, ov-class.cc, ov-classdef.cc, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.h, octave.cc, octave.h, bp-table.cc, jit-ir.cc, jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, lex.h, pt-arg-list.cc, pt-arg-list.h, pt-array-list.h, pt-cell.h, pt-classdef.h, pt-colon.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.h, pt-idx.h, pt-jit.cc, pt-jit.h, pt-loop.h, pt-mat.h, pt-select.h, pt.h, CSparse.cc, dSparse.cc, DASPK.cc, DASRT.cc, DASSL.cc, oct-fftw.cc, oct-rand.cc, oct-spparms.cc, child-list.cc, file-ops.cc, mach-info.cc, oct-env.cc, oct-time.cc, cmd-edit.cc, cmd-hist.cc, oct-locbuf.cc, oct-shlib.cc, pathsearch.cc, singleton-cleanup.cc, unwind-prot.h, url-transfer.cc: Use C++11 nullptr rather than 0 or NULL when possible.

author	Rik <rik@octave.org>
date	Fri, 28 Apr 2017 13:19:12 -0700
parents	c763214a8260
children	2aab625b502c

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

Mercurial > octave

annotate libinterp/dldfcn/__init_fltk__.cc @ 23457:21baad6b35c4