Mercurial > hg > octave-avbm
view libinterp/octave-value/ov-dld-fcn.cc @ 16622:818eef7b2618
allow terminal colors to be set from preferences dialog
* QTerminalInterface.h (QTerminalInterface::setBackgroundColor,
QTerminalInterface::setForeroundColor,
QTerminalInterface::setSelectionColor,
QTerminalInterface::setCursorColor): New functions.
* QUnixTerminalImpl.h, QUnixTerminalImpl.cpp
QUnixTerminalImpl::setBackgroundColor,
QUnixTerminalImpl::setForeroundColor,
QUnixTerminalImpl::setSelectionColor,
QUnixTerminalImpl::setCursorColor): New functions.
* QWinTerminalImpl.h, QWinTerminalImpl.cpp
(QConsolePrivate::setCursorColor): New argument, useForegroundColor.
(QConsolePrivate::m_selectionColor, QConsolePrivate::m_cursorColor):
New member variablebs.
(QConsolePrivate::selectionColor, QConsolePrivate::cursorColor,
QConsolePrivate::setSelectionColor, QConsolePrivate::setCursorColor):
Use member variables instead of Windows console color map.
(QConsolePrivate::cursorColor): Return foreground color if stored
color is invalid.
(QConsolePrivate::setCursorColor): Store invalid color if
useForegroundcolor.
(QConsolePrivate::QConsolePrivate): Set default selection and cursor
colors.
* QTerminal.cc (QTerminal::notice_settings): Handle terminal color
settings.
* resource-manager.h, resource-manager.cc
(resource_manager::terminal_color_names,
resource_manager::terminal_default_colors,
resource_manager::terminal_color_chars): New functions.
* settings-dialog.h, settings-dialog.cc
(settings_dialog::read_terminal_colors): New function.
(settings_dialog::settings_dialog): Call read_terminal_colors. Read
valud for using foreground color for cursor color.
(settings_dialog::write_terminal_colors): New function.
(settings_dialog::write_changed_settings): Call
write_terminal_colors. Handle setting for using foreground color for
cursor color.
* settings-dialog.ui: Add color selection to terminal settings
dialog.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 06 May 2013 06:00:44 -0400 |
parents | 2fc554ffbc28 |
children |
line wrap: on
line source
/* Copyright (C) 1996-2012 John W. Eaton 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 <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "oct-shlib.h" #include <defaults.h> #include "dynamic-ld.h" #include "error.h" #include "oct-obj.h" #include "ov-dld-fcn.h" #include "ov.h" DEFINE_OCTAVE_ALLOCATOR (octave_dld_function); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_dld_function, "dynamically-linked function", "dynamically-linked function"); octave_dld_function::octave_dld_function (octave_builtin::fcn ff, const octave_shlib& shl, const std::string& nm, const std::string& ds) : octave_builtin (ff, nm, ds), sh_lib (shl) { mark_fcn_file_up_to_date (time_parsed ()); std::string file_name = fcn_file_name (); system_fcn_file = (! file_name.empty () && Voct_file_dir == file_name.substr (0, Voct_file_dir.length ())); } octave_dld_function::~octave_dld_function (void) { octave_dynamic_loader::remove_oct (my_name, sh_lib); } std::string octave_dld_function::fcn_file_name (void) const { return sh_lib.file_name (); } octave_time octave_dld_function::time_parsed (void) const { return sh_lib.time_loaded (); } // Note: this wrapper around the octave_dld_function constructor is // necessary to work around a MSVC limitation handling in // virtual destructors that prevents unloading a dynamic module // before *all* objects (of class using a virtual dtor) have // been fully deleted; indeed, MSVC attaches auto-generated code // (scalar deleting destructor) to objects created in a dynamic // module, and this code will be executed in the dynamic module // context at object deletion; unloading the dynamic module // before objects have been deleted will make the "delete" code // of objects to point to an invalid code segment. octave_dld_function* octave_dld_function::create (octave_builtin::fcn ff, const octave_shlib& shl, const std::string& nm, const std::string& ds) { return new octave_dld_function (ff, shl, nm, ds); }