octave-libgccjit: libinterp/dldfcn/__init_fltk_

comparison libinterp/dldfcn/__init_fltk__.cc @ 18958:c9f960441513

Overhaul FLTK plotting and printing * gl2ps-renderer.cc: Force execution of GL commands before gl2psEndPage to avoid missing primitives in output. Enable error output of gl2ps, check return value of gl2psBeginPage for error. * __init_fltk__.cc: Avoid redraw of the OpenGL and the plot window if not needed. Let FLTK do the resizing of the canvas, the menubar and the statusbar. This was done by creating a resize_dummy and set this as resizable for the plot_window group. Previously this was done inside draw(). Avoid timing issues with fltk_maxtime (removed) and other hacks with multiple Fl::check and redraw () calls. You can use flush and glFlush if you really need to force a immediate redraw. Remove print_mode in draw () and print directly without waiting that FLTK flushes its buffers. This fixes bug #42458 and #40215 Manually placement of the toolbar is only done once when hiding or showing the menubar. (update_toolbar_position) set(gcf, "position", [x, y, w, h]) is now handled by figure::properties::ID_POSITION which calls update_position * __add_default_menu__.m: Remove now unneeded hacks for the menubar.

author	Andreas Weber <andy.weber.aw@gmail.com>
date	Sat, 26 Jul 2014 10:09:48 +0200
parents	6113e0c6920b
children	52e01aa1fe8b

comparison

equal deleted inserted replaced

