octave-antonio: libinterp/dldfcn/__init_fltk_

annotate libinterp/dldfcn/__init_fltk__.cc @ 19639:61cc00ebac60

move opengl printing code from __init_fltk__.cc to gl2ps-renderer.cc * gl2ps-renderer.h, gl2ps-renderer.cc (gl2ps_print): New function. * __init_fltk__.cc (OpenGL_fltk::print): Use it.

author	John W. Eaton <jwe@octave.org>
date	Thu, 29 Jan 2015 17:07:09 -0500
parents	dec5b96ca298
children	0cdda69dc2b4

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

Mercurial > octave-antonio

annotate libinterp/dldfcn/__init_fltk__.cc @ 19639:61cc00ebac60