Mercurial > hg > octave-nkf

comparison libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp @ 16620:818eef7b2618

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6f7940e36322
children ba808cd9d86c
comparison
equal deleted inserted replaced
16619:db31d1e77d7b 16620:818eef7b2618
133 case IBeamCursor: m_terminalView->setKeyboardCursorShape(TerminalView::IBeamCursor); break; 133 case IBeamCursor: m_terminalView->setKeyboardCursorShape(TerminalView::IBeamCursor); break;
134 } 134 }
135 m_terminalView->setBlinkingCursor(blinking); 135 m_terminalView->setBlinkingCursor(blinking);
136 } 136 }
137 137
138 // FIXME -- not sure how to make these work properly given the way the
139 // Unix terminal handles colors.
140 void QUnixTerminalImpl::setBackgroundColor (const QColor& color) { }
141 void QUnixTerminalImpl::setForegroundColor (const QColor& color) { }
142 void QUnixTerminalImpl::setSelectionColor (const QColor& color) { }
143
144 void QUnixTerminalImpl::setCursorColor (bool useForegroundColor,
145 const QColor& color)
146 {
147 m_terminalView->setKeyboardCursorColor (useForegroundColor, color);
148 }
149
138 void QUnixTerminalImpl::showEvent(QShowEvent *) 150 void QUnixTerminalImpl::showEvent(QShowEvent *)
139 { 151 {
140 m_terminalView->updateImage(); 152 m_terminalView->updateImage();
141 m_terminalView->repaint(); 153 m_terminalView->repaint();
142 m_terminalView->update(); 154 m_terminalView->update();