-:914c3ce73665
+:c9f960441513
 /*
 Copyright (C) 2007-2013 Shai Ayal
+Copyright (C) 2014 Andreas Weber
 This file is part of Octave.
 Octave is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 #include "toplev.h"
 #include "variables.h"
 #define FLTK_GRAPHICS_TOOLKIT_NAME "fltk"
-// Give FLTK no more than 0.01 sec to do its stuff.
-static double fltk_maxtime = 1e-2;
 const char* help_text = "\
 Keyboard Shortcuts\n\
 a - autoscale\n\
 p - pan/zoom\n\
 r - rotate\n\
 class OpenGL_fltk : public Fl_Gl_Window
 {
 public:
 OpenGL_fltk (int xx, int yy, int ww, int hh, double num)
 : Fl_Gl_Window (xx, yy, ww, hh, 0), number (num), renderer (),
-in_zoom (false), zoom_box (),  print_mode (false)
+in_zoom (false), zoom_box ()
 {
 // Ask for double buffering and a depth buffer.
 mode (FL_DEPTH | FL_DOUBLE | FL_MULTISAMPLE);
 }
 bool zoom (void) { return in_zoom; }
 void set_zoom_box (const Matrix& zb) { zoom_box = zb; }
 void print (const std::string& cmd, const std::string& term)
 {
-print_mode  = true;
+#ifdef HAVE_GL2PS_H
-print_cmd = cmd;
+FILE *fp;
-print_term  = term;
+fp = octave_popen (cmd.c_str (), "w");
+glps_renderer rend (fp, term);
+rend.draw (gh_manager::get_object (number), cmd);
+octave_pclose (fp);
+#else
+error ("fltk: printing not available without gl2ps library");
+#endif
 }
 void resize (int xx, int yy, int ww, int hh)
 {
 Fl_Gl_Window::resize (xx, yy, ww, hh);
-setup_viewport (ww, hh);
-redraw ();
 }
 bool renumber (double new_number)
 {
 bool retval = false;
 opengl_renderer renderer;
 bool in_zoom;
 // (x1,y1,x2,y2)
 Matrix zoom_box;
-bool print_mode;
-std::string print_cmd;
-std::string print_term;
-void setup_viewport (int ww, int hh)
-{
-glMatrixMode (GL_PROJECTION);
-glLoadIdentity ();
-glViewport (0, 0, ww, hh);
-}
 void draw (void)
 {
 if (! valid ())
 {
-valid (1);
+glMatrixMode (GL_PROJECTION);
-setup_viewport (w (), h ());
+glLoadIdentity ();
-}
+glViewport (0, 0, w (), h ());
+}
-if (print_mode)
-{
+renderer.draw (gh_manager::get_object (number));
-#ifdef HAVE_GL2PS_H
-FILE *fp = octave_popen (print_cmd.c_str (), "w");
+if (zoom ())
-glps_renderer rend (fp, print_term);
+overlay ();
-rend.draw (gh_manager::get_object (number), print_cmd);
-octave_pclose (fp);
-print_mode = false;
-#else
-print_mode = false;
-error ("fltk: printing not available without gl2ps library");
-return;
-#endif
-}
-else
-{
-renderer.draw (gh_manager::get_object (number));
-if (zoom ())
-overlay ();
-}
 }
 void zoom_box_vertex (void)
 {
 glVertex2d (zoom_box(0), h () - zoom_box(1));
 class fltk_uimenu
 {
 public:
 fltk_uimenu (int xx, int yy, int ww, int hh)
 {
-menubar = new
+menubar = new Fl_Menu_Bar (xx, yy, ww, hh);
-Fl_Menu_Bar (xx, yy, ww, hh);
 }
 int items_to_show (void)
 {
 //returns the number of visible menu items
 }
 void show (void)
 {
 menubar->show ();
+menubar->redraw ();
 }
 void hide (void)
 {
 menubar->hide ();
+menubar->redraw ();
 }
 bool is_visible (void)
 {
 return menubar->visible ();
 class plot_window : public Fl_Window
 {
 friend class fltk_uimenu;
 public:
 plot_window (int xx, int yy, int ww, int hh, figure::properties& xfp)
-: Fl_Window (xx, yy - menu_h, ww, hh + menu_h + status_h, "octave"),
+: Fl_Window (xx, yy, ww, hh + menu_h + status_h + 2, "octave"),
 window_label (), shift (0), ndim (2), fp (xfp), canvas (0),
 autoscale (0), togglegrid (0), panzoom (0), rotate (0), help (0),
-status (0), ax_obj (), pos_x (0), pos_y (0)
+status (0), resize_dummy (0), ax_obj (), pos_x (0), pos_y (0)
 {
 callback (window_close, static_cast<void*> (this));
-size_range (4*status_h, 2*status_h);
 // FIXME: The function below is only available in FLTK >= 1.3
 // At some point support for FLTK 1.1 will be dropped in Octave.
 // At that point this function should be uncommented.
 // The current solution is to call xclass() before show() for each window.
 // Set WM_CLASS which allows window managers to properly group related
 // windows.  Otherwise, the class is just "FLTK"
 //default_xclass ("Octave");
-begin ();
+uimenu = new fltk_uimenu (0, 0, ww, menu_h);
-{
+canvas = new OpenGL_fltk (0, menu_h, ww, hh, number ());
-// bbox of plot canvas = [xx, yy, ww, hh];
-// (xx, yy) = UL coordinate relative to UL window.
+// The bottom toolbar is a composite of "autoscale", "togglegrid",
+// "panzoom", "rotate", "help", and "status". Only "status" should be resized.
-canvas = new OpenGL_fltk (0, menu_h, ww, hh, number ());
+int toolbar_y = menu_h + hh + 1;
-uimenu = new fltk_uimenu (0, 0, ww, menu_h);
+status = new Fl_Output (5 * status_h + 1, toolbar_y, ww - 5 * status_h - 1, status_h, "");
-uimenu->hide ();
+status->textcolor (FL_BLACK);
-// Toolbar is a composite of "bottom", "autoscale", "togglegrid",
+status->color (FL_GRAY);
-// "panzoom", "rotate", "help", and "status".
+status->textfont (FL_COURIER);
+status->textsize (10);
-yy = hh + menu_h;
+status->box (FL_ENGRAVED_BOX);
-bottom = new Fl_Box (0, yy, ww, status_h);
-bottom->box (FL_FLAT_BOX);
+autoscale = new Fl_Button (0, toolbar_y, status_h, status_h, "A");
+autoscale->callback (button_callback, static_cast<void*> (this));
-ndim = calc_dimensions (gh_manager::get_object (fp.get___myhandle__ ()));
+autoscale->tooltip ("Autoscale");
-autoscale = new Fl_Button (0, yy, status_h, status_h, "A");
+togglegrid = new Fl_Button (status_h, toolbar_y, status_h, status_h, "G");
-autoscale->callback (button_callback, static_cast<void*> (this));
+togglegrid->callback (button_callback, static_cast<void*> (this));
-autoscale->tooltip ("Autoscale");
+togglegrid->tooltip ("Toggle Grid");
-togglegrid = new Fl_Button (status_h, yy, status_h,
+panzoom = new Fl_Button (2* status_h, toolbar_y, status_h, status_h, "P");
-status_h, "G");
+panzoom->callback (button_callback, static_cast<void*> (this));
-togglegrid->callback (button_callback, static_cast<void*> (this));
+panzoom->tooltip ("Mouse Pan/Zoom");
-togglegrid->tooltip ("Toggle Grid");
+rotate = new Fl_Button (3 * status_h, toolbar_y, status_h, status_h, "R");
-panzoom = new Fl_Button (2 * status_h, yy, status_h,
+rotate->callback (button_callback, static_cast<void*> (this));
-status_h, "P");
+rotate->tooltip ("Mouse Rotate");
-panzoom->callback (button_callback, static_cast<void*> (this));
-panzoom->tooltip ("Mouse Pan/Zoom");
+// get dimensions, de-/activate rotate button, set gui_mode
+gui_mode = rotate_zoom;
-rotate = new Fl_Button (3 * status_h, yy, status_h,
+update_gui_mode ();
-status_h, "R");
-rotate->callback (button_callback, static_cast<void*> (this));
+help = new Fl_Button (4 * status_h, toolbar_y, status_h, status_h, "?");
-rotate->tooltip ("Mouse Rotate");
+help->callback (button_callback, static_cast<void*> (this));
+help->tooltip ("Help");
-if (ndim == 2)
-rotate->deactivate ();
+// The size of the resize_dummy box also determines the minimum window size
+resize_dummy = new Fl_Box(5 * status_h + 1, menu_h + 1, ww - 5 * status_h - 1, hh);
-help = new Fl_Button (4 * status_h, yy, status_h,
+// read on http://fltk.org/articles.php?L415+I0+T+M1000+P1 how resizable works
-status_h, "?");
+resizable (resize_dummy);
-help->callback (button_callback, static_cast<void*> (this));
-help->tooltip ("Help");
+end ();
-status = new Fl_Output (5 * status_h, yy,
+if (fp.is_visible ())
-ww > 2*status_h ? ww - status_h : 0,
+{
-status_h, "");
+// FIXME: This code should be removed when Octave drops support
+// for FLTK 1.1.  Search for default_xclass in this file to find
-status->textcolor (FL_BLACK);
+// code that should be uncommented to take its place.
-status->color (FL_GRAY);
+//
-status->textfont (FL_COURIER);
+// Set WM_CLASS which allows window managers to properly group
-status->textsize (10);
+// related windows.  Otherwise, the class is just "FLTK"
-status->box (FL_ENGRAVED_BOX);
+xclass ("Octave");
-// This allows us to have a valid OpenGL context right away.
+show ();
-canvas->mode (FL_DEPTH | FL_DOUBLE | FL_MULTISAMPLE);
-if (fp.is_visible ())
-{
-// FIXME: This code should be removed when Octave drops support
-// for FLTK 1.1.  Search for default_xclass in this file to find
-// code that should be uncommented to take its place.
-//
-// Set WM_CLASS which allows window managers to properly group
-// related windows.  Otherwise, the class is just "FLTK"
-xclass ("Octave");
-show ();
 #if defined (HAVE_X_WINDOWS)
 std::string show_gui_msgs
 = octave_env::getenv ("OCTAVE_SHOW_GUI_MESSAGES");
 // Installing our handler suppresses the messages.
 if (show_gui_msgs.empty ())
 XSetErrorHandler (xerror_handler);
 #endif
 if (fp.get_currentaxes ().ok ())
 show_canvas ();
 else
 hide_canvas ();
 }
-}
-end ();
-status->show ();
-autoscale->show ();
-togglegrid->show ();
-panzoom->show ();
-rotate->show ();
 set_name ();
-resizable (canvas);
-gui_mode = (ndim == 3 ? rotate_zoom : pan_zoom);
 uimenu->add_to_menu (fp);
-if (uimenu->items_to_show ())
+if (!uimenu->items_to_show ())
-show_menubar ();
-else
 hide_menubar ();
 }
 ~plot_window (void)
 {
-canvas->hide ();
-status->hide ();
-uimenu->hide ();
 this->hide ();
 }
 double number (void) { return fp.get___myhandle__ ().value (); }
 }
 void print (const std::string& cmd, const std::string& term)
 {
 canvas->print (cmd, term);
-// Print immediately so the output file will exist when the drawnow
-// command is done.
-mark_modified ();
-Fl::wait (fltk_maxtime);
 }
 void show_menubar (void)
 {
-if (!uimenu->is_visible ())
+uimenu->show ();
-{
+update_toolbar_position ();
-// FIXME: Toolbar and menubar do not update
-uimenu->show ();
-mark_modified ();
-}
 }
 void hide_menubar (void)
 {
-if (uimenu->is_visible ())
+uimenu->hide ();
-{
+update_toolbar_position ();
-// FIXME: Toolbar and menubar do not update
-uimenu->hide ();
-mark_modified ();
-}
 }
 void uimenu_update (const graphics_handle& gh, int id)
 {
 graphics_object uimenu_obj = gh_manager::get_object (gh);
 if (uimenu->items_to_show ())
 show_menubar ();
 else
 hide_menubar ();
-mark_modified ();
 }
 }
 void show_canvas (void)
 {
 void hide_canvas (void)
 {
 canvas->hide ();
 }
+// Move the toolbar at the bottom of the plot_window.
+// The only reason for moving the toolbar is hiding and
+// showing the menubar. All other resizing is done by fltk.
+void update_toolbar_position ()
+{
+int old_canvas_h = canvas->h ();
+size(w (), old_canvas_h + menu_dy () + status_h + 2);
+canvas->resize (0, menu_dy (), w (), old_canvas_h);
+int toolbar_y = canvas->h () + menu_dy () + 1;
+autoscale->position (0, toolbar_y);
+togglegrid->position (status_h, toolbar_y);
+panzoom->position (2 * status_h, toolbar_y);
+rotate->position (3 * status_h, toolbar_y);
+help->position (4 * status_h, toolbar_y);
+status->resize (5 * status_h + 1, toolbar_y, w () - 5 * status_h - 1, status_h);
+init_sizes();
+redraw ();
+}
+// Called from figure::properties::ID_POSITION
+// (someone has requested a position change with set(h, "position", [...]))
+// ww and hh refers to the canvas size, not the plot_window size.
+void update_position (int xx, int yy, int ww, int hh)
+{
+Fl_Window::resize (xx, yy + menu_dy (), ww, hh + menu_dy () + status_h + 2);
+}
 void mark_modified (void)
 {
-damage (FL_DAMAGE_ALL);
+canvas->redraw ();
-canvas->damage (FL_DAMAGE_ALL);
+}
+void update_gui_mode (void)
+{
 ndim = calc_dimensions (gh_manager::get_object (fp.get___myhandle__ ()));
 if (ndim == 3)
 rotate->activate ();
-else if (ndim == 2 && gui_mode == rotate_zoom)
+else // ndim == 2
 {
 rotate->deactivate ();
 gui_mode = pan_zoom;
 }
 }
 // Status area height.
 static const int status_h = 20;
 // Menu height
-static const int menu_h = 20;
+static const int menu_h = 25;
 // Window callback.
 static void window_close (Fl_Widget*, void* data)
 {
 octave_value_list args;
 fl_message ("%s", help_text);
 }
 fltk_uimenu* uimenu;
 OpenGL_fltk* canvas;
-Fl_Box*    bottom;
 Fl_Button* autoscale;
 Fl_Button* togglegrid;
 Fl_Button* panzoom;
 Fl_Button* rotate;
 Fl_Button* help;
 Fl_Output* status;
+Fl_Box* resize_dummy;
 graphics_object ax_obj;
 int pos_x;
 int pos_y;
 void axis_auto (void)
 pixel2pos (ax, px1, py1, x1, y1);
 cbuf << " -> ["<< x1 << ", " << y1 << "]";
 }
 status->value (cbuf.str ().c_str ());
-status->redraw ();
 }
 void view2status (graphics_object ax)
 {
 if (ax && ax.isa ("axes"))
 Matrix v (1,2,0);
 v = ap.get ("view").matrix_value ();
 cbuf << "[azimuth: " << v(0) << ", elevation: " << v(1) << "]";
 status->value (cbuf.str ().c_str ());
-status->redraw ();
 }
 }
 void set_currentpoint (int px, int py)
 {
 mod.append (std::string ("alt"));
 return Cell (mod);
 }
-void resize (int xx,int yy,int ww,int hh)
+void resize (int xx, int yy, int ww, int hh)
 {
 Fl_Window::resize (xx, yy, ww, hh);
 Matrix pos (1,4,0);
 pos(0) = xx;
 pos(1) = yy + menu_dy ();
-pos(2) = ww;
+pos(2) = canvas->w ();
-pos(3) = hh - menu_dy () - status_h;
+pos(3) = canvas->h ();
-fp.set_boundingbox (pos, true);
+fp.set_position (pos, false);
-}
-void draw (void)
-{
-// FIXME: Toolbar and menubar do not update properly
-Matrix pos = fp.get_boundingbox (true);
-int canvas_h = pos(3);
-int canvas_w = pos(2);
-int canvas_y = menu_dy ();
-int toolbar_y = menu_dy () + canvas_h;
-pos(1) = pos(1) - menu_dy ();
-pos(3) = pos(3) + menu_dy () + status_h;
-Fl_Window::resize (pos(0), pos(1), pos(2), pos(3));
-bottom->resize (0, toolbar_y, status_h, status_h);
-autoscale->resize (0, toolbar_y, status_h, status_h);
-togglegrid->resize (status_h, toolbar_y, status_h, status_h);
-panzoom->resize (2 * status_h, toolbar_y, status_h, status_h);
-rotate->resize (3 * status_h, toolbar_y, status_h, status_h);
-help->resize (4 * status_h, toolbar_y, status_h, status_h);
-status->resize (5 * status_h, toolbar_y, pos(2) - 4 * status_h, status_h);
-if (canvas->valid ())
-canvas->resize (0, canvas_y, canvas_w, canvas_h);
-return Fl_Window::draw ();
 }
 int handle (int event)
 {
 graphics_handle gh;
 zoom_box (1) = pos_y;
 zoom_box (2) =  Fl::event_x ();
 zoom_box (3) =  Fl::event_y () - menu_dy ();
 canvas->set_zoom_box (zoom_box);
 canvas->zoom (true);
-canvas->redraw ();
+mark_modified ();
 }
 break;
 case FL_MOUSEWHEEL:
 {
 if (instance_ok ())
 instance->do_update_canvas (hnd2idx (gh), ca);
 }
-static void toggle_menubar_visibility (int fig_idx, bool menubar_is_figure)
+static void update_position (const std::string& fig_idx_str,
+const Matrix pos)
 {
 if (instance_ok ())
-instance->do_toggle_menubar_visibility (fig_idx, menubar_is_figure);
+instance->do_update_position (str2idx (fig_idx_str), pos);
 }
 static void toggle_menubar_visibility (const std::string& fig_idx_str,
 bool menubar_is_figure)
 {
-toggle_menubar_visibility (str2idx (fig_idx_str), menubar_is_figure);
+if (instance_ok ())
+instance->do_toggle_menubar_visibility (str2idx (fig_idx_str), menubar_is_figure);
 }
 private:
 static figure_manager *instance;
 void do_mark_modified (int idx)
 {
 wm_iterator win = windows.find (idx);
 if (win != windows.end ())
-win->second->mark_modified ();
+{
+win->second->mark_modified ();
+win->second->update_gui_mode ();
+}
 }
 void do_set_name (int idx)
 {
 wm_iterator win = windows.find (idx);
 if (ca.ok ())
 win->second->show_canvas ();
 else
 win->second->hide_canvas ();
 }
+}
+void do_update_position (int idx, Matrix pos)
+{
+wm_iterator win = windows.find (idx);
+if (win != windows.end ())
+win->second->update_position (pos(0), pos(1), pos(2), pos(3));
 }
 static int str2idx (const caseless_str& clstr)
 {
 int ind;
 == FLTK_GRAPHICS_TOOLKIT_NAME)
 figure_manager::new_window (fp);
 }
 }
 }
-// it seems that we have to call Fl::check twice to get everything drawn
-Fl::check ();
 Fl::check ();
 }
 return 0;
 }
 graphics_handle gh = fp.get___myhandle__ ();
 figure_manager::renumber_figure (tmp, gh.value ());
 figure_manager::set_name (tmp);
 }
 break;
+case figure::properties::ID_POSITION:
+{
+std::string tmp = ov.string_value ();
+Matrix pos = fp.get_position ().matrix_value ();
+figure_manager::update_position (tmp, pos);
+}
+break;
 }
 }
 }
 else if (go.isa ("uimenu"))
 {
 }
 void redraw_figure (const graphics_object& go) const
 {
 figure_manager::mark_modified (go.get_handle ());
-__fltk_redraw__ ();
 }
 void print_figure (const graphics_object& go,
 const std::string& term,
 const std::string& file_cmd, bool /*mono*/,
 const std::string& /*debug_file*/) const
 {
 figure_manager::print (go.get_handle (), file_cmd, term);
-redraw_figure (go);
 }
 Matrix get_canvas_size (const graphics_handle& fh) const
 {
 return figure_manager::get_size (fh);
 }
