Mercurial > octave

diff libinterp/corefcn/display.cc @ 23746:7f176909ab86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move display_info class inside octave namespace * display.h, display.cc (class display_info): Move inside octave namespace. Change all uses. Rename member variables with "m_" prefix. (display_info::display_info): Allow display name to be passed as argument. * cdisplay.h, cdisplay.c (octave_get_display_info): New arg, dpy_name.
author John W. Eaton <jwe@octave.org>
date Fri, 07 Jul 2017 15:41:07 -0400
parents 21baad6b35c4
children 98a03a1097b4
line wrap: on
line diff
--- a/libinterp/corefcn/display.cc	Fri Jul 07 11:35:55 2017 -0400
+++ b/libinterp/corefcn/display.cc	Fri Jul 07 15:41:07 2017 -0400
@@ -30,40 +30,47 @@
 #include "display.h"
 #include "error.h"
 
-display_info *display_info::instance = nullptr;
-
-void
-display_info::init (bool query)
+namespace octave
 {
-  if (query)
-    {
-      int avail = 0;
+  display_info *display_info::instance = nullptr;
 
-      const char *msg = octave_get_display_info (&ht, &wd, &dp, &rx, &ry,
-                                                 &avail);
-
-      dpy_avail = avail;
+  void
+  display_info::init (const std::string& dpy_name, bool query)
+  {
+    if (query)
+      {
+        int avail = 0;
 
-      if (msg)
-        err_msg = msg;
-    }
-}
+        const char *display_name
+          = dpy_name.empty () ? nullptr : dpy_name.c_str ();
+
+        const char *msg
+          = octave_get_display_info (display_name, &m_ht, &m_wd, &m_dp,
+                                     &m_rx, &m_ry, &avail);
+
+        m_dpy_avail = avail;
 
-bool
-display_info::instance_ok (bool query)
-{
-  bool retval = true;
+        if (msg)
+          m_err_msg = msg;
+      }
+  }
 
-  if (! instance)
-    {
-      instance = new display_info (query);
+  bool
+  display_info::instance_ok (bool query)
+  {
+    bool retval = true;
 
-      if (instance)
-        singleton_cleanup_list::add (cleanup_instance);
-    }
+    if (! instance)
+      {
+        instance = new display_info (query);
 
-  if (! instance)
-    error ("unable to create display_info object!");
+        if (instance)
+          singleton_cleanup_list::add (cleanup_instance);
+      }
 
-  return retval;
+    if (! instance)
+      error ("unable to create display_info object!");
+
+    return retval;
+  }
 }