view libgui/src/terminal-dock-widget.cc @ 31619:ad014fc78bd6

use individual local gui_settings objects Previously, we created a single gui_settings object (derived from QSettings) and accessed it from the resource_manager object. That design is not necessary and is not the way QSettings was designed to be used. Instead of managing a single object, we should be using individual QSettings objects where needed. Each individual QSettings object manages thread-safe access to a single global collection of settings. The Qt docs say that operations on QSettings are not thread safe, but that means that you can't create a QSettings object in one thread and use it in another without some locking. I'm not sure whether we were doing that correctly, but with this change it no longer matters. Each QSettings object does perform locking when reading or writing the underlying global data. * resource-manager.h, resource-manager.cc (resource_manager::m_settings): Delete data member. (resource_manager::get_settings): Delete. * annotation-dialog.cc, QTerminal.cc, QTerminal.h, command-widget.cc, command-widget.h, community-news.cc, dialog.cc, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, history-dock-widget.cc, history-dock-widget.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, octave-qscintilla.cc, main-window.cc, main-window.h, news-reader.cc, octave-dock-widget.cc, octave-dock-widget.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, resource-manager.cc, resource-manager.h, set-path-dialog.cc, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, workspace-model.cc, workspace-model.h, workspace-view.cc: Use local gui_settings objects instead of accessing a pointer to a single gui_settings object owned by the resource_manager object.
author John W. Eaton <jwe@octave.org>
date Fri, 02 Dec 2022 14:23:53 -0500
parents 1a0756f7c90a
children 431f80aba37a
line wrap: on
line source

////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2011-2022 The Octave Project Developers
//
// See the file COPYRIGHT.md in the top-level directory of this
// distribution or <https://octave.org/copyright/>.
//
// This file is part of Octave.
//
// Octave is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Octave is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Octave; see the file COPYING.  If not, see
// <https://www.gnu.org/licenses/>.
//
////////////////////////////////////////////////////////////////////////

#if defined (HAVE_CONFIG_H)
#  include "config.h"
#endif

#include <QScreen>

// This header is only needed for the new terminal widget.
#if defined (HAVE_QSCINTILLA)
#  include "command-widget.h"
#endif

// This header is only needed for the old terminal widget.
#include "QTerminal.h"

#include "gui-preferences-cs.h"
#include "gui-preferences-global.h"

#include "octave-qobject.h"
#include "terminal-dock-widget.h"

namespace octave
{
  terminal_dock_widget::terminal_dock_widget (QWidget *p,
                                              base_qobject& oct_qobj)
    : octave_dock_widget ("TerminalDockWidget", p, oct_qobj),
      m_experimental_terminal_widget (oct_qobj.experimental_terminal_widget ())
  {
    // FIXME: we could do this in a better way, but improving it doesn't
    // matter much if we will eventually be removing the old terminal.
    if (m_experimental_terminal_widget)
      {
#if defined (HAVE_QSCINTILLA)
        command_widget *widget = new command_widget (oct_qobj, this);
        console *con = widget->get_console ();

        connect (this, &terminal_dock_widget::settings_changed,
                 widget, &command_widget::notice_settings);

        connect (this, &terminal_dock_widget::update_prompt_signal,
                 widget, &command_widget::update_prompt);

        connect (this, &terminal_dock_widget::interpreter_output_signal,
                 widget, &command_widget::insert_interpreter_output);

        connect (this, &terminal_dock_widget::execute_command_signal,
                con, &console::execute_command);

        connect (this, &terminal_dock_widget::new_command_line_signal,
                con, &console::new_command_line);

        m_terminal = widget;
#endif
      }
    else
      {
        QTerminal *widget = QTerminal::create (oct_qobj, this);

        connect (this, &terminal_dock_widget::settings_changed,
                 widget, &QTerminal::notice_settings);

        // Connect the visibility signal to the terminal for
        // dis-/enabling timers.
        connect (this, &terminal_dock_widget::visibilityChanged,
                 widget, &QTerminal::handle_visibility_changed);

        m_terminal = widget;
      }

    m_terminal->setObjectName ("OctaveTerminal");
    m_terminal->setFocusPolicy (Qt::StrongFocus);

    set_title (tr ("Command Window"));

    setWidget (m_terminal);
    setFocusProxy (m_terminal);

    // Chose a reasonable size at startup in order to avoid truncated
    // startup messages

    gui_settings settings;

    QFont font = QFont ();
    font.setStyleHint (QFont::TypeWriter);
    QString default_font = settings.value (global_mono_font).toString ();
    font.setFamily
      (settings.value (cs_font.key, default_font).toString ());
    font.setPointSize
      (settings.value (cs_font_size).toInt ());

    QFontMetrics metrics(font);

    int win_x =  metrics.maxWidth()*80;
    int win_y =  metrics.height()*25;

    int max_x = QGuiApplication::primaryScreen ()->availableGeometry ().width ();
    int max_y = QGuiApplication::primaryScreen ()->availableGeometry ().height ();

    if (win_x > max_x)
      win_x = max_x;
    if (win_y > max_y)
      win_y = max_y;

    setGeometry (0, 0, win_x, win_y);

    if (! p)
      make_window ();
  }

  bool terminal_dock_widget::has_focus (void) const
  {
    QWidget *w = widget ();
    return w->hasFocus ();
  }

  QTerminal * terminal_dock_widget::get_qterminal (void)
  {
    return (m_experimental_terminal_widget
            ? nullptr : dynamic_cast<QTerminal *> (m_terminal));
  }

#if defined (HAVE_QSCINTILLA)
  command_widget * terminal_dock_widget::get_command_widget (void)
  {
    return (m_experimental_terminal_widget
            ? dynamic_cast<command_widget *> (m_terminal) : nullptr);
  }
#endif

  void terminal_dock_widget::notice_settings (void)
  {
    emit settings_changed ();
  }

  void terminal_dock_widget::init_command_prompt ()
  {
    if (m_experimental_terminal_widget)
      {
#if defined (HAVE_QSCINTILLA)
        command_widget *cmd = get_command_widget ();
        if (cmd)
          cmd->init_command_prompt ();
#endif
      }
  }
}