+/*
 double get_screen_resolution (void) const
 {
 // FLTK doesn't give this info.
 return 72.0;
-}
+// FIXME: FLTK >= 1.3.0 could do this with  Fl::screen_dpi (h, v, n)
+// but do we need it?
+}
+*/
 Matrix get_screen_size (void) const
 {
 Matrix sz (1, 2, 0.0);
 sz(0) = Fl::w ();
 {
 if (toolkit_loaded)
 {
 munlock ("__init_fltk__");
-figure_manager::close_all ();
 octave_value_list args = input_event_hook_fcn_id;
 args.append (false);
 Fremove_input_event_hook (args, 0);
 input_event_hook_fcn_id = octave_value_list ();
-// FIXME: ???
+figure_manager::close_all ();
-Fl::wait (fltk_maxtime);
 }
 }
 void set_input_event_hook_id (const octave_value_list& id)
 {
 #else
 error ("__init_fltk__: not available without OpenGL and FLTK libraries");
 #endif
 return octave_value ();
-}
-DEFUN_DLD (__fltk_maxtime__, args, ,
-"-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{maxtime} =} __fltk_maxtime__ ()\n\
-@deftypefnx {Loadable Function} {} __fltk_maxtime__ (@var{maxtime})\n\
-Undocumented internal function.\n\
-@end deftypefn")
-{
-#ifdef HAVE_FLTK
-octave_value retval = fltk_maxtime;
-if (args.length () == 1)
-{
-if (args(0).is_real_scalar ())
-fltk_maxtime = args(0).double_value ();
-else
-error ("argument must be a real scalar");
-}
-return retval;
-#else
-error ("__fltk_maxtime__: not available without OpenGL and FLTK libraries");
-return octave_value ();
-#endif
 }
 DEFUN_DLD (__have_fltk__, , ,
 "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{FLTK_available} =} __have_fltk__ ()\n\

Mercurial > octave-libgccjit

comparison libinterp/dldfcn/__init_fltk__.cc @ 18958:c9f960441513