octave: libinterp/corefcn/display.h annotate

annotate libinterp/corefcn/display.h @ 20924:e74e617060cf

Merged C-code of cdisplay.* to C++ display.cc. * libinterp/corefcn/display.cc: merged code from cdisplay.{c/h}. * libinterp/corefcn/display.h: merged code from cdisplay.{c/h}. * libinterp/corefcn/cdisplay.c: removed merged code. * libinterp/corefcn/cdisplay.h: removed no longer needed header. * libinterp/corefcn/module.mk: removed cdisplay.{c/h} from build system.

author	Kai T. Ohlhus <k.ohlhus@gmail.com>
date	Thu, 17 Dec 2015 16:14:24 +0100
parents	f7084eae3318
children	ecb95c6384f2

rev	line source
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 17953 diff changeset	3 Copyright (C) 2009-2015 John W. Eaton
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	4
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	5 This file is part of Octave.
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	6
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	10 option) any later version.
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	11
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	15 for more details.
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	16
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	20
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	22
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19697 diff changeset	23 #if ! defined (octave_display_h)
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	24 #define octave_display_h 1
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	25
20924 e74e617060cf Merged C-code of cdisplay.* to C++ display.cc. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20791 diff changeset	26 #ifdef HAVE_CONFIG_H
e74e617060cf Merged C-code of cdisplay.* to C++ display.cc. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20791 diff changeset	27 #include <config.h>
e74e617060cf Merged C-code of cdisplay.* to C++ display.cc. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20791 diff changeset	28 #endif
17828 6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	29
20924 e74e617060cf Merged C-code of cdisplay.* to C++ display.cc. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20791 diff changeset	30 #include <string>
e74e617060cf Merged C-code of cdisplay.* to C++ display.cc. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20791 diff changeset	31 #include <cstdlib>
e74e617060cf Merged C-code of cdisplay.* to C++ display.cc. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20791 diff changeset	32
e74e617060cf Merged C-code of cdisplay.* to C++ display.cc. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20791 diff changeset	33 #include "singleton-cleanup.h"
e74e617060cf Merged C-code of cdisplay.* to C++ display.cc. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20791 diff changeset	34
e74e617060cf Merged C-code of cdisplay.* to C++ display.cc. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20791 diff changeset	35 #include "error.h"
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	36
17953 f792a5c15b46 * libinterp/corefcn/display.h (class display_info): Add OCTINTERP_API. Michael Goffioul <michael.goffioul@gmail.com> parents: 17828 diff changeset	37 class
f792a5c15b46 * libinterp/corefcn/display.h (class display_info): Add OCTINTERP_API. Michael Goffioul <michael.goffioul@gmail.com> parents: 17828 diff changeset	38 OCTINTERP_API
f792a5c15b46 * libinterp/corefcn/display.h (class display_info): Add OCTINTERP_API. Michael Goffioul <michael.goffioul@gmail.com> parents: 17828 diff changeset	39 display_info
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	40 {
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	41 protected:
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	42
9335 f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	43 display_info (bool query = true)
17828 6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	44 : ht (1), wd (1), dp (0), rx (72), ry (72), dpy_avail (false),
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	45 err_msg ()
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	46 {
9335 f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	47 init (query);
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	48 }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	49
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	50 public:
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	51
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	52 static int height (void)
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	53 {
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	54 return instance_ok () ? instance->do_height () : 0;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	55 }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	56
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	57 static int width (void)
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	58 {
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	59 return instance_ok () ? instance->do_width () : 0;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	60 }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	61
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	62 static int depth (void)
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	63 {
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	64 return instance_ok () ? instance->do_depth () : 0;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	65 }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	66
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	67 static double x_dpi (void)
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	68 {
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	69 return instance_ok () ? instance->do_x_dpi () : 0;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	70 }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	71
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	72 static double y_dpi (void)
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	73 {
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	74 return instance_ok () ? instance->do_y_dpi () : 0;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	75 }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	76
15160 973296940c89 don't start GUI if display is not available John W. Eaton <jwe@octave.org> parents: 15096 diff changeset	77 static bool display_available (void)
973296940c89 don't start GUI if display is not available John W. Eaton <jwe@octave.org> parents: 15096 diff changeset	78 {
17828 6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	79 std::string msg;
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	80 return instance_ok () ? instance->do_display_available (msg) : false;
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	81 }
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	82
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	83 static bool display_available (std::string& msg)
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	84 {
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	85 return instance_ok () ? instance->do_display_available (msg) : false;
15160 973296940c89 don't start GUI if display is not available John W. Eaton <jwe@octave.org> parents: 15096 diff changeset	86 }
973296940c89 don't start GUI if display is not available John W. Eaton <jwe@octave.org> parents: 15096 diff changeset	87
9335 f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	88 // To disable querying the window system for defaults, this function
f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	89 // must be called before any other display_info function.
f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	90 static void no_window_system (void)
f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	91 {
f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	92 instance_ok (false);
f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	93 }
f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	94
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	95 private:
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	96
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	97 static display_info *instance;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	98
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	99 static void cleanup_instance (void) { delete instance; instance = 0; }
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	100
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	101 // Height, width, and depth of the display.
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	102 int ht;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	103 int wd;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	104 int dp;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	105
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	106 // X- and Y- Resolution of the display in dots (pixels) per inch.
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	107 double rx;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	108 double ry;
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	109
15160 973296940c89 don't start GUI if display is not available John W. Eaton <jwe@octave.org> parents: 15096 diff changeset	110 bool dpy_avail;
973296940c89 don't start GUI if display is not available John W. Eaton <jwe@octave.org> parents: 15096 diff changeset	111
17828 6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	112 std::string err_msg;
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	113
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	114 int do_height (void) const { return ht; }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	115 int do_width (void) const { return wd; }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	116 int do_depth (void) const { return dp; }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	117
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	118 double do_x_dpi (void) const { return rx; }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	119 double do_y_dpi (void) const { return ry; }
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	120
17828 6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	121 bool do_display_available (std::string& msg) const
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	122 {
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	123 msg = err_msg;
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	124
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	125 return dpy_avail;
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	126 }
15160 973296940c89 don't start GUI if display is not available John W. Eaton <jwe@octave.org> parents: 15096 diff changeset	127
9335 f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	128 void init (bool query = true);
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	129
9335 f2d354df53ee new option, --no-window-system John W. Eaton <jwe@octave.org> parents: 8561 diff changeset	130 static bool instance_ok (bool query = true);
8561 66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	131 };
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	132
66165de2cc42 add new files for previous changeset John W. Eaton <jwe@octave.org> parents: diff changeset	133 #endif

Mercurial > octave

annotate libinterp/corefcn/display.h @ 20924:e74e617060cf