Mercurial > octave

annotate libinterp/corefcn/display.cc @ 19075:14bb81940528 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: Update docstring for datenum to describe format argument (bug #43181) * datenum.m: Update docstring to describe the format argument exactly like the docstring for datevec. Add test using format argument.
author Mike Miller <mtmiller@ieee.org>
date Wed, 10 Sep 2014 08:19:43 -0400
parents 870f3e12e163
children edc4791fbcb2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
17744
d63878346099 maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents: 16892
diff changeset
3 Copyright (C) 2009-2013 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 #ifdef HAVE_CONFIG_H
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 #include <config.h>
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 #endif
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 #include <cstdlib>
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28
8572
e17f262a02cd display.cc: get info for windows and os x systems
John W. Eaton <jwe@octave.org>
parents: 8561
diff changeset
29 #if defined (OCTAVE_USE_WINDOWS_API)
13956
5fe75fb673ff fix MinGW cross-compile problem for display.cc
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
30 #include <windows.h>
8595
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents: 8578
diff changeset
31 #elif defined (HAVE_FRAMEWORK_CARBON)
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents: 8578
diff changeset
32 #include <Carbon/Carbon.h>
8572
e17f262a02cd display.cc: get info for windows and os x systems
John W. Eaton <jwe@octave.org>
parents: 8561
diff changeset
33 #elif defined (HAVE_X_WINDOWS)
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 #include <X11/Xlib.h>
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 #endif
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13956
diff changeset
37 #include "singleton-cleanup.h"
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13956
diff changeset
38
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 #include "display.h"
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 #include "error.h"
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 display_info *display_info::instance = 0;
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43
14776
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
44 #if defined (HAVE_FRAMEWORK_CARBON) && ! defined (HAVE_CARBON_CGDISPLAYBITSPERPIXEL)
17861
870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code.
Rik <rik@octave.org>
parents: 17851
diff changeset
45 // FIXME: This will only work for MacOS > 10.5. For earlier versions
14776
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
46 // this code is not needed (use CGDisplayBitsPerPixel instead).
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
47 size_t DisplayBitsPerPixel (CGDirectDisplayID display)
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
48 {
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
49 CGDisplayModeRef mode = CGDisplayCopyDisplayMode (display);
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
50 CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding (mode);
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
51
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
52 if (CFStringCompare (pixelEncoding, CFSTR (IO32BitDirectPixels), 0) == 0)
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
53 return 32;
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
54 else if (CFStringCompare (pixelEncoding, CFSTR (IO16BitDirectPixels), 0) == 0)
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
55 return 16;
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
56 else
14776
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
57 return 8;
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
58 }
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
59 #endif
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
60
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 void
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
62 display_info::init (bool query)
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 {
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
64 if (query)
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
65 {
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66 #if defined (OCTAVE_USE_WINDOWS_API)
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
68 HDC hdc = GetDC (0);
8572
e17f262a02cd display.cc: get info for windows and os x systems
John W. Eaton <jwe@octave.org>
parents: 8561
diff changeset
69
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
70 if (hdc)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
71 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
72 dp = GetDeviceCaps (hdc, BITSPIXEL);
8572
e17f262a02cd display.cc: get info for windows and os x systems
John W. Eaton <jwe@octave.org>
parents: 8561
diff changeset
73
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
74 ht = GetDeviceCaps (hdc, VERTRES);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
75 wd = GetDeviceCaps (hdc, HORZRES);
8572
e17f262a02cd display.cc: get info for windows and os x systems
John W. Eaton <jwe@octave.org>
parents: 8561
diff changeset
76
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
77 double ht_mm = GetDeviceCaps (hdc, VERTSIZE);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
78 double wd_mm = GetDeviceCaps (hdc, HORZSIZE);
8572
e17f262a02cd display.cc: get info for windows and os x systems
John W. Eaton <jwe@octave.org>
parents: 8561
diff changeset
79
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
80 rx = wd * 25.4 / wd_mm;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
81 ry = ht * 25.4 / ht_mm;
15160
973296940c89 don't start GUI if display is not available
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
82
973296940c89 don't start GUI if display is not available
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
83 dpy_avail = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
84 }
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
85 else
17828
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937)
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
86 err_msg = "no graphical display found";
8572
e17f262a02cd display.cc: get info for windows and os x systems
John W. Eaton <jwe@octave.org>
parents: 8561
diff changeset
87
8595
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents: 8578
diff changeset
88 #elif defined (HAVE_FRAMEWORK_CARBON)
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
89
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
90 CGDirectDisplayID display = CGMainDisplayID ();
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
91
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
92 if (display)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
93 {
14776
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
94 # if defined (HAVE_CARBON_CGDISPLAYBITSPERPIXEL)
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
95 // For MacOS < 10.7 use the line below
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
96 dp = CGDisplayBitsPerPixel (display);
14776
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
97 # else
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
98 // For MacOS > 10.5 use the line below
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
99 dp = DisplayBitsPerPixel (display);
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
100 # endif
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
101
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
102 ht = CGDisplayPixelsHigh (display);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
103 wd = CGDisplayPixelsWide (display);
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
104
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
105 CGSize sz_mm = CGDisplayScreenSize (display);
14776
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
106 // For MacOS >= 10.6, CGSize is a struct keeping 2 CGFloat values,
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
107 // but the CGFloat typedef is not present on older systems,
0eb1b1eb2c76 Detect Carbon's CGDisplayBitsPerPixel during configure. Use it if present.
Ben Abbott <bpabbott@mac.com>
parents: 14138
diff changeset
108 // so use double instead.
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
109 double ht_mm = sz_mm.height;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
110 double wd_mm = sz_mm.width;
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
111
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
112 rx = wd * 25.4 / wd_mm;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
113 ry = ht * 25.4 / ht_mm;
15160
973296940c89 don't start GUI if display is not available
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
114
973296940c89 don't start GUI if display is not available
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
115 dpy_avail = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
116 }
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
117 else
17828
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937)
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
118 err_msg = "no graphical display found";
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
119
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
120 #elif defined (HAVE_X_WINDOWS)
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
121
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
122 const char *display_name = getenv ("DISPLAY");
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
123
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
124 if (display_name && *display_name)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
125 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
126 Display *display = XOpenDisplay (display_name);
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
127
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
128 if (display)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
129 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
130 Screen *screen = DefaultScreenOfDisplay (display);
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
131
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
132 if (screen)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
133 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
134 dp = DefaultDepthOfScreen (screen);
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
135
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
136 ht = HeightOfScreen (screen);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
137 wd = WidthOfScreen (screen);
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
138
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
139 int screen_number = XScreenNumberOfScreen (screen);
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
140
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
141 double ht_mm = DisplayHeightMM (display, screen_number);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
142 double wd_mm = DisplayWidthMM (display, screen_number);
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
143
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
144 rx = wd * 25.4 / wd_mm;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
145 ry = ht * 25.4 / ht_mm;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
146 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
147 else
17828
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937)
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
148 err_msg = "X11 display has no default screen";
13996
694a7af7eaab close X display when done with it
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
149
694a7af7eaab close X display when done with it
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
150 XCloseDisplay (display);
15160
973296940c89 don't start GUI if display is not available
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
151
973296940c89 don't start GUI if display is not available
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
152 dpy_avail = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
153 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
154 else
17828
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937)
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
155 err_msg = "unable to open X11 DISPLAY";
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
156 }
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
157 else
17828
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937)
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
158 err_msg = "X11 DISPLAY environment variable not set";
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
159 #else
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
160
17828
6b787e274eb1 make -q suppress no graphical display startup message (bug #38937)
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
161 err_msg = "no graphical display found";
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
162
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
163 #endif
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
164 }
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
165 }
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
166
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
167 bool
9335
f2d354df53ee new option, --no-window-system
John W. Eaton <jwe@octave.org>
parents: 8642
diff changeset
168 display_info::instance_ok (bool query)
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
169 {
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
170 bool retval = true;
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
171
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
172 if (! instance)
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13956
diff changeset
173 {
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13956
diff changeset
174 instance = new display_info (query);
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13956
diff changeset
175
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13956
diff changeset
176 if (instance)
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13956
diff changeset
177 singleton_cleanup_list::add (cleanup_instance);
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13956
diff changeset
178 }
8561
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
179
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
180 if (! instance)
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
181 {
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
182 ::error ("unable to create display_info object!");
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
183
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
184 retval = false;
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
185 }
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
186
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
187 return retval;
66165de2cc42 add new files for previous changeset
John W. Eaton <jwe@octave.org>
parents:
diff changeset
188 }