Mercurial > octave
annotate src/display.h @ 13983:7dd7cccf0757
clean up memory allocated for singletons before exit
* singleton-cleanup.h, singleton-cleanup.cc: New files.
* liboctave/Makefile.am (INCS, LIBOCTAVE_CXX_SOURCES):
Add them to the lists.
* toplev.cc (clean_up_and_exit): Call singleton_cleanup_list::cleanup.
* debug.h, debug.cc (bp_table::instance_ok): Move definition to
debug.cc.
* coment-list.h (octave_comment_buffer::~octave_comment_buffer):
Define destructor for class.
* ov-typeinfo.h (octave_value_typeinfo::~octave_value_typeinfo):
Likewise.
* cmd-edit.h (command_editor::cleanup_instance): New function.
* cmd-hist.h (command_history::cleanup_instance): New function.
* file-ops.h (file_ops::cleanup_instance): New function.
* mach-info.h (oct_mach_info::cleanup_instance): New function.
* oct-env.h (octave_env::cleanup_instance): New function.
* oct-fftw.h (octave_fftw_planner::cleanup_instance): New function.
* oct-rand.h (octave_rand::cleanup_instance): New function.
* oct-spparms.h (octave_sparse_params::cleanup_instance):
New function.
* pathsearch.h (static_members::cleanup_instance): New function.
* comment-list.h (octave_comment_buffer::cleanup_instance):
New function.
* debug.h (bp_table::cleanup_instance): New function.
* display.h (display_info::cleanup_instance): New function.
* dynamic-ld.cc (octave_shlib_list::cleanup_instance,
octave_mex_file_list::cleanup_instance): New functions.
* dynamic-ld.h (octave_dynamic_loader::cleanup_instance):
New function.
* load-path.h (load_path::cleanup_instance): New function.
* oct-stream.h (octave_stream_list::cleanup_instance): New function.
* ov-typeinfo.h (octave_value_typeinfo::cleanup_instance):
New function.
* pager.h, pager.cc (octave_pager_stream::instance_ok,
octave_pager_stream::cleanup_instance): New functions.
(octave_diary_stream::instance_ok,
octave_diary_stream::cleanup_instance): New functions.
* sighandlers.h (octave_child_list::cleanup_instance): New function.
* toplev.h (octave_call_stack
* pager.cc (octave_pager_stream::stream, octave_diary_stream::stream):
Use instance_ok to create instance.
* toplev.h (octave_call_stack::cleanup_instance): New function.
* cmd-edit.cc (command_editor::instance_ok):
Register cleanup function.
* cmd-hist.cc (command_history::instance_ok): Likewise.
* file-ops.cc (file_ops::instance_ok): Likewise.
* mach-info.cc (oct_mach_info::instance_ok): Likewise.
* oct-env.cc (octave_env::instance_ok): Likewise.
* oct-fftw.cc (octave_fftw_planner::instance_ok): Likewise.
* oct-rand.cc (octave_rand::instance_ok): Likewise.
* oct-spparms.cc (octave_sparse_params::instance_ok): Likewise.
* pathsearch.cc (dir_path::static_members::instance_ok): Likewise.
* comment-list.cc (comment_list::instance_ok): Likewise.
* debug.cc (bp_table::instance_ok): Likewise.
* display.cc (display_info::instance_ok): Likewise.
* dynamic-ld.cc (octave_shlib_list::instance_ok,
octave_mex_file_list::instance_ok, octave_dynamic_loader): Likewise.
* load-path.cc (load_path::instance_ok): Likewise.
* oct-stream.cc (octave_stream_list::instance_ok): Likewise.
* ov-typeinfo.cc (octave_value_typeinfo::instance_ok): Likewise.
* sighandlers.cc (octave_child_list::instance_ok): Likewise.
* symtab.h, symtab.cc (symbol_table::scope_id::create_instance):
New function.
* symtab.h (symbol_table::scope_id::instance_ok): Call create_instance.
* toplev.h, toplev.cc (octave_call_stack::create_instance):
New function.
* toplev.cc (octave_call_stack::instance_ok): Call create_instance.
* pager.h, pager.cc (octave_pager_stream::set_diary_skip,
octave_pager_stream::flush_current_contents_to_diary): Now static.
octave_pager_stream::do_set_diary_skip,
octave_pager_stream::do_flush_current_contents_to_diary):
New functions.
(octave_pager_stream::stream): Return std::ostream&, not
octave_pager_stream&. If instance creation fails, return std::cout.
(octave_diary_stream::stream): Return std::ostream&, not
octave_diary_stream&. If instance creation fails, return std::cout.
(octave_pager_stream::do_reset, octave_diary_stream::do_reset):
Use instance_ok to create instance.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 03 Dec 2011 04:34:17 -0500 |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
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 |
11523 | 3 Copyright (C) 2009-2011 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 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 #if !defined (octave_display_h) |
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 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 class Matrix; |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 class display_info |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 { |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
30 protected: |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 |
9335
f2d354df53ee
new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents:
8561
diff
changeset
|
32 display_info (bool query = true) |
8561
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 : ht (1), wd (1), dp (0), rx (72), ry (72) |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 { |
9335
f2d354df53ee
new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents:
8561
diff
changeset
|
35 init (query); |
8561
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 } |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
37 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 public: |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
40 static int height (void) |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
41 { |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
42 return instance_ok () ? instance->do_height () : 0; |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
43 } |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
44 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
45 static int width (void) |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
46 { |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
47 return instance_ok () ? instance->do_width () : 0; |
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 static int depth (void) |
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 return instance_ok () ? instance->do_depth () : 0; |
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 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
55 static double x_dpi (void) |
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 return instance_ok () ? instance->do_x_dpi () : 0; |
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 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
60 static double y_dpi (void) |
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 return instance_ok () ? instance->do_y_dpi () : 0; |
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 |
9335
f2d354df53ee
new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents:
8561
diff
changeset
|
65 // 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
|
66 // 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
|
67 static void no_window_system (void) |
f2d354df53ee
new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents:
8561
diff
changeset
|
68 { |
f2d354df53ee
new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents:
8561
diff
changeset
|
69 instance_ok (false); |
f2d354df53ee
new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents:
8561
diff
changeset
|
70 } |
f2d354df53ee
new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents:
8561
diff
changeset
|
71 |
8561
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
72 private: |
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 static display_info *instance; |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
75 |
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
76 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
|
77 |
8561
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
78 // Height, width, and depth of the display. |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
79 int ht; |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
80 int wd; |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
81 int dp; |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
82 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
83 // 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
|
84 double rx; |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
85 double ry; |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
86 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
87 int do_height (void) const { return ht; } |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
88 int do_width (void) const { return wd; } |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
89 int do_depth (void) const { return dp; } |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
90 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
91 double do_x_dpi (void) const { return rx; } |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
92 double do_y_dpi (void) const { return ry; } |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
93 |
9335
f2d354df53ee
new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents:
8561
diff
changeset
|
94 void init (bool query = true); |
8561
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
95 |
9335
f2d354df53ee
new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents:
8561
diff
changeset
|
96 static bool instance_ok (bool query = true); |
8561
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
97 }; |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
98 |
66165de2cc42
add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
99 #endif |