Mercurial > octave
diff libinterp/corefcn/display.h @ 27275:1565c39aa940
don't show display warning in display_info initialization (bug #56651)
* cdisplay.c (octave_get_display_info): Only set dpy_avail to 1 if a
screen is available.
* display.h, display.cc (display_info::initialize): Set m_msg instead
of displaying warning.
* display.h (display_info::m_msg): New data member.
(display_info::message): New function.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 21 Jul 2019 10:16:11 -0400 |
| parents | 596312d4f25d |
| children | b442ec6dda5c |
line wrap: on
line diff
--- a/libinterp/corefcn/display.h Fri Mar 22 15:42:44 2019 -0400 +++ b/libinterp/corefcn/display.h Sun Jul 21 10:16:11 2019 -0400 @@ -40,7 +40,8 @@ // display. display_info (void) - : m_rx (72), m_ry (72), m_ht (1), m_wd (1), m_dp (0), m_dpy_avail (false) + : m_rx (72), m_ry (72), m_ht (1), m_wd (1), m_dp (0), + m_dpy_avail (false), m_msg () { } ~display_info (void) = default; @@ -63,6 +64,8 @@ bool display_available (void) const { return m_dpy_avail; } + std::string message (void) const { return m_msg; } + private: // X- and Y- Resolution of the display in dots (pixels) per inch. @@ -75,6 +78,10 @@ int m_dp; bool m_dpy_avail; + + // Message associated with any initiailization failure. Set if + // m_dpy_avail is false. + std::string m_msg; }; }