opengnsys
/
ogbrowser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'qt6-upgrade'

jenkins
Luis Gerardo Romero Garcia 2023-10-20 11:45:22 +02:00
parent 347df67fa5 f9f000b67a
commit ae6e4eeb60
209 changed files with 25983 additions and 11245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored 100644
View File

@ -0,0 +1,5 @@
CMakeLists.txt.user*
out
build
build2
.vscode

10
CMakeLists.txt 100644
View File

@ -0,0 +1,10 @@
cmake_minimum_required(VERSION 3.16)
project(Browser)
set_property(GLOBAL PROPERTY CMAKE_CXX_STANDARD 17)
set_property(GLOBAL PROPERTY CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(qtermwidget)
add_subdirectory(digitalclock)
add_subdirectory(src)

17
CMakePresets.json 100644
View File

@ -0,0 +1,17 @@
{
"version": 2,
"configurePresets": [
{
"name": "Default",
"displayName": "Configure preset using toolchain file",
"description": "Sets Ninja generator, build and install directory",
"generator": "Ninja",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_TOOLCHAIN_FILE": "",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
}
}
]
}

55
README.md 100644
View File

@ -0,0 +1,55 @@
# OG Browser
El OpenGnsys Browser es un navegador limitado de tipo quiosco, basado en Qt6/Chrome.
## Compilacion
El sistema esta basado en CMake. Para compilar:
git clone https://ognproject.evlt.uma.es/gitea/unizar/ogbrowser.git
cd ogbrowser
mkdir build
cd build
cmake ..
make -j8 # 8 cores -- cambiar según hardware
## Uso
src/OGBrowser URL
Por ejemplo:
src/OGBrowser http://example.com
## URLs especiales:
El navegador reconoce URLs especiales dentro de los documentos, que pueden usarse
para ejecutar comandos locales.
* command - Ejecuta un comando
* command+output - Ejecuta un comando y muestra la salida
* command+confirm - Pregunta antes de ejecutar un comando
* command+confirm+output - Pregunta antes de ejecutar un comando y muestra la salida
* command+output+confirm - Idéntico al anterior
Ejemplo:
<a href="command+confirm+output:/bin/ping -c 5 127.0.0.1">Ejecutar</a>
Esto crea un enlace que al hacerse click, ejecuta el comando ping y muestra el resultado en una ventana.
## Proxy
Usa el proxy del sistema, incluyendo las variables de entorno: HTTP_PROXY, HTTPS_PROXY, ALL_PROXY, NO_PROXY
## Modo administrativo
El administrador dispone de una consola y mas información sobre la ejecución de comandos.
Se activa estableciendo la variable de entorno `ogactiveadmin=true`

5
browser.pro
View File

@ -1,5 +0,0 @@
TEMPLATE = subdirs
SUBDIRS = qtermwidget digitalclock src
OPTIONS += ordered
CONFIG += qt warn_on release

34
digitalclock/CMakeLists.txt 100644
View File

@ -0,0 +1,34 @@
cmake_minimum_required(VERSION 3.16)
project(DigitalClock LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
find_package(QT NAMES Qt6 dirCOMPONENTS Widgets LinguistTools Network REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets LinguistTools Network REQUIRED)
message(STATUS "Building DigitalClock with Qt ${QT_VERSION}")
set(SOURCES
digitalclock.cpp
)
add_library(DigitalClock ${SOURCES} )
set_property(TARGET DigitalClock PROPERTY CXX_STANDARD 17)
set_property(TARGET DigitalClock PROPERTY CXX_STANDARD_REQUIRED ON)
target_link_libraries(DigitalClock PRIVATE Qt${QT_VERSION_MAJOR}::Widgets )
# We export this information so that other projects can use it
set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include directories" FORCE)
set(${PROJECT_NAME}_LIB_DIRS ${PROJECT_BINARY_DIR} CACHE INTERNAL "${PROJECT_NAME}: Library directories" FORCE)

23
digitalclock/digitalclock.cpp
View File

@ -1,12 +1,22 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2015 The Qt Company Ltd. ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the examples of the Qt Toolkit. ** This file is part of the examples of the Qt Toolkit.
** **
** $QT_BEGIN_LICENSE:BSD$ ** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows: ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
** **
** "Redistribution and use in source and binary forms, with or without ** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are ** modification, are permitted provided that the following conditions are
@ -38,10 +48,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui>
#include "digitalclock.h" #include "digitalclock.h"
#include <QTime>
#include <QTimer>
//! [0] //! [0]
DigitalClock::DigitalClock(QWidget *parent) DigitalClock::DigitalClock(QWidget *parent)
: QLCDNumber(parent) : QLCDNumber(parent)
@ -49,7 +60,7 @@ DigitalClock::DigitalClock(QWidget *parent)
setSegmentStyle(Filled); setSegmentStyle(Filled);
QTimer *timer = new QTimer(this); QTimer *timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(showTime())); connect(timer, &QTimer::timeout, this, &DigitalClock::showTime);
timer->start(1000); timer->start(1000);
showTime(); showTime();

18
digitalclock/digitalclock.h
View File

@ -1,12 +1,22 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2015 The Qt Company Ltd. ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the examples of the Qt Toolkit. ** This file is part of the examples of the Qt Toolkit.
** **
** $QT_BEGIN_LICENSE:BSD$ ** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows: ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
** **
** "Redistribution and use in source and binary forms, with or without ** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are ** modification, are permitted provided that the following conditions are
@ -49,7 +59,7 @@ class DigitalClock : public QLCDNumber
Q_OBJECT Q_OBJECT
public: public:
DigitalClock(QWidget *parent = 0); DigitalClock(QWidget *parent = nullptr);
private slots: private slots:
void showTime(); void showTime();

28
digitalclock/digitalclock.pro
View File

@ -1,23 +1,9 @@
TEMPLATE = lib QT += widgets
DESTDIR = ..
TARGET = digitalclock
CONFIG += qt release warn_on build_all staticlib
QT += core gui
MOC_DIR = ../.moc
OBJECTS_DIR = ../.objs
TARGET = digitalclock
DEFINES += HAVE_POSIX_OPENPT
#or DEFINES += HAVE_GETPT
HEADERS = digitalclock.h
SOURCES = digitalclock.cpp
HEADERS = digitalclock.h
SOURCES = digitalclock.cpp \
main.cpp
# install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/digitalclock
INSTALLS += target

61
digitalclock/main.cpp 100644
View File

@ -0,0 +1,61 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QApplication>
#include "digitalclock.h"
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
DigitalClock clock;
clock.show();
return app.exec();
}

1
qndtest 100644
View File

@ -0,0 +1 @@
test

1
qtermwidget/.translation-update 100644
View File

@ -0,0 +1 @@
translations='./lib'

16
qtermwidget/AUTHORS
View File

@ -1 +1,15 @@
e_k@users.sourceforge.net Originally forked from Konsole by <e_k@users.sourceforge.net>
Revived by Petr Vanek <petr@yarpen.cz>
Contributors:
Adam Treat <atreat@rim.com>
Chris Mueller <ruunsmail@googlemail.com>
Christian Surlykke <christian@surlykke.dk>
Daniel O'Neill <doneill@cammy.riverroadcable.com>
Francisco Ballina <zballinita@gmail.com>
Georg Rudoy <0xd34df00d@gmail.com>
Jerome Leclanche <jerome@leclan.ch>
Petr Vanek <petr@yarpen.cz>
@kulti <kultihell@gmail.com>

427
qtermwidget/CHANGELOG 100644
View File

@ -0,0 +1,427 @@
qtermwidget-1.4.0 / unreleased
===============================
* TERM env variable set to xterm-256color when not set with QTermWidget::setEnvironment().
qtermwidget-1.3.0 / 2023-04-15
===============================
* Fixed a problem in switching the color scheme between dark and light.
* Prevented a crash on splitting the terminal under `kwin_wayland`
qtermwidget-1.2.0 / 2022-11-05
===============================
* Enabled Bidi rendering by default.
* Made text DND follow the settings for newline trimming and multiline prompt.
* Allow `QTermWidget` to be used as a Qt Plugin.
qtermwidget-1.1.0 / 2022-04-15
===============================
* Handled the zero history size.
* Removed an unused variable.
* Corrected some code indentations.
* Added API documentation and followed naming convention.
* Return focus to terminal on closing search bar.
* Moved to SIP 5.x wth PyQt.
* Added contexts to some lambda connections.
qtermwidget-1.0.0 / 2021-11-04
===============================
* Bumped minimum required Qt version to 5.15.
* Fixed crash under (Plasma) Wayland on opening tab and splitting.
* Use "empty()" to check for container emptiness.
* Made some member functions const.
* Quote drag-and-drop file names.
* Backported CNL and CPL support from Konsole.
* Use QRandomGenerator instead of qrand().
* Silenced some compilation warnings.
* Basic EditorConfig definition.
qtermwidget-0.17.0 / 2021-04-15
===============================
* Drop support for KDE3 color scheme formats.
* Some code cleanup and modernization.
* Added a method to disable bracketed paste mode.
* Added an example for PyQt5.
* Improve "Undecodable sequence" warnings.
* Properly implement the "Action after paste" feature.
* Fix execution after paste when Ctrl is hold.
* Workaround an issue with glibc 2.33 on old Docker engines.
* Added modes for background image. How background images are drawn is changed and manual reconfiguration is needed. See docs/configuration.md for more details.
qtermwidget-0.16.1 / 2020-11-14
===============================
* Bumped version to 0.16.1, for a point release of qterminal.
qtermwidget-0.16.0 / 2020-11-01
===============================
* Use qAsConst.
* Don't search application dir for keyboard and scheme data.
* Use Q_EMIT to call signals, instead of the emit keyword.
* Dropped the deprecated class QLinkedList.
* Don't use 0/nullptr to initialize QFlags.
* Fixed ColorEntry copy operator.
* Disabled the use of copy constructors and assignment operators.
* Check for successful ioctl() calls by testing that the call did not return -1.
* Fix find_package() developer warning in cmake.
* Use const references wherever possible.
* Handle keyboard commands properly.
qtermwidget-0.15.0 / 2020-04-24
===============================
* Bumped version to 0.15.0.
* Replaced Q_WS_MAC with Q_OS_MACOS for Qt5 compatibility.
* KPty: Don't conditionalize chownpty existence on HAVE_OPENPTY.
* cmake: set CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON for macOS.
* Fixed the default font on macOS.
* pyqt: Fixes deprecation warning (CMP0002).
* Fixed the PyQt5 binding with Qt ≥ 5.11.
* Swap Qt's ControlModifier and MetaModifier on macOS.
* C++11 code updates.
* Use braced initializer list in returns.
* Fixed the memory access violation in TerminalDisplay's method `getCharacterPosition`.
* Completed the support for transient scrollbars.
* Added `saveHistory` to QTermWidget.
* Use vanilla Qt instead of patched one.
* Don't set the selection clipboard if it's unsupported.
* Announce truecolor support via COLORTERM.
* Fixed numpad handling and added entries for numpad 5.
* Allow to disable drawing line chars.
* Use QRectF for cursor drawing and fix artifacts in hidpi.
* Fixed compilation on NetBSD.
* Added sendKeyEvent() API.
* Fixed flickering on font change.
* Select all text when opening search bar.
* Removed some debug outputs.
* Removed (duplicated) string casts definitions.
* Removed obsolete qCopy.
* Fix SearchBar light text over white background with dark themes.
* pyqt: also check for sip 5.x path.
* Prevented a c++11 range-loop might detach Qt container.
* Dropped the deprecated QString method `sprintf()`.
* Avoid buffer overflows exploits.
* Fixed build with LLVM/clang.
* Explicitly mark exported classes.
* Fixed QCharRef's deprecated behavior.
* Correctly initialize sigsets.
qtermwidget-0.14.1 / 2019-02-25
===============================
* Bumped version to 0.14.1
* Only translations was changed.
qtermwidget-0.14.0 / 2019-01-25
===============================
* Bumped version to 0.14.0
The big bump was needed to prevent conflicts with translations
that were former built out of lxqt-l10n and have version 0.13.0
* Clarify the licenses used in qtermwidget and added the missed root licenses
* Implementation fixes:
- kpty: use openpty() on mac
- kpty: make it work on OpenBSD
- kptyprocess: ensure .bash_history is correctly written out
- kb-layouts: Make Backspace behaves the same as xterm
- tools: Drop the ability to bundle kb-layouts and colorschemes
- SearchBar: Fix visual glitches in search-bar
- TerminalDisplay: Fixed link mouseover after recent changes
- TerminalDisplay: Redraw cursor after cursor type changed
- Vt102Emulation: Fix handling of ST (String Terminator) for OSC (Operating System Commands)
- qterminal: Correct deleting of HotSpot list items
- qterminal: Removed unnecessary checks
- ColorScheme: Fixed local variable will be copied despite being returned by name
- ColorScheme: Fixed error return-std-move
- Removed unnecessary checks
- Suppressed compilation warnings
- Don't use automatic string conversions
- Marked some functions const
- Implemented terminal margins
* Improved cmake scripting
- Set cmake_minimum_required to 3.1.0
- Removed locale compile definitions
- Removed QUIET from find_package
* Moved translations from lxqt-l10n back to qtermwidget
- Removed obsolete translation functionality
- Added translation promo in README.md
* Translation updates
qtermwidget-0.9.0 / 2018-05-21
==============================
* Bumped minor version to 9
* Take transient scrollbars into account
* CMake: Prevent in-source builds
* Refactor and fixes Python binding
* kptyprocess: Try to terminate the shell process
* New color scheme: Ubuntu inspired
* Fixed some github paths in uris
* Add a comment for potential future breakage
* Use wstring in TerminalCharacterDecoder for UCS-4 compatibility
* Support UTF-32 characters correctly
* Fix "bold and intensive" colors
* New color scheme: Tango (#167)
* Finish SGR mouse protocol (1006)
* Fix build of example with latest lxqt-build-tools
* Expose bracket text function
* Drop Qt foreach.
* Revert deletions in .sip file
* fix python bindings
* Expose terminal size hint API
* Remove class name
* Return something
* Expose bidi option
* Add an example for remote terminal
* Makes the use of libutempter optional
* Fix behavior of scroll up (SU)
* Install cmake files in LIBDIR as they are architecture dependent
* Check if utempter.h header exists (mainly for FreeBSD)
* Need lxqt-build-tools 0.4.0
qtermwidget-0.8.0 / 2017-10-21
==================
* Release 0.8.0: Update changelog
* FIX: #46 fix vertical font truncation
* bump versions
* Really fallback to /bin/sh when $SHELL is missing or invalid
* README: don't recommend building from source
* Improve README
* Don't export github templates
* Support REP escape sequence defined in ECMA-48, section 8.3.103
* Fix build issue related to utmpx in Mac OSX Sierra
* Remove the deprecation notice
* Handle DECSCUSR signals
* Copied issue template
* Update building instructions
* Require Qt 5.6+
* This commit allows the consumer of qtermwidget to capture the (#111)
* Allow the terminal display to be smaller than the size hint (#123)
* Backport Vt102 emulation fixes (#113)
* Backport the default.keytab from Konsole
* Fixes (#122)
* Updated README, Added support for PyQT 5.7
* Fix memory leak in hotspot (URLs & emails) detection
* Adds superbuild support
* Use target_compile_definitions() instead of add_definitions()
* Update find_package() documentation
* Use the lxqt_create_pkgconfig_file
* Improve lxqt_translate_ts() use
* Adds COMPONENT to the install files
* Renames test app to example. Make it work
* Drop include_directories() for in tree dirs
* Use the CMake Targets way
* Pack Utf8Proc stuff
* Adds export header
* Use LXQtCompilerSettings
* Packs compile definitions
* Adds package version file
* Removes Qt4 stuff
* Add translation mechanism
* Use const iterators when possible.
* Enable strict iterators for debug builds
* TerminalDisplay: Make resizing "Size" translatable
* Exposes receivedData signal to users of QTermWidget
* Exposes sessions autoClose property to QTermWidget
qtermwidget-0.7.1 / 2016-12-21
==================
* Release 0.7.1: Update changelog
* Bump patch version (#105)
* Added a modified Breeze color scheme (#104)
* Accept hex color strings as well (#101)
* Remove the stale lib/README (#102)
* Implement background images (#95)
* Implement other BOX DRAWING characters (#98)
* Preparations for context menu actions on URLs (#97)
* Drop the ancient wcwidth impl. and use utf8proc if possible (#99)
* Remove widget size checks in setVTFont() (#86)
* Delete unused tooltip code (#81)
* Fix size of the array passed to memset() (#79)
* Remove cpack (#93)
qtermwidget-0.7.0 / 2016-09-24
==================
* Release 0.7.0: Add changelog
* Bump version to 0.7.0 (#92)
* Add Solarized Color Schemes
* Update README.md
* qtermwidget: Unify title & icon propagation
* lib: Fix FTBFS (struct vs. class mismatch)
* Add 'const' decorators
* Expose titleChanged() signal
* Fix building instructions
* cmake support changes
* Make addCustomColorSchemeDir() static and check for duplicates
* Address review comments
* Allow app to add custom color scheme locations
* Avoid enums duplication
* Add support for setting keyboard cursor shape
* Remove assignment to self
* Backport konsole changes to fix memory leaks
* Remove __FILE__ macros
* Replace assert() with Q_ASSERT()
* Fix ASan error about delete size mismatch
* Add support for GNU/Hurd to kpty.cpp.
* fixes kfreebsd builds on debian and derivatives
* Fix indenations (misleading-indentation warning)
* Remove Q_DECL_OVERRIDE macros
* typo Higlight
* Remove noisy qDebugs
* Bracketed paste mode implementation
* Use function setWorldTranfer for Qpainter instead of setWorldMatrix
* Modify treatment drawing double width character
* pyqt5 bindings
* pyqt5 bindings
* Avoid checking uninitialized member + simplify condition
* Use markdown for README and improve it a bit
* Remove support for Qt <= 5.4
* Remove Designer plugin
* Fix LICENSE text and name
* Remove Changelog
* Remove empty TODO file
* Remove PyQt4 bindings
* Sort out terminal resizing
* Rebase Vt102Emulation to Konsole
* Enable terminal resizing from the emulator
* Clean up trailing whitespaces
* implemented start TTY for external recipient;
* Fix: typo in TerminalDisplay
* add method for get pty slave fd;
* add method for get pty slave fd;
* Use GNUInstallDirs in CMakeLists.txt to stop hardcoding paths
* Set the '_notifiedActivity' flag early
* Also expose signals and slots to pyqt
* Get/set selection end in python bindings
* Avoid calling winId() on Qt5.
* Fix TerminalDisplay::getCharacterPosition for proportional fonts
* Handle proportional fonts a bit better
* Expose more functionality through the python bindings (#23)
* Allow stopping test.py with ctrl-C
* Fix 'getSelectionEnd'
* Make whitespace consistent (tabs->spaces)
* Fix python binding compile errors #23
* Add event to notify the application that the shell application uses mouse.
* Change mouseMarks only when needed. This might be useful if an application wants to be notified of the event.
* Prevents deleting the last line when resizing.
qtermwidget-0.6.0 / 2014-10-21
==================
* Release 0.6.0
* Update AUTHORS
* Update INSTALL instructions
* CMakeLists.txt cleanup
* osx: link fixes
* fixed #57 Linux emulation does not seem to support Ctrl+Arrows (warning: I have no clue what I did...)
* Fix Qt4 compilation
* qterminal #64 No drag & drop support
* fixed qterminal #71 qt5 version ignoring page up / down
* Fixed a typo in CMakeLists.txt.
qtermwidget-0.5.1 / 2014-07-14
==================
* fixed 'make dist'; version bump
* Url activation & filters #21
* Proxy activity/silence methods to Session in QTermWidget.
* Emit activity() and silence() signals instead of KNotification.
* Support bells.
* Support bells.
* Added QTermWidget::urlActivated(QUrl) signal.
* Emit UrlFilter::activated() instead of QDesktopServices::openUrl().
* Derive Filter from QObject.
* Add UrlFilter.
* Activate link filters on ctrl+click.
* Update filters on resize and screen events.
* Const-correctness for QTermWidget API.
* Load arbitrary schemes by path via setColorScheme().
* ColorSchemeManager::loadCustomColorScheme(const QString& path).
* Unified schemeName() usage.
* fixed #17 lib/ShellCommand.cpp:66: possible =/== mixup
* Delete CMakeLists.txt.user
* new API selectedText()
* new API methods (thanks to William Brumley)
* fixed #11 compile against Qt 5 (Qt4 and Qt5 supported and waguely tested)
* build simplified: qtermwidget is versioned (libqtermwidget4 for Qt4, 5 for Qt5...). Better cmake support.
* fixed broken API for sendText() - const missing
* mail address change
* Current Working Directory for linux. Part of #8. More implementations welcomed...
* Add a method for get working directory in class QTermWidget
* Fix missing cleanup for temporary history files
* a potential improvement for #9 font fractional pixels causes spacing errors
* fix #2 update various documentations for debian packaging
* fix #10 Update FSF address
qtermwidget-0.4.0 / 2013-04-16
==================
* readme updated
* Added pasteSelection-slot and corrected two nonsense comments
* qt/embedded doesn't ship with a Monospace font (and it won't use system fonts even if they exist). Using 'fixed' instead works fine
* Without this, the terminal display area will permanently lose focus when consoleq's Find dialog is called up.
* This is only needed when using Qt/E built for DirectFB display. DirectFB blocks SIGINT and some other signals, so any terminal app (be it Qt or otherwise) must call sigprocmask() to unblock them. Without this, ^C doesn't work.
* The control and tab keys don't work in Qt/E. This fixes it, but maybe not in the most elegant way. The trouble seems to be that _codec->fromUnicode(event->text()) doesn't handle control characters in qt-embedded.
* Fix resize label
* Search code cleanup
* Change searchbar background color to red(ish) when no match found
* Fix search, find-next when selection is one character long
* Hotkeys for search: Return->find-next, Shift-Return->find-previous, Escape->hide searchbar
* Added search functionality
* Add zoom. Add choice action after paste clipboard
* Add zoom. Add choice action after paste clipboard
* Add zoom. Add choice action after paste clipboard
* Add zoom. Add choice action after paste clipboard
* Add zoom. Add choice action after paste clipboard
* Add zoom. Add choice action after paste clipboard
* Add zoom. Add choice action after paste clipboard
* Add zoom. Add choice action after paste clipboard
* Add zoom. Add choice action after paste clipboard
* Fix logical error
* Add zoom. Add choice action after paste clipboard
* Add zoom. Add choice action after paste clipboard
* Add Shift+KeyEnd and Shift+KeyHome to go line 0 and line end. No move screenwindow when copy and paste with keyboard
* fix for text drawing in qt>=4.8,x
* constructor for Qt Designer
* test commit
* clear() slot implemented
* fix the scroll at the end again
* The escape key is always needed for terminal programs like vim.
* Add resource files and the appropriate paths to enable bundling of color schemes and keyboard layouts into the actual executable.
* Add a define which will be used to bundle the color schemes and keyboard layouts as resource files with the executable itself instead of putting them on disk.
* scrollToEnd() method provided to trigger 'snapping' the terminal to cursor tracked position (typically the extreme value of the scrollbar, or the 'end') Some signal-fu particular to keyPressEvent(QKeyEvent *) done to make the above usable, no existing dependent implementations should be disturbed by this.
* revert workaround for key on end
* scroll to bottom on input
* scrollToEnd() method provided to trigger 'snapping' the terminal to cursor tracked position (typically the extreme value of the scrollbar, or the 'end') Some signal-fu particular to keyPressEvent(QKeyEvent *) done to make the above usable, no existing dependent implementations should be disturbed by this.
* improved sample app for testing
* macosx compile fix
* arguments work correctly for custom shells too
* lib has to be built first in any case
* merge changes from the experimental "bundle" repository
* fix for kb-layout location on mac (mainly)
* rpm builds
* mac universal build helper
* build cleanup; make dist; various readmes updated
* make availableKeyBindings static
* transparency support
* font display fix on mac (widths in int)
* qt designer plugin
* correct lib ID for mac
* remove the KDE legacy code
* code reformatted after resync
* display stuff synced from konsole again to improve color scheme handling
* focus in/out signals
* correct shell detection (BSD, Christopher VdoP)
* library location on BSD
* patches to build on BSD by Christopher VdoP
* K&R formatting
* K&R formatting
* merge with qscite
* fixed KB finding + sort
* key layouts can be read and provided to widget
* install keyboard bindings; handle KB in src code; allow to get and set KB
* fix for includes and 64bit builds
* port to macosx
* initial import

375
qtermwidget/CMakeLists.txt 100644
View File

@ -0,0 +1,375 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
# CMP0000: Call the cmake_minimum_required() command at the beginning of the top-level
# CMakeLists.txt file even before calling the project() command.
# The cmake_minimum_required(VERSION) command implicitly invokes the cmake_policy(VERSION)
# command to specify that the current project code is written for the given range of CMake
# versions.
project(qtermwidget)
include(GNUInstallDirs)
include(GenerateExportHeader)
include(CMakePackageConfigHelpers)
include(CheckFunctionExists)
include(CheckIncludeFile)
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
option(BUILD_EXAMPLE "Build example application. Default OFF." OFF)
option(QTERMWIDGET_USE_UTEMPTER "Uses libutempter on Linux or libulog on FreeBSD for login records." OFF)
option(QTERMWIDGET_BUILD_PYTHON_BINDING "Build python binding" OFF)
option(USE_UTF8PROC "Use libutf8proc for better Unicode support. Default OFF" OFF)
option(USE_QT5 "Use Qt 5 instead of Qt6 (if available). Default OFF" OFF)
# just change version for releases
# keep this in sync with the version in pyqt/pyproject.toml
set(QTERMWIDGET_VERSION_MAJOR "1")
set(QTERMWIDGET_VERSION_MINOR "3")
set(QTERMWIDGET_VERSION_PATCH "0")
set(QTERMWIDGET_VERSION "${QTERMWIDGET_VERSION_MAJOR}.${QTERMWIDGET_VERSION_MINOR}.${QTERMWIDGET_VERSION_PATCH}")
# additional cmake files
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Minimum Versions
set(QT_MINIMUM_VERSION "5.15.0")
set(QT6_MINIMUM_VERSION "6.1.0")
set(LXQTBT_MINIMUM_VERSION "0.10.0")
if (NOT USE_QT5)
find_package(Qt6 COMPONENTS Widgets)
if (NOT Qt6_FOUND)
find_package(Qt5Widgets "${QT_MINIMUM_VERSION}" REQUIRED)
find_package(Qt5LinguistTools "${QT_MINIMUM_VERSION}" REQUIRED)
endif()
if (Qt6_FOUND)
find_package(Qt6Widgets "${QT6_MINIMUM_VERSION}" REQUIRED)
find_package(Qt6LinguistTools "${QT6_MINIMUM_VERSION}" REQUIRED)
find_package(Qt6Core5Compat "${QT6_MINIMUM_VERSION}" REQUIRED)
endif()
else()
find_package(Qt5Widgets "${QT_MINIMUM_VERSION}" REQUIRED)
find_package(Qt5LinguistTools "${QT_MINIMUM_VERSION}" REQUIRED)
endif()
find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
if(USE_UTF8PROC)
find_package(Utf8Proc REQUIRED)
endif()
include(LXQtPreventInSourceBuilds)
include(LXQtTranslateTs)
include(LXQtCompilerSettings NO_POLICY_SCOPE)
include(LXQtCreatePkgConfigFile)
if(APPLE)
if(CMAKE_VERSION VERSION_GREATER 3.9)
cmake_policy(SET CMP0068 NEW)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
endif()
endif()
if (NOT Qt6_FOUND)
set(QTERMWIDGET_LIBRARY_NAME qtermwidget5)
else()
set(QTERMWIDGET_LIBRARY_NAME qtermwidget6)
endif()
# main library
set(SRCS
lib/BlockArray.cpp
lib/ColorScheme.cpp
lib/Emulation.cpp
lib/Filter.cpp
lib/History.cpp
lib/HistorySearch.cpp
lib/KeyboardTranslator.cpp
lib/konsole_wcwidth.cpp
lib/kprocess.cpp
lib/kpty.cpp
lib/kptydevice.cpp
lib/kptyprocess.cpp
lib/Pty.cpp
lib/qtermwidget.cpp
lib/Screen.cpp
lib/ScreenWindow.cpp
lib/SearchBar.cpp
lib/Session.cpp
lib/ShellCommand.cpp
lib/TerminalCharacterDecoder.cpp
lib/TerminalDisplay.cpp
lib/tools.cpp
lib/Vt102Emulation.cpp
)
# Only the Headers that need to be moc'd go here
set(HDRS
lib/Emulation.h
lib/Filter.h
lib/HistorySearch.h
lib/kprocess.h
lib/kptydevice.h
lib/kptyprocess.h
lib/Pty.h
lib/qtermwidget.h
lib/ScreenWindow.h
lib/SearchBar.h
lib/Session.h
lib/TerminalDisplay.h
lib/Vt102Emulation.h
)
set(UI
lib/SearchBar.ui
)
# for distribution
set(HDRS_DISTRIB
lib/qtermwidget.h
lib/Emulation.h
lib/KeyboardTranslator.h
lib/Filter.h
lib/qtermwidget_interface.h
)
# dirs
set(KB_LAYOUT_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${QTERMWIDGET_LIBRARY_NAME}/kb-layouts")
message(STATUS "Keyboard layouts will be installed in: ${KB_LAYOUT_DIR}")
set(COLORSCHEMES_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${QTERMWIDGET_LIBRARY_NAME}/color-schemes")
message(STATUS "Color schemes will be installed in: ${COLORSCHEMES_DIR}" )
set(TRANSLATIONS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${QTERMWIDGET_LIBRARY_NAME}/translations")
message(STATUS "Translations will be installed in: ${TRANSLATIONS_DIR}")
set(QTERMWIDGET_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${QTERMWIDGET_LIBRARY_NAME}")
CHECK_FUNCTION_EXISTS(updwtmpx HAVE_UPDWTMPX)
if (NOT USE_QT5)
if (NOT Qt6_FOUND)
qt5_wrap_cpp(MOCS ${HDRS})
qt5_wrap_ui(UI_SRCS ${UI})
set(PKG_CONFIG_REQ "Qt5Widgets")
else()
qt6_wrap_cpp(MOCS ${HDRS})
qt6_wrap_ui(UI_SRCS ${UI})
set(PKG_CONFIG_REQ "Qt6Widgets")
endif()
else()
qt5_wrap_cpp(MOCS ${HDRS})
qt5_wrap_ui(UI_SRCS ${UI})
set(PKG_CONFIG_REQ "Qt5Widgets")
endif()
lxqt_translate_ts(QTERMWIDGET_QM
TRANSLATION_DIR "lib/translations"
UPDATE_TRANSLATIONS
${UPDATE_TRANSLATIONS}
SOURCES
${SRCS} ${HDRS} ${UI}
INSTALL_DIR
${TRANSLATIONS_DIR}
COMPONENT
Runtime
)
add_library(${QTERMWIDGET_LIBRARY_NAME} SHARED ${SRCS} ${MOCS} ${UI_SRCS} ${QTERMWIDGET_QM})
if (NOT USE_QT5)
if (NOT Qt6_FOUND)
target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt5::Widgets)
else()
target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt6::Widgets)
target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt6::Core5Compat)
endif()
else()
target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt5::Widgets)
endif()
set_target_properties( ${QTERMWIDGET_LIBRARY_NAME} PROPERTIES
SOVERSION ${QTERMWIDGET_VERSION_MAJOR}
VERSION ${QTERMWIDGET_VERSION}
)
if(APPLE)
target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME}
PRIVATE
"HAVE_UTMPX"
"UTMPX_COMPAT"
)
endif()
if(HAVE_UPDWTMPX)
target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME}
PRIVATE
"HAVE_UPDWTMPX"
)
endif()
if (QTERMWIDGET_USE_UTEMPTER)
CHECK_INCLUDE_FILE(utempter.h HAVE_UTEMPTER)
if (HAVE_UTEMPTER)
target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME} PRIVATE
"HAVE_UTEMPTER"
)
find_library(UTEMPTER_LIB NAMES utempter ulog REQUIRED)
target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} ${UTEMPTER_LIB})
endif()
endif()
if (UTF8PROC_FOUND)
target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME}
PRIVATE
"HAVE_UTF8PROC"
)
target_include_directories(${QTERMWIDGET_LIBRARY_NAME}
INTERFACE
${UTF8PROC_INCLUDE_DIRS}
)
target_link_libraries(${QTERMWIDGET_LIBRARY_NAME}
${UTF8PROC_LIBRARIES}
)
string(APPEND PKG_CONFIG_REQ ", libutf8proc")
endif()
if(APPLE)
set (CMAKE_SKIP_RPATH 1)
# this is a must to load the lib correctly
set_target_properties(${QTERMWIDGET_LIBRARY_NAME} PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
endif()
target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME}
PRIVATE
"KB_LAYOUT_DIR=\"${KB_LAYOUT_DIR}\""
"COLORSCHEMES_DIR=\"${COLORSCHEMES_DIR}\""
"TRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\""
"HAVE_POSIX_OPENPT"
"HAVE_SYS_TIME_H"
)
generate_export_header(${QTERMWIDGET_LIBRARY_NAME}
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/lib/qtermwidget_export.h"
BASE_NAME QTERMWIDGET
)
target_include_directories(${QTERMWIDGET_LIBRARY_NAME}
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/lib>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../lib>"
INTERFACE
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${QTERMWIDGET_LIBRARY_NAME}>"
)
write_basic_package_version_file(
"${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-config-version.cmake"
VERSION ${QTERMWIDGET_VERSION}
COMPATIBILITY AnyNewerVersion
)
install(FILES
"${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-config-version.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
COMPONENT Devel
)
install(EXPORT
"${QTERMWIDGET_LIBRARY_NAME}-targets"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
COMPONENT Devel
)
install(FILES
${HDRS_DISTRIB} "${CMAKE_CURRENT_BINARY_DIR}/lib/qtermwidget_export.h" "${CMAKE_CURRENT_BINARY_DIR}/lib/qtermwidget_version.h"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${QTERMWIDGET_LIBRARY_NAME}"
COMPONENT Devel
)
# keyboard layouts
install(DIRECTORY
lib/kb-layouts/
DESTINATION "${KB_LAYOUT_DIR}"
COMPONENT Runtime
FILES_MATCHING PATTERN "*.keytab"
)
# color schemes
install(DIRECTORY
lib/color-schemes/
DESTINATION "${COLORSCHEMES_DIR}"
COMPONENT Runtime
FILES_MATCHING PATTERN "*.*schem*"
)
lxqt_create_pkgconfig_file(
PACKAGE_NAME ${QTERMWIDGET_LIBRARY_NAME}
DESCRIPTIVE_NAME ${QTERMWIDGET_LIBRARY_NAME}
DESCRIPTION "QTermWidget library for Qt ${QTERMWIDGET_VERSION_MAJOR}.x"
INCLUDEDIRS ${QTERMWIDGET_LIBRARY_NAME}
LIBS ${QTERMWIDGET_LIBRARY_NAME}
REQUIRES ${PKG_CONFIG_REQ}
VERSION ${QTERMWIDGET_VERSION}
INSTALL
COMPONENT Devel
)
configure_file(
"${PROJECT_SOURCE_DIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}-config.cmake.in"
"${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-config.cmake"
@ONLY
)
configure_file(
"${PROJECT_SOURCE_DIR}/lib/qtermwidget_version.h.in"
"${CMAKE_BINARY_DIR}/lib/qtermwidget_version.h"
@ONLY
)
install(FILES
"${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-config.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
COMPONENT Devel
)
install(TARGETS ${QTERMWIDGET_LIBRARY_NAME}
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
EXPORT "${QTERMWIDGET_LIBRARY_NAME}-targets"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
PUBLIC_HEADER
COMPONENT Runtime
)
export(TARGETS ${QTERMWIDGET_LIBRARY_NAME}
FILE "${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-targets.cmake"
EXPORT_LINK_INTERFACE_LIBRARIES
)
# end of main library
# example application
if(BUILD_EXAMPLE)
set(EXAMPLE_SRC examples/cpp/main.cpp)
add_executable(example ${EXAMPLE_SRC})
target_link_libraries(example ${QTERMWIDGET_LIBRARY_NAME})
endif()
# end of example application
# python binding
if (QTERMWIDGET_BUILD_PYTHON_BINDING)
message(SEND_ERROR "QTERMWIDGET_BUILD_PYTHON_BINDING is no longer supported. Check README.md for how to build PyQt bindings.")
endif()
# end of python binding
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY
)
ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
)

17
qtermwidget/CMakePresets.json 100644
View File

@ -0,0 +1,17 @@
{
"version": 2,
"configurePresets": [
{
"name": "Default",
"displayName": "Configure preset using toolchain file",
"description": "Sets Ninja generator, build and install directory",
"generator": "Ninja",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_TOOLCHAIN_FILE": "",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
}
}
]
}

1
qtermwidget/COPYING-CMAKE-SCRIPTS 120000
View File

@ -0,0 +1 @@
LICENSE.BSD-3-clause

19
qtermwidget/Changelog
View File

@ -1,19 +0,0 @@
31.07.2008
Interface class from c-style conversions rewritten with pimpl support.
16.07.2008
Added optional scrollbar
06.06.2008
Some artefacts were removed, some added...
Also added support for color schemes, and 3 color schemes provided (classical - white on black, green on black, black on light yellow). Is it enough or not?
26.05.2008
Added file release as an archive with source code. But preferrable way is still getting code from CVS, cause file release can be outdated.
11.05.2008
Initial CVS import - first version comes with number 0.0.1

86
qtermwidget/COPYING → qtermwidget/LICENSE
View File

@ -1,12 +1,12 @@
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 2, June 1991 Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc. Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
Preamble Preamble
The licenses for most software are designed to take away your The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public freedom to share and change it. By contrast, the GNU General Public
@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to the GNU Lesser General Public License instead.) You can apply it to
your programs, too. your programs, too.
When we speak of free software, we are referring to freedom, not When we speak of free software, we are referring to freedom, not
@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and The precise terms and conditions for copying, distribution and
modification follow. modification follow.
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains 0. This License applies to any program or other work which contains
@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on does not normally print such an announcement, your work based on
the Program is not required to print an announcement.) the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program, identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in and can be reasonably considered independent and separate works in
@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not distribution of the source code, even though third parties are not
compelled to copy the source along with the object code. compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program 4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is otherwise to copy, modify, sublicense or distribute the Program is
@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License. be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in 8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License original copyright holder who places the Program under this License
@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally. of promoting the sharing and reuse of software generally.
NO WARRANTY NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@ -277,64 +277,4 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES. POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.

26
qtermwidget/LICENSE.BSD-3-clause 100644
View File

@ -0,0 +1,26 @@
Copyright (c) The Regents of the University of California.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.

481
qtermwidget/LICENSE.LGPL2+ 100644
View File

@ -0,0 +1,481 @@
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the library GPL. It is
numbered 2 because it goes with version 2 of the ordinary GPL.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Library General Public License, applies to some
specially designated Free Software Foundation software, and to any
other libraries whose authors decide to use it. You can use it for
your libraries, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if
you distribute copies of the library, or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link a program with the library, you must provide
complete object files to the recipients so that they can relink them
with the library, after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
Our method of protecting your rights has two steps: (1) copyright
the library, and (2) offer you this license which gives you legal
permission to copy, distribute and/or modify the library.
Also, for each distributor's protection, we want to make certain
that everyone understands that there is no warranty for this free
library. If the library is modified by someone else and passed on, we
want its recipients to know that what they have is not the original
version, so that any problems introduced by others will not reflect on
the original authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that companies distributing free
software will individually obtain patent licenses, thus in effect
transforming the program into proprietary software. To prevent this,
we have made it clear that any patent must be licensed for everyone's
free use or not licensed at all.
Most GNU software, including some libraries, is covered by the ordinary
GNU General Public License, which was designed for utility programs. This
license, the GNU Library General Public License, applies to certain
designated libraries. This license is quite different from the ordinary
one; be sure to read it in full, and don't assume that anything in it is
the same as in the ordinary license.
The reason we have a separate public license for some libraries is that
they blur the distinction we usually make between modifying or adding to a
program and simply using it. Linking a program with a library, without
changing the library, is in some sense simply using the library, and is
analogous to running a utility program or application program. However, in
a textual and legal sense, the linked executable is a combined work, a
derivative of the original library, and the ordinary General Public License
treats it as such.
Because of this blurred distinction, using the ordinary General
Public License for libraries did not effectively promote software
sharing, because most developers did not use the libraries. We
concluded that weaker conditions might promote sharing better.
However, unrestricted linking of non-free programs would deprive the
users of those programs of all benefit from the free status of the
libraries themselves. This Library General Public License is intended to
permit developers of non-free programs to use free libraries, while
preserving your freedom as a user of such programs to change the free
libraries that are incorporated in them. (We have not seen how to achieve
this as regards changes in header files, but we have achieved it as regards
changes in the actual functions of the Library.) The hope is that this
will lead to faster development of free libraries.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, while the latter only
works together with the library.
Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.
GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library which
contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License"). Each licensee is
addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also compile or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
c) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
d) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the source code distributed need not include anything that is normally
distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Library General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).
To apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library 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
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!

26
qtermwidget/README
View File

@ -1,26 +0,0 @@
This is a external source gotten from:
http://www.qt-apps.org/content/show.php/QTermWidget?content=82832
*************************************************************************************
QTermWidget
version 0.1.0
QTermWidget is an opensource project based on KDE4 Konsole application.
The main goal of this project is to provide unicode-enabled, embeddable
QT widget for using as a built-in console (or terminal emulation widget).
Of course I`m aware about embedding abilities of original Konsole,
but once I had Qt without KDE, and it was a serious obstacle.
I decided not to rely on a chance. I cannot find any interesting related project,
so I had to write it.
The original Konsole`s code was rewritten entirely with QT4 only; also I have to
include in the project some parts of code from kde core library. All code dealing
with user interface parts and session managers was removed (maybe later I bring it
back somehow), and the result is quite useful, I suppose.
This library was compiled and tested on three linux systems,
based on 2.4.32, 2.6.20, 2.6.23 kernels, x86 and amd64.
Please inform about its behaviour on other systems.

346
qtermwidget/README.md 100644
View File

@ -0,0 +1,346 @@
# QTermWidget
## Overview
A terminal emulator widget for Qt 5.
QTermWidget is an open-source project originally based on the KDE4 Konsole application, but it took its own direction later on.
The main goal of this project is to provide a Unicode-enabled, embeddable Qt widget for using as a built-in console (or terminal emulation widget).
It is compatible with BSD, Linux and OS X.
This project is licensed under the terms of the [GPLv2](https://www.gnu.org/licenses/gpl-2.0.en.html) or any later version. See the LICENSE file for the full text of the license. Some files are published under compatible licenses:
```
Files: example/main.cpp
lib/TerminalCharacterDecoder.cpp
lib/TerminalCharacterDecoder.h
lib/kprocess.cpp
lib/kprocess.h
lib/kpty.cpp
lib/kpty.h
lib/kpty_p.h
lib/kptydevice.cpp
lib/kptydevice.h
lib/kptyprocess.cpp
lib/kptyprocess.h
lib/qtermwidget.cpp
lib/qtermwidget.h
lib/qtermwidget_interface.h
Copyright: Author Adriaan de Groot <groot@kde.org>
2010, KDE e.V <kde-ev-board@kde.org>
2002-2007, Oswald Buddenhagen <ossi@kde.org>
2006-2008, Robert Knight <robertknight@gmail.com>
2002, Waldo Bastian <bastian@kde.org>
2008, e_k <e_k@users.sourceforge.net>
2022, Francesc Martinez <info@francescmm.com>
License: LGPL-2+
Files: cmake/FindUtf8Proc.cmake
Copyright: 2009-2011, Kitware, Inc
2009-2011, Philip Lowman <philip@yhbt.com>
License: BSD-3-clause
```
## Installation
### Compiling sources
The only runtime dependency is qtbase ≥ 5.12.0.
Build dependencies are as follows:
- CMake ≥ 3.1.0 serves as the build system and therefore needs to be present to compile.
- The latest [lxqt-build-tools](https://github.com/lxqt/lxqt-build-tools/) is also needed for compilation.
- Git is needed to optionally pull latest VCS checkouts.
Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` will normally have to be set to `/usr`, depending on the way library paths are dealt with on 64bit systems. Variables like `CMAKE_INSTALL_LIBDIR` may have to be set as well.
To build, run `make`. To install, run `make install` which accepts variable `DESTDIR` as usual.
To build PyQt bindings, build this library first, and then invoke `sip-wheel` in pyqt/ directory. Environment variables `CXXFLAGS` and `LDFLAGS` can be used to specify non-installed or non-standard directories for headers and shared libraries, and the built Python wheel can be installed by standard tools like `pip`. See [the CI script](.ci/build.sh) for a complete example.
### Binary packages
The library is provided by all major Linux distributions. This includes Arch Linux, Debian, Fedora, openSUSE and all of their children, given they use the same package repositories.
Just use the distributions' package managers to search for string `qtermwidget`.
### Translation
Translations can be done in [LXQt-Weblate](https://translate.lxqt-project.org/projects/lxqt-desktop/qtermwidget/)
<a href="https://translate.lxqt-project.org/projects/lxqt-desktop/qtermwidget/">
<img src="https://translate.lxqt-project.org/widgets/lxqt-desktop/-/qtermwidget/multi-auto.svg" alt="Translation status" />
</a>
## API
### Public Types
Type | Variable
| ---: | :---
enum | ScrollBarPosition { NoScrollBar, ScrollBarLeft, ScrollBarRight }
enum | KeyboardCursorShape { BlockCursor, UnderlineCursor, IBeamCursor }
### Properties
* flowControlEnabled : bool
* getPtySlaveFd : const int
* getShellPID : int
* getForegroundProcessId : int
* getTerminalFont : QFont
* historyLinesCount : int
* icon : const QString
* keyBindings : QString
* screenColumnsCount : int
* selectedText(bool _preserveLineBreaks_ = true) : QString
* sizeHint : const QSize
* terminalSizeHint : bool
* title : const QString
* workingDirectory : QString
### Public Functions
Type | Function
| ---: | :---
| | QTermWidget(int _startnow_ = 1, QWidget *_parent_ = 0)
virtual | ~QTermWidget()
void | changeDir(const QString _&dir_)
void | getSelectionEnd(int &_row_, int &_column_)
void | getSelectionStart(int &_row_, int &_column_)
void | scrollToEnd()
void | sendText(QString &_text_)
void | setArgs(QStringList &_args_)
void | setAutoClose(bool _enabled_)
void | setColorScheme(const QString &_name_)
void | setEnvironment(const QStringList &_environment_)
void | setFlowControlEnabled(bool _enabled_)
void | setFlowControlWarningEnabled(bool _enabled_)
void | setHistorySize(int _lines_)
void | setKeyboardCursorShape(QTermWidget::KeyboardCursorShape _shape_)
void | setMonitorActivity(bool _enabled_)
void | setMonitorSilence(bool _enabled_)
void | setMotionAfterPasting(int _action_)
void | setScrollBarPosition(QTermWidget::ScrollBarPosition _pos_)
void | setSelectionEnd(int _row_, int _column_)
void | setSelectionStart(int _row_, int _column_)
void | setShellProgram(const QString &_program_)
void | setSilenceTimeout(int _seconds_)
void | setTerminalFont(QFont &_font_)
void | setTerminalOpacity(qreal _level_)
void | setTerminalSizeHint(bool _enabled_)
void | setTextCodec(QTextCodec *_codec_)
void | setWorkingDirectory(const QString &_dir_)
void | startShellProgram()
void | startTerminalTeletype()
QStringList | availableColorSchemes()
### Public Slots
Type | Function
| ---: | :---
void | copyClipboard()
void | pasteClipboard()
void | pasteSelection()
void | zoomIn()
void | zoomOut()
void | setSize(_const QSize &_)
void | setKeyBindings(const QString &_kb_)
void | clear()
void | toggleShowSearchBar()
### Signals
Type | Function
| ---: | :---
void | activity()
void | bell(const QString &_message_)
void | copyAvailable(bool)
void | finished()
void | profileChanged(const QString &_profile_)
void | receivedData(const QString &_text_)
void | sendData(const char*, int)
void | silence()
void | termGetFocus()
void | termKeyPressed(QKeyEvent*)
void | termLostFocus()
void | titleChanged()
void | urlActivated(const QUrl &, bool _fromContextMenu_)
### Static Public Members
Type | Function
| ---: | :---
static QStringList | availableColorSchemes()
static QStringList | availableKeyBindings()
static void | addCustomColorSchemeDir(const QString &*custom_dir*)
### Protected Functions
Type | Function
| ---: | :---
virtual void | resizeEvent(_QResizeEvent_*)
### Protected Slots
Type | Function
| ---: | :---
void | sessionFinished()
void | selectionChanged(bool _textSelected_)
### Member Type Documentation
**enum QTermWidget::ScrollBarPosition**\
This enum describes the location where the scroll bar is positioned in the display widget when calling QTermWidget::setScrollBarPosition().
Constant | Value | Description
| --- | :---: | --- |
QTermWidget::NoScrollBar | 0x0 | Do not show the scroll bar.
QTermWidget::ScrollBarLeft | 0x1 | Show the scroll bar on the left side of the display.
QTermWidget::ScrollBarRight | 0x2 | Show the scroll bar on the right side of the display.
\
**enum QTermWidget::KeyboardCursorShape**\
This enum describes the available shapes for the keyboard cursor when calling QTermWidget::setKeyboardCursorShape().
Constant | Value | Description
| --- | :---: | --- |
QTermWidget::BlockCursor | 0x0 | A rectangular block which covers the entire area of the cursor character.
QTermWidget::UnderlineCursor | 0x1 | A single flat line which occupies the space at the bottom of the cursor character's area.
QTermWidget::IBeamCursor | 0x2 | A cursor shaped like the capital letter 'I', similar to the IBeam cursor used in Qt/KDE text editors.
### Property Documentation
**flowControlEnabled : bool**\
Returns whether flow control is enabled.
**getPtySlaveFd : const int**\
Returns a pty slave file descriptor. This can be used for display and control a remote terminal.
<!--**getShellPID : int**\-->
**getForegroundProcessId : int**\
Returns the PID of the foreground process. This is initially the same as processId() but can change
as the user starts other programs inside the terminal. If there is a problem reading the foreground
process id, 0 will be returned.
<!--**getTerminalFont : QFont**\-->
**historyLinesCount : int**\
Returns the number of lines in the history buffer.
<!--**icon : const QString**\-->
**keyBindings : QString**\
Returns current key bindings.
<!--**screenColumnsCount : int**\-->
**selectedText(bool _preserveLineBreaks_ = true) : QString**\
Returns the currently selected text.
<!--**sizeHint : const QSize**\-->
<!--**terminalSizeHint : bool**\-->
<!--**title : const QString**\-->
<!--**workingDirectory : QString**\-->
### Member Function Documentation
<!--__void activity()__\-->
<!--__void bell(const QString &_message_)__\-->
__void changeDir(const QString _&dir_)__\
Attempt to change shell directory (Linux only).
__void clear()__\
Clear the terminal content and move to home position.
<!--__void copyAvailable(bool)__\-->
__void copyClipboard()__\
Copy selection to clipboard.
<!--__void finished()__\-->
<!--__void getSelectionEnd(int &_row_, int &_column_)__\-->
<!--__void getSelectionStart(int &_row_, int &_column_)__\-->
__void pasteClipboard()__\
Paste clipboard to terminal.
__void pasteSelection()__\
Paste selection to terminal.
<!--__void profileChanged(const QString &_profile_)__\-->
__void receivedData(const QString &_text_)__\
Signals that we received new data from the process running in the terminal emulator.
__void scrollToEnd()__\
Wrapped, scroll to end of text.
__void sendData(const char*, int)__\
Emitted when emulator send data to the terminal process (redirected for external recipient). It can be used for control and display the remote terminal.
__void sendText(QString &_text_)__\
Send text to terminal.
__void setArgs(QStringList &_args_)__\
Sets the shell program arguments, default is none.
__void setAutoClose(bool _enabled_)__\
Automatically close the terminal session after the shell process exits or keep it running.
__void setColorScheme(const QString &_name_)__\
Sets the color scheme, default is white on black.
__void setEnvironment(const QStringList &_environment_)__\
Sets environment variables.
__void setFlowControlEnabled(bool _enabled_)__\
Sets whether flow control is enabled.
__void setFlowControlWarningEnabled(bool _enabled_)__\
Sets whether the flow control warning box should be shown when the flow control stop key (Ctrl+S) is pressed.
__void setHistorySize(int _lines_)__\
History size for scrolling.
__void setKeyBindings(const QString &_kb_)__\
Set named key binding for given widget.
__void setKeyboardCursorShape(QTermWidget::KeyboardCursorShape _shape_)__\
Sets the shape of the keyboard cursor. This is the cursor drawn at the position in the terminal where keyboard input will appear.
<!--__void setMonitorActivity(bool _enabled_)__\-->
<!--__void setMonitorSilence(bool _enabled_)__\-->
<!--__void setMotionAfterPasting(int _action_)__\-->
__void setScrollBarPosition(QTermWidget::ScrollBarPosition _pos_)__\
Sets presence and position of scrollbar.
<!--__void setSelectionEnd(int _row_, int _column_)__\-->
<!--__void setSelectionStart(int _row_, int _column_)__\-->
__void setShellProgram(const QString &_program_)__\
Sets the shell program, default is /bin/bash.
<!--__void setSilenceTimeout(int _seconds_)__\-->
<!--__void setSize(_const QSize &_)__\-->
__void setTerminalFont(QFont &_font_)__\
Sets terminal font. Default is application font with family Monospace, size 10. Beware of a performance penalty and display/alignment issues when using a proportional font.
<!--__void setTerminalOpacity(qreal _level_)__\-->
__void setTerminalSizeHint(bool _enabled_)__\
Exposes TerminalDisplay::TerminalSizeHint.
__void setTextCodec(QTextCodec *_codec_)__\
Sets text codec, default is UTF-8.
<!--__void setWorkingDirectory(const QString &_dir_)__\-->
<!--__void silence()__\-->
__void startShellProgram()__\
Starts shell program if it was not started in constructor.
__void startTerminalTeletype()__\
Starts terminal teletype as is and redirect data for external recipient. It can be used for display and control a remote terminal.
<!--__void termGetFocus()__\-->
<!--__void termKeyPressed(QKeyEvent*)__\-->
<!--__void termLostFocus()__\-->
<!--__void titleChanged()__\-->
<!--__void toggleShowSearchBar()__\-->
<!--__void urlActivated(const QUrl &, bool _fromContextMenu_)__\-->
__void zoomIn()__\
Zooms in on the text.
__void zoomOut()__\
Zooms out in on the text.

10
qtermwidget/TODO
View File

@ -1,10 +0,0 @@
Global
- provide more compatibility for vttest
Package
- migrate to autotools if needed
Source
- provide more options for customization
- clean unused code
- add some QT3 support features if needed

60
qtermwidget/cmake/FindUtf8Proc.cmake 100644
View File

@ -0,0 +1,60 @@
#.rst:
# FindUtf8Proc
# --------
#
# Find utf8proc
#
# Find the UTF-8 processing library
#
# ::
#
# This module defines the following variables:
# UTF8PROC_FOUND - True if UTF8PROC_INCLUDE_DIR & UTF8PROC_LIBRARY are found
# UTF8PROC_LIBRARIES - Set when UTF8PROC_LIBRARY is found
# UTF8PROC_INCLUDE_DIRS - Set when UTF8PROC_INCLUDE_DIR is found
#
#
#
# ::
#
# UTF8PROC_INCLUDE_DIR - where to find utf8proc.h
# UTF8PROC_LIBRARY - the utf8proc library
#=============================================================================
# This module is adapted from FindALSA.cmake. Below are the original license
# header.
#=============================================================================
# Copyright 2009-2011 Kitware, Inc.
# Copyright 2009-2011 Philip Lowman <philip@yhbt.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
find_path(
UTF8PROC_INCLUDE_DIR NAMES utf8proc.h DOC "The utf8proc include directory"
)
find_library(
UTF8PROC_LIBRARY NAMES utf8proc DOC "The utf8proc library"
)
# handle the QUIETLY and REQUIRED arguments and set UTF8PROC_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
Utf8Proc
FOUND_VAR Utf8Proc_FOUND
REQUIRED_VARS UTF8PROC_LIBRARY UTF8PROC_INCLUDE_DIR
)
if(Utf8Proc_FOUND)
set( UTF8PROC_LIBRARIES ${UTF8PROC_LIBRARY} )
set( UTF8PROC_INCLUDE_DIRS ${UTF8PROC_INCLUDE_DIR} )
endif()
mark_as_advanced(UTF8PROC_INCLUDE_DIR UTF8PROC_LIBRARY)

23
qtermwidget/cmake/cmake_uninstall.cmake.in 100644
View File

@ -0,0 +1,23 @@
IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
# this works on Linux, but not on mac.
#FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
#STRING(REGEX REPLACE "\n" ";" files "${files}")
#FOREACH(file ${files})
# MESSAGE(STATUS "Uninstalling \"${file}\"")
# IF(NOT EXISTS "${file}")
# MESSAGE(FATAL_ERROR "File \"${file}\" does not exists.")
# ENDIF(NOT EXISTS "${file}")
# EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
# OUTPUT_VARIABLE rm_out
# RETURN_VARIABLE rm_retval)
# IF("${rm_retval}" GREATER 0)
# MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
# ENDIF("${rm_retval}" GREATER 0)
#ENDFOREACH(file)
EXEC_PROGRAM("xargs rm < @CMAKE_BINARY_DIR@/install_manifest.txt"
OUTPUT_VARIABLE rm_out
RETURN_VARIABLE rm_ret)

20
qtermwidget/cmake/qtermwidget5-config.cmake.in 100644
View File

@ -0,0 +1,20 @@
# - Find the QTermWidget include and library
#
# Typical usage:
# find_package(QTermWidget5 REQUIRED)
#
# add_executable(foo main.cpp)
# target_link_libraries(foo qtermwidget5)
@PACKAGE_INIT@
if (CMAKE_VERSION VERSION_LESS 3.0.2)
message(FATAL_ERROR \"qtermwidget requires at least CMake version 3.0.2\")
endif()
if (NOT TARGET @QTERMWIDGET_LIBRARY_NAME@)
if (POLICY CMP0024)
cmake_policy(SET CMP0024 NEW)
endif()
include("${CMAKE_CURRENT_LIST_DIR}/@QTERMWIDGET_LIBRARY_NAME@-targets.cmake")
endif()

20
qtermwidget/cmake/qtermwidget6-config.cmake.in 100644
View File

@ -0,0 +1,20 @@
# - Find the QTermWidget include and library
#
# Typical usage:
# find_package(QTermWidget5 REQUIRED)
#
# add_executable(foo main.cpp)
# target_link_libraries(foo qtermwidget5)
@PACKAGE_INIT@
if (CMAKE_VERSION VERSION_LESS 3.0.2)
message(FATAL_ERROR \"qtermwidget requires at least CMake version 3.0.2\")
endif()
if (NOT TARGET @QTERMWIDGET_LIBRARY_NAME@)
if (POLICY CMP0024)
cmake_policy(SET CMP0024 NEW)
endif()
include("${CMAKE_CURRENT_LIST_DIR}/@QTERMWIDGET_LIBRARY_NAME@-targets.cmake")
endif()

20
qtermwidget/docs/configuration.md 100644
View File

@ -0,0 +1,20 @@
# Migration for background images
How the background image is drawn has been changed since version 0.17.
Intuitively, the background image is now drawn above the background color instead of below it.
Technically, the background image is no longer blended with the background color.
Any background image can be used but, of course, it should be chosen so that the terminal text can be easily read on it.
Since an image may not be totally dark or light, you might want to use a translucent image as the background.
As a result, the background image is mixed with the background color to improve readability.
Opaque images can also be converted to translucent ones with a few steps.
A common usage is an effect similar to previous qtermwidget versions or other terminal emulators.
To achieve that, you can convert the background image to a translucent one with the transparency level matching the original terminal transparency.
For example, if the original terminal transparency of qtermwidget was 25% (or 75% in some other terminal emulators), a converted image with transparency 25% will work as usual.
The conversion can be done via ImageMagick, GraphicsMagick, GIMP or Krita.
Here is an example command using ImageMagick:
$ convert original_image.jpg -matte -channel A +level 0,25% +channel translucent_image.png
You may also want to change the terminal transparency to 0% if you do not want to see another window or the desktop below the terminal.

1
qtermwidget/examples/README 100644
View File

@ -0,0 +1 @@
Here are two sample programs which use QTermWidget for displaying a terminal

8
qtermwidget/examples/cpp/RemoteTerm/README.md 100644
View File

@ -0,0 +1,8 @@
A simple example showing how to use QTermWidget to control and display a remote terminal.
To run this example, you should:
1. Build client-side program. In my PC, I use 'apt-get' to install the QTermWidget library.
2. Start the shell-srv.py with specific parameters.This will expose a shell via socket.
3. Start the client-side program from commandline with specific parameters.
Now you will get your own remote terminal work with QTermWidget.

34
qtermwidget/examples/cpp/RemoteTerm/RemoteTerm.pro 100644
View File

@ -0,0 +1,34 @@
#-------------------------------------------------
#
# Project created by QtCreator 2017-10-31T00:37:59
#
#-------------------------------------------------
QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = RemoteTerm
TEMPLATE = app
# The following define makes your compiler emit warnings if you use
# any feature of Qt which as been marked as deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
# deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS
# You can also make your code fail to compile if you use deprecated APIs.
# In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
CONFIG += c++11
SOURCES += \
main.cpp \
remoteterm.cpp
HEADERS += \
remoteterm.h
unix:!macx: LIBS += -lqtermwidget5

19
qtermwidget/examples/cpp/RemoteTerm/main.cpp 100644
View File

@ -0,0 +1,19 @@
#include "remoteterm.h"
#include <QApplication>
#include <QDebug>
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
if(a.arguments().size() != 3){
qDebug() << "Example(client-side) for remote terminal of QTermWidget.";
qDebug() << QString("Usage: %1 ipaddr port").arg(a.arguments()[0]);
return 1;
}
QString ipaddr = a.arguments().at(1);
quint16 port = a.arguments().at(2).toUShort();
RemoteTerm w(ipaddr,port);
w.show();
return a.exec();
}

32
qtermwidget/examples/cpp/RemoteTerm/remoteterm.cpp 100644
View File

@ -0,0 +1,32 @@
#include "remoteterm.h"
#include <QTcpSocket>
#include <QDebug>
#include <unistd.h>
RemoteTerm::RemoteTerm(const QString &ipaddr, quint16 port, QWidget *parent)
: QTermWidget(0,parent)
{
socket = new QTcpSocket(this);
// Write what we input to remote terminal via socket
connect(this, &RemoteTerm::sendData,[this](const char *data, int size){
this->socket->write(data, size);
});
// Read anything from remote terminal via socket and show it on widget.
connect(socket,&QTcpSocket::readyRead,[this](){
QByteArray data = socket->readAll();
write(this->getPtySlaveFd(), data.data(), data.size());
});
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)),this,SLOT(atError()));
// Here we start an empty pty.
this->startTerminalTeletype();
socket->connectToHost(ipaddr, port);
}
void RemoteTerm::atError()
{
qDebug() << socket->errorString();
}

19
qtermwidget/examples/cpp/RemoteTerm/remoteterm.h 100644
View File

@ -0,0 +1,19 @@
#ifndef WIDGET_H
#define WIDGET_H
#include <qtermwidget5/qtermwidget.h>
class QTcpSocket;
class RemoteTerm : public QTermWidget
{
Q_OBJECT
public:
RemoteTerm(const QString &ipaddr, quint16 port, QWidget *parent = 0);
public slots:
void atError();
private:
QTcpSocket *socket;
};
#endif // WIDGET_H

37
qtermwidget/examples/cpp/RemoteTerm/shell-srv.py 100644
View File

@ -0,0 +1,37 @@
#!/usr/bin/env python
import sys
import os
import socket
import pty
def usage(program):
print "Example(server-side) for remote terminal of QTermWidget."
print "Usage: %s ipaddr port" %program
def main():
if len(sys.argv) != 3:
usage(sys.argv[0])
sys.exit(1)
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
try:
s.bind((sys.argv[1], int(sys.argv[2])))
s.listen(0)
print "[+]Start Server."
except Exception as e:
print "[-]Error Happened: %s" %e.message
sys.exit(2)
while True:
c = s.accept()
os.dup2(c[0].fileno(), 0)
os.dup2(c[0].fileno(), 1)
os.dup2(c[0].fileno(), 2)
# It's important to use pty to spawn the shell.
pty.spawn("/bin/sh")
c[0].close()
if __name__ == "__main__":
main()

87
qtermwidget/examples/cpp/main.cpp 100644
View File

@ -0,0 +1,87 @@
/* Copyright (C) 2008 e_k (e_k@users.sourceforge.net)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library 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
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#include <QApplication>
#include <QtDebug>
#include <QIcon>
#include <QMainWindow>
#include <QMenuBar>
#include "qtermwidget.h"
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
QIcon::setThemeName(QStringLiteral("oxygen"));
QMainWindow *mainWindow = new QMainWindow();
QTermWidget *console = new QTermWidget();
QMenuBar *menuBar = new QMenuBar(mainWindow);
QMenu *actionsMenu = new QMenu(QStringLiteral("Actions"), menuBar);
menuBar->addMenu(actionsMenu);
actionsMenu->addAction(QStringLiteral("Find..."), console, &QTermWidget::toggleShowSearchBar,
QKeySequence(QLatin1String("Ctrl+Shift+F")));
actionsMenu->addAction(QStringLiteral("Copy"), console, &QTermWidget::copyClipboard,
QKeySequence(QLatin1String("Ctrl+Shift+C")));
actionsMenu->addAction(QStringLiteral("Paste"), console, &QTermWidget::pasteClipboard,
QKeySequence(QLatin1String("Ctrl+Shift+V")));
actionsMenu->addAction(QStringLiteral("About Qt"), &app, &QApplication::aboutQt);
mainWindow->setMenuBar(menuBar);
QFont font = QApplication::font();
#ifdef Q_OS_MACOS
font.setFamily(QStringLiteral("Monaco"));
#elif defined(Q_WS_QWS)
font.setFamily(QStringLiteral("fixed"));
#else
font.setFamily(QStringLiteral("Monospace"));
#endif
font.setPointSize(12);
console->setTerminalFont(font);
// console->setColorScheme(COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW);
console->setScrollBarPosition(QTermWidget::ScrollBarRight);
const auto arguments = QApplication::arguments();
for (const QString& arg : arguments)
{
if (console->availableColorSchemes().contains(arg))
console->setColorScheme(arg);
if (console->availableKeyBindings().contains(arg))
console->setKeyBindings(arg);
}
mainWindow->setCentralWidget(console);
mainWindow->resize(600, 400);
// info output
qDebug() << "* INFO *************************";
qDebug() << " availableKeyBindings:" << console->availableKeyBindings();
qDebug() << " keyBindings:" << console->keyBindings();
qDebug() << " availableColorSchemes:" << console->availableColorSchemes();
qDebug() << "* INFO END *********************";
// real startup
QObject::connect(console, &QTermWidget::finished, mainWindow, &QMainWindow::close);
mainWindow->show();
return app.exec();
}

22
qtermwidget/examples/pyqt/main.py 100755
View File

@ -0,0 +1,22 @@
#!/usr/bin/python3
from PyQt5 import QtWidgets
from QTermWidget import QTermWidget
class Terminal(QTermWidget):
def __init__(self, process: str, args: list):
super().__init__(0)
self.finished.connect(self.close)
self.setTerminalSizeHint(False)
self.setColorScheme("DarkPastels")
self.setShellProgram(process)
self.setArgs(args)
self.startShellProgram()
self.show()
if __name__ == "__main__":
app = QtWidgets.QApplication([])
args = ["--clean", "--noplugin"]
term = Terminal("vim", args)
app.exec()

177
qtermwidget/src/BlockArray.cpp → qtermwidget/lib/BlockArray.cpp
View File

@ -21,17 +21,16 @@
*/ */
#include <QtDebug>
// Own // Own
#include "BlockArray.h" #include "BlockArray.h"
#include <QtCore>
// System // System
#include <assert.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/param.h> #include <sys/param.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <cstdio>
using namespace Konsole; using namespace Konsole;
@ -39,40 +38,56 @@ using namespace Konsole;
static int blocksize = 0; static int blocksize = 0;
BlockArray::BlockArray() BlockArray::BlockArray()
: size(0), : size(0),
current(size_t(-1)), current(size_t(-1)),
index(size_t(-1)), index(size_t(-1)),
lastmap(0), lastmap(nullptr),
lastmap_index(size_t(-1)), lastmap_index(size_t(-1)),
lastblock(0), ion(-1), lastblock(nullptr), ion(-1),
length(0) length(0)
{ {
// lastmap_index = index = current = size_t(-1); // lastmap_index = index = current = size_t(-1);
if (blocksize == 0) if (blocksize == 0) {
blocksize = ((sizeof(Block) / getpagesize()) + 1) * getpagesize(); blocksize = ((sizeof(Block) / getpagesize()) + 1) * getpagesize();
}
} }
BlockArray::~BlockArray() BlockArray::~BlockArray()
{ {
setHistorySize(0); setHistorySize(0);
assert(!lastblock); Q_ASSERT(!lastblock);
} }
size_t BlockArray::append(Block *block) size_t BlockArray::append(Block * block)
{ {
if (!size) if (!size) {
return size_t(-1); return size_t(-1);
}
++current; ++current;
if (current >= size) current = 0; if (current >= size) {
current = 0;
}
int rc; int rc;
rc = lseek(ion, current * blocksize, SEEK_SET); if (rc < 0) { perror("HistoryBuffer::add.seek"); setHistorySize(0); return size_t(-1); } rc = lseek(ion, current * blocksize, SEEK_SET);
rc = write(ion, block, blocksize); if (rc < 0) { perror("HistoryBuffer::add.write"); setHistorySize(0); return size_t(-1); } if (rc < 0) {
perror("HistoryBuffer::add.seek");
setHistorySize(0);
return size_t(-1);
}
rc = write(ion, block, blocksize);
if (rc < 0) {
perror("HistoryBuffer::add.write");
setHistorySize(0);
return size_t(-1);
}
length++; length++;
if (length > size) length = size; if (length > size) {
length = size;
}
++index; ++index;
@ -82,44 +97,50 @@ size_t BlockArray::append(Block *block)
size_t BlockArray::newBlock() size_t BlockArray::newBlock()
{ {
if (!size) if (!size) {
return size_t(-1); return size_t(-1);
}
append(lastblock); append(lastblock);
lastblock = new Block(); lastblock = new Block();
return index + 1; return index + 1;
} }
Block *BlockArray::lastBlock() const Block * BlockArray::lastBlock() const
{ {
return lastblock; return lastblock;
} }
bool BlockArray::has(size_t i) const bool BlockArray::has(size_t i) const
{ {
if (i == index + 1) if (i == index + 1) {
return true; return true;
}
if (i > index) if (i > index) {
return false; return false;
if (index - i >= length) }
if (index - i >= length) {
return false; return false;
}
return true; return true;
} }
const Block* BlockArray::at(size_t i) const Block * BlockArray::at(size_t i)
{ {
if (i == index + 1) if (i == index + 1) {
return lastblock; return lastblock;
}
if (i == lastmap_index) if (i == lastmap_index) {
return lastmap; return lastmap;
}
if (i > index) { if (i > index) {
qDebug() << "BlockArray::at() i > index\n"; qDebug() << "BlockArray::at() i > index\n";
return 0; return nullptr;
} }
// if (index - i >= length) { // if (index - i >= length) {
// kDebug(1211) << "BlockArray::at() index - i >= length\n"; // kDebug(1211) << "BlockArray::at() index - i >= length\n";
// return 0; // return 0;
@ -127,12 +148,15 @@ const Block* BlockArray::at(size_t i)
size_t j = i; // (current - (index - i) + (index/size+1)*size) % size ; size_t j = i; // (current - (index - i) + (index/size+1)*size) % size ;
assert(j < size); Q_ASSERT(j < size);
unmap(); unmap();
Block *block = (Block*)mmap(0, blocksize, PROT_READ, MAP_PRIVATE, ion, j * blocksize); Block * block = (Block *)mmap(nullptr, blocksize, PROT_READ, MAP_PRIVATE, ion, j * blocksize);
if (block == (Block*)-1) { perror("mmap"); return 0; } if (block == (Block *)-1) {
perror("mmap");
return nullptr;
}
lastmap = block; lastmap = block;
lastmap_index = i; lastmap_index = i;
@ -143,10 +167,12 @@ const Block* BlockArray::at(size_t i)
void BlockArray::unmap() void BlockArray::unmap()
{ {
if (lastmap) { if (lastmap) {
int res = munmap((char*)lastmap, blocksize); int res = munmap((char *)lastmap, blocksize);
if (res < 0) perror("munmap"); if (res < 0) {
perror("munmap");
}
} }
lastmap = 0; lastmap = nullptr;
lastmap_index = size_t(-1); lastmap_index = size_t(-1);
} }
@ -159,22 +185,25 @@ bool BlockArray::setHistorySize(size_t newsize)
{ {
// kDebug(1211) << "setHistorySize " << size << " " << newsize; // kDebug(1211) << "setHistorySize " << size << " " << newsize;
if (size == newsize) if (size == newsize) {
return false; return false;
}
unmap(); unmap();
if (!newsize) { if (!newsize) {
delete lastblock; delete lastblock;
lastblock = 0; lastblock = nullptr;
if (ion >= 0) close(ion); if (ion >= 0) {
close(ion);
}
ion = -1; ion = -1;
current = size_t(-1); current = size_t(-1);
return true; return true;
} }
if (!size) { if (!size) {
FILE* tmp = tmpfile(); FILE * tmp = tmpfile();
if (!tmp) { if (!tmp) {
perror("konsole: cannot open temp file.\n"); perror("konsole: cannot open temp file.\n");
} else { } else {
@ -184,10 +213,11 @@ bool BlockArray::setHistorySize(size_t newsize)
fclose(tmp); fclose(tmp);
} }
} }
if (ion < 0) if (ion < 0) {
return false; return false;
}
assert(!lastblock); Q_ASSERT(!lastblock);
lastblock = new Block(); lastblock = new Block();
size = newsize; size = newsize;
@ -207,38 +237,44 @@ bool BlockArray::setHistorySize(size_t newsize)
} }
} }
void moveBlock(FILE *fion, int cursor, int newpos, char *buffer2) void moveBlock(FILE * fion, int cursor, int newpos, char * buffer2)
{ {
int res = fseek(fion, cursor * blocksize, SEEK_SET); int res = fseek(fion, cursor * blocksize, SEEK_SET);
if (res) if (res) {
perror("fseek"); perror("fseek");
}
res = fread(buffer2, blocksize, 1, fion); res = fread(buffer2, blocksize, 1, fion);
if (res != 1) if (res != 1) {
perror("fread"); perror("fread");
}
res = fseek(fion, newpos * blocksize, SEEK_SET); res = fseek(fion, newpos * blocksize, SEEK_SET);
if (res) if (res) {
perror("fseek"); perror("fseek");
}
res = fwrite(buffer2, blocksize, 1, fion); res = fwrite(buffer2, blocksize, 1, fion);
if (res != 1) if (res != 1) {
perror("fwrite"); perror("fwrite");
}
// printf("moving block %d to %d\n", cursor, newpos); // printf("moving block %d to %d\n", cursor, newpos);
} }
void BlockArray::decreaseBuffer(size_t newsize) void BlockArray::decreaseBuffer(size_t newsize)
{ {
if (index < newsize) // still fits in whole if (index < newsize) { // still fits in whole
return; return;
}
int offset = (current - (newsize - 1) + size) % size; int offset = (current - (newsize - 1) + size) % size;
if (!offset) if (!offset) {
return; return;
}
// The Block constructor could do somthing in future... // The Block constructor could do something in future...
char *buffer1 = new char[blocksize]; char * buffer1 = new char[blocksize];
FILE *fion = fdopen(dup(ion), "w+b"); FILE * fion = fdopen(dup(ion), "w+b");
if (!fion) { if (!fion) {
delete [] buffer1; delete [] buffer1;
perror("fdopen/dup"); perror("fdopen/dup");
@ -258,8 +294,9 @@ void BlockArray::decreaseBuffer(size_t newsize)
moveBlock(fion, oldpos, cursor, buffer1); moveBlock(fion, oldpos, cursor, buffer1);
if (oldpos < newsize) { if (oldpos < newsize) {
cursor = oldpos; cursor = oldpos;
} else } else {
cursor++; cursor++;
}
} }
current = newsize - 1; current = newsize - 1;
@ -273,16 +310,18 @@ void BlockArray::decreaseBuffer(size_t newsize)
void BlockArray::increaseBuffer() void BlockArray::increaseBuffer()
{ {
if (index < size) // not even wrapped once if (index < size) { // not even wrapped once
return; return;
}
int offset = (current + size + 1) % size; int offset = (current + size + 1) % size;
if (!offset) // no moving needed if (!offset) { // no moving needed
return; return;
}
// The Block constructor could do somthing in future... // The Block constructor could do something in future...
char *buffer1 = new char[blocksize]; char * buffer1 = new char[blocksize];
char *buffer2 = new char[blocksize]; char * buffer2 = new char[blocksize];
int runs = 1; int runs = 1;
int bpr = size; // blocks per run int bpr = size; // blocks per run
@ -292,38 +331,40 @@ void BlockArray::increaseBuffer()
runs = offset; runs = offset;
} }
FILE *fion = fdopen(dup(ion), "w+b"); FILE * fion = fdopen(dup(ion), "w+b");
if (!fion) { if (!fion) {
perror("fdopen/dup"); perror("fdopen/dup");
delete [] buffer1; delete [] buffer1;
delete [] buffer2; delete [] buffer2;
return; return;
} }
int res; int res;
for (int i = 0; i < runs; i++) for (int i = 0; i < runs; i++) {
{
// free one block in chain // free one block in chain
int firstblock = (offset + i) % size; int firstblock = (offset + i) % size;
res = fseek(fion, firstblock * blocksize, SEEK_SET); res = fseek(fion, firstblock * blocksize, SEEK_SET);
if (res) if (res) {
perror("fseek"); perror("fseek");
}
res = fread(buffer1, blocksize, 1, fion); res = fread(buffer1, blocksize, 1, fion);
if (res != 1) if (res != 1) {
perror("fread"); perror("fread");
}
int newpos = 0; int newpos = 0;
for (int j = 1, cursor=firstblock; j < bpr; j++) for (int j = 1, cursor=firstblock; j < bpr; j++) {
{
cursor = (cursor + offset) % size; cursor = (cursor + offset) % size;
newpos = (cursor - offset + size) % size; newpos = (cursor - offset + size) % size;
moveBlock(fion, cursor, newpos, buffer2); moveBlock(fion, cursor, newpos, buffer2);
} }
res = fseek(fion, i * blocksize, SEEK_SET); res = fseek(fion, i * blocksize, SEEK_SET);
if (res) if (res) {
perror("fseek"); perror("fseek");
}
res = fwrite(buffer1, blocksize, 1, fion); res = fwrite(buffer1, blocksize, 1, fion);
if (res != 1) if (res != 1) {
perror("fwrite"); perror("fwrite");
}
} }
current = size - 1; current = size - 1;
length = size; length = size;

35
qtermwidget/src/BlockArray.h → qtermwidget/lib/BlockArray.h
View File

@ -1,7 +1,7 @@
/* /*
This file is part of Konsole, an X terminal. This file is part of Konsole, an X terminal.
Copyright (C) 2000 by Stephan Kulow <coolo@kde.org> Copyright (C) 2000 by Stephan Kulow <coolo@kde.org>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008 Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -27,14 +27,15 @@
//#error Do not use in KDE 2.1 //#error Do not use in KDE 2.1
#define BlockSize (1 << 12) #define QTERMWIDGET_BLOCKSIZE (1 << 12)
#define ENTRIES ((BlockSize - sizeof(size_t) ) / sizeof(unsigned char)) #define ENTRIES ((QTERMWIDGET_BLOCKSIZE - sizeof(size_t) ) / sizeof(unsigned char))
namespace Konsole namespace Konsole {
{
struct Block { struct Block {
Block() { size = 0; } Block() {
size = 0;
}
unsigned char data[ENTRIES]; unsigned char data[ENTRIES];
size_t size; size_t size;
}; };
@ -58,24 +59,24 @@ public:
* adds the Block at the end of history. * adds the Block at the end of history.
* This may drop other blocks. * This may drop other blocks.
* *
* The ownership on the block is transfered. * The ownership on the block is transferred.
* An unique index number is returned for accessing * An unique index number is returned for accessing
* it later (if not yet dropped then) * it later (if not yet dropped then)
* *
* Note, that the block may be dropped completely * Note, that the block may be dropped completely
* if history is turned off. * if history is turned off.
*/ */
size_t append(Block *block); size_t append(Block * block);
/** /**
* gets the block at the index. Function may return * gets the block at the index. Function may return
* 0 if the block isn't available any more. * 0 if the block isn't available any more.
* *
* The returned block is strictly readonly as only * The returned block is strictly readonly as only
* maped in memory - and will be invalid on the next * mapped in memory - and will be invalid on the next
* operation on this class. * operation on this class.
*/ */
const Block *at(size_t index); const Block * at(size_t index);
/** /**
* reorders blocks as needed. If newsize is null, * reorders blocks as needed. If newsize is null,
@ -87,7 +88,7 @@ public:
size_t newBlock(); size_t newBlock();
Block *lastBlock() const; Block * lastBlock() const;
/** /**
* Convenient function to set the size in KBytes * Convenient function to set the size in KBytes
@ -95,11 +96,15 @@ public:
*/ */
bool setSize(size_t newsize); bool setSize(size_t newsize);
size_t len() const { return length; } size_t len() const {
return length;
}
bool has(size_t index) const; bool has(size_t index) const;
size_t getCurrent() const { return current; } size_t getCurrent() const {
return current;
}
private: private:
void unmap(); void unmap();
@ -111,9 +116,9 @@ private:
size_t current; size_t current;
size_t index; size_t index;
Block *lastmap; Block * lastmap;
size_t lastmap_index; size_t lastmap_index;
Block *lastblock; Block * lastblock;
int ion; int ion;
size_t length; size_t length;

97
qtermwidget/src/Character.h → qtermwidget/lib/Character.h
View File

@ -1,10 +1,8 @@
/* /*
This file is part of Konsole, KDE's terminal. This file is part of Konsole, KDE's terminal.
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com>
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008 Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -26,7 +24,7 @@
#define CHARACTER_H #define CHARACTER_H
// Qt // Qt
#include <QtCore/QHash> #include <QHash>
// Local // Local
#include "CharacterColor.h" #include "CharacterColor.h"
@ -36,10 +34,10 @@ namespace Konsole
typedef unsigned char LineProperty; typedef unsigned char LineProperty;
static const int LINE_DEFAULT = 0; static const int LINE_DEFAULT = 0;
static const int LINE_WRAPPED = (1 << 0); static const int LINE_WRAPPED = (1 << 0);
static const int LINE_DOUBLEWIDTH = (1 << 1); static const int LINE_DOUBLEWIDTH = (1 << 1);
static const int LINE_DOUBLEHEIGHT = (1 << 2); static const int LINE_DOUBLEHEIGHT = (1 << 2);
#define DEFAULT_RENDITION 0 #define DEFAULT_RENDITION 0
#define RE_BOLD (1 << 0) #define RE_BOLD (1 << 0)
@ -47,8 +45,13 @@ static const int LINE_DOUBLEHEIGHT = (1 << 2);
#define RE_UNDERLINE (1 << 2) #define RE_UNDERLINE (1 << 2)
#define RE_REVERSE (1 << 3) // Screen only #define RE_REVERSE (1 << 3) // Screen only
#define RE_INTENSIVE (1 << 3) // Widget only #define RE_INTENSIVE (1 << 3) // Widget only
#define RE_CURSOR (1 << 4) #define RE_ITALIC (1 << 4)
#define RE_EXTENDED_CHAR (1 << 5) #define RE_CURSOR (1 << 5)
#define RE_EXTENDED_CHAR (1 << 6)
#define RE_FAINT (1 << 7)
#define RE_STRIKEOUT (1 << 8)
#define RE_CONCEAL (1 << 9)
#define RE_OVERLINE (1 << 10)
/** /**
* A single character in the terminal which consists of a unicode character * A single character in the terminal which consists of a unicode character
@ -58,7 +61,7 @@ static const int LINE_DOUBLEHEIGHT = (1 << 2);
class Character class Character
{ {
public: public:
/** /**
* Constructs a new character. * Constructs a new character.
* *
* @param _c The unicode character value of this character. * @param _c The unicode character value of this character.
@ -75,26 +78,30 @@ public:
union union
{ {
/** The unicode character value for this character. */ /** The unicode character value for this character. */
quint16 character; #if QT_VERSION >= 0x060000
/** char16_t character;
#else
wchar_t character;
#endif
/**
* Experimental addition which allows a single Character instance to contain more than * Experimental addition which allows a single Character instance to contain more than
* one unicode character. * one unicode character.
* *
* charSequence is a hash code which can be used to look up the unicode * charSequence is a hash code which can be used to look up the unicode
* character sequence in the ExtendedCharTable used to create the sequence. * character sequence in the ExtendedCharTable used to create the sequence.
*/ */
quint16 charSequence; quint16 charSequence;
}; };
/** A combination of RENDITION flags which specify options for drawing the character. */ /** A combination of RENDITION flags which specify options for drawing the character. */
quint8 rendition; quint8 rendition;
/** The foreground color used to draw this character. */ /** The foreground color used to draw this character. */
CharacterColor foregroundColor; CharacterColor foregroundColor;
/** The color used to draw this character's background. */ /** The color used to draw this character's background. */
CharacterColor backgroundColor; CharacterColor backgroundColor;
/** /**
* Returns true if this character has a transparent background when * Returns true if this character has a transparent background when
* it is drawn with the specified @p palette. * it is drawn with the specified @p palette.
*/ */
@ -102,11 +109,16 @@ public:
/** /**
* Returns true if this character should always be drawn in bold when * Returns true if this character should always be drawn in bold when
* it is drawn with the specified @p palette, independent of whether * it is drawn with the specified @p palette, independent of whether
* or not the character has the RE_BOLD rendition flag. * or not the character has the RE_BOLD rendition flag.
*/ */
bool isBold(const ColorEntry* base) const; ColorEntry::FontWeight fontWeight(const ColorEntry* base) const;
/** /**
* returns true if the format (color, rendition flag) of the compared characters is equal
*/
bool equalsFormat(const Character &other) const;
/**
* Compares two characters and returns true if they have the same unicode character value, * Compares two characters and returns true if they have the same unicode character value,
* rendition and colors. * rendition and colors.
*/ */
@ -119,35 +131,45 @@ public:
}; };
inline bool operator == (const Character& a, const Character& b) inline bool operator == (const Character& a, const Character& b)
{ {
return a.character == b.character && return a.character == b.character &&
a.rendition == b.rendition && a.rendition == b.rendition &&
a.foregroundColor == b.foregroundColor && a.foregroundColor == b.foregroundColor &&
a.backgroundColor == b.backgroundColor; a.backgroundColor == b.backgroundColor;
} }
inline bool operator != (const Character& a, const Character& b) inline bool operator != (const Character& a, const Character& b)
{ {
return a.character != b.character || return a.character != b.character ||
a.rendition != b.rendition || a.rendition != b.rendition ||
a.foregroundColor != b.foregroundColor || a.foregroundColor != b.foregroundColor ||
a.backgroundColor != b.backgroundColor; a.backgroundColor != b.backgroundColor;
} }
inline bool Character::isTransparent(const ColorEntry* base) const inline bool Character::isTransparent(const ColorEntry* base) const
{ {
return ((backgroundColor._colorSpace == COLOR_SPACE_DEFAULT) && return ((backgroundColor._colorSpace == COLOR_SPACE_DEFAULT) &&
base[backgroundColor._u+0+(backgroundColor._v?BASE_COLORS:0)].transparent) base[backgroundColor._u+0+(backgroundColor._v?BASE_COLORS:0)].transparent)
|| ((backgroundColor._colorSpace == COLOR_SPACE_SYSTEM) && || ((backgroundColor._colorSpace == COLOR_SPACE_SYSTEM) &&
base[backgroundColor._u+2+(backgroundColor._v?BASE_COLORS:0)].transparent); base[backgroundColor._u+2+(backgroundColor._v?BASE_COLORS:0)].transparent);
} }
inline bool Character::isBold(const ColorEntry* base) const inline bool Character::equalsFormat(const Character& other) const
{ {
return ((backgroundColor._colorSpace == COLOR_SPACE_DEFAULT) && return
base[backgroundColor._u+0+(backgroundColor._v?BASE_COLORS:0)].bold) backgroundColor==other.backgroundColor &&
|| ((backgroundColor._colorSpace == COLOR_SPACE_SYSTEM) && foregroundColor==other.foregroundColor &&
base[backgroundColor._u+2+(backgroundColor._v?BASE_COLORS:0)].bold); rendition==other.rendition;
}
inline ColorEntry::FontWeight Character::fontWeight(const ColorEntry* base) const
{
if (backgroundColor._colorSpace == COLOR_SPACE_DEFAULT)
return base[backgroundColor._u+0+(backgroundColor._v?BASE_COLORS:0)].fontWeight;
else if (backgroundColor._colorSpace == COLOR_SPACE_SYSTEM)
return base[backgroundColor._u+2+(backgroundColor._v?BASE_COLORS:0)].fontWeight;
else
return ColorEntry::UseCurrentFormat;
} }
extern unsigned short vt100_graphics[32]; extern unsigned short vt100_graphics[32];
@ -183,7 +205,7 @@ public:
* which was added to the table using createExtendedChar(). * which was added to the table using createExtendedChar().
* *
* @param hash The hash key returned by createExtendedChar() * @param hash The hash key returned by createExtendedChar()
* @param length This variable is set to the length of the * @param length This variable is set to the length of the
* character sequence. * character sequence.
* *
* @return A unicode character sequence of size @p length. * @return A unicode character sequence of size @p length.
@ -195,7 +217,7 @@ public:
private: private:
// calculates the hash key of a sequence of unicode points of size 'length' // calculates the hash key of a sequence of unicode points of size 'length'
ushort extendedCharHash(ushort* unicodePoints , ushort length) const; ushort extendedCharHash(ushort* unicodePoints , ushort length) const;
// tests whether the entry in the table specified by 'hash' matches the // tests whether the entry in the table specified by 'hash' matches the
// character sequence 'unicodePoints' of size 'length' // character sequence 'unicodePoints' of size 'length'
bool extendedCharMatch(ushort hash , ushort* unicodePoints , ushort length) const; bool extendedCharMatch(ushort hash , ushort* unicodePoints , ushort length) const;
// internal, maps hash keys to character sequence buffers. The first ushort // internal, maps hash keys to character sequence buffers. The first ushort
@ -205,6 +227,7 @@ private:
}; };
} }
Q_DECLARE_TYPEINFO(Konsole::Character, Q_MOVABLE_TYPE);
#endif // CHARACTER_H #endif // CHARACTER_H

171
qtermwidget/src/CharacterColor.h → qtermwidget/lib/CharacterColor.h
View File

@ -1,10 +1,8 @@
/* /*
This file is part of Konsole, KDE's terminal. This file is part of Konsole, KDE's terminal.
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com>
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008 Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -26,19 +24,22 @@
#define CHARACTERCOLOR_H #define CHARACTERCOLOR_H
// Qt // Qt
#include <QtGui/QColor> #include <QColor>
//#include <kdemacros.h>
#define KDE_NO_EXPORT
namespace Konsole namespace Konsole
{ {
/** /**
* An entry in a terminal display's color palette. * An entry in a terminal display's color palette.
* *
* A color palette is an array of 16 ColorEntry instances which map * A color palette is an array of 16 ColorEntry instances which map
* system color indexes (from 0 to 15) into actual colors. * system color indexes (from 0 to 15) into actual colors.
* *
* Each entry can be set as bold, in which case any text * Each entry can be set as bold, in which case any text
* drawn using the color should be drawn in bold. * drawn using the color should be drawn in bold.
* *
* Each entry can also be transparent, in which case the terminal * Each entry can also be transparent, in which case the terminal
* display should avoid drawing the background for any characters * display should avoid drawing the background for any characters
@ -47,44 +48,49 @@ namespace Konsole
class ColorEntry class ColorEntry
{ {
public: public:
/** /** Specifies the weight to use when drawing text with this color. */
enum FontWeight
{
/** Always draw text in this color with a bold weight. */
Bold,
/** Always draw text in this color with a normal weight. */
Normal,
/**
* Use the current font weight set by the terminal application.
* This is the default behavior.
*/
UseCurrentFormat
};
/**
* Constructs a new color palette entry. * Constructs a new color palette entry.
* *
* @param c The color value for this entry. * @param c The color value for this entry.
* @param tr Specifies that the color should be transparent when used as a background color. * @param tr Specifies that the color should be transparent when used as a background color.
* @param b Specifies that text drawn with this color should be bold. * @param weight Specifies the font weight to use when drawing text with this color.
*/ */
ColorEntry(QColor c, bool tr, bool b) : color(c), transparent(tr), bold(b) {} ColorEntry(QColor c, bool tr, FontWeight weight = UseCurrentFormat)
: color(c), transparent(tr), fontWeight(weight) {}
/** /**
* Constructs a new color palette entry with an undefined color, and * Constructs a new color palette entry with an undefined color, and
* with the transparent and bold flags set to false. * with the transparent and bold flags set to false.
*/ */
ColorEntry() : transparent(false), bold(false) {} ColorEntry() : transparent(false), fontWeight(UseCurrentFormat) {}
/**
* Sets the color, transparency and boldness of this color to those of @p rhs.
*/
void operator=(const ColorEntry& rhs)
{
color = rhs.color;
transparent = rhs.transparent;
bold = rhs.bold;
}
/** The color value of this entry for display. */ /** The color value of this entry for display. */
QColor color; QColor color;
/** /**
* If true character backgrounds using this color should be transparent. * If true character backgrounds using this color should be transparent.
* This is not applicable when the color is used to render text. * This is not applicable when the color is used to render text.
*/ */
bool transparent; bool transparent;
/** /**
* If true characters drawn using this color should be bold. * Specifies the font weight to use when drawing text with this color.
* This is not applicable when the color is used to draw a character's background. * This is not applicable when the color is used to draw a character's background.
*/ */
bool bold; FontWeight fontWeight;
}; };
@ -102,25 +108,7 @@ public:
//a standard set of colors using black text on a white background. //a standard set of colors using black text on a white background.
//defined in TerminalDisplay.cpp //defined in TerminalDisplay.cpp
static const ColorEntry base_color_table[TABLE_COLORS] = extern const ColorEntry base_color_table[TABLE_COLORS] KDE_NO_EXPORT;
// The following are almost IBM standard color codes, with some slight
// gamma correction for the dim colors to compensate for bright X screens.
// It contains the 8 ansiterm/xterm colors in 2 intensities.
{
// Fixme: could add faint colors here, also.
// normal
ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 1, 0 ), // Dfore, Dback
ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red
ColorEntry(QColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry( QColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow
ColorEntry(QColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), // Blue, Magenta
ColorEntry(QColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan, White
// intensiv
ColorEntry(QColor(0x00,0x00,0x00), 0, 1 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 1, 0 ),
ColorEntry(QColor(0x68,0x68,0x68), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0x54), 0, 0 ),
ColorEntry(QColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0x54), 0, 0 ),
ColorEntry(QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0xFF), 0, 0 ),
ColorEntry(QColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 0, 0 )
};
/* CharacterColor is a union of the various color spaces. /* CharacterColor is a union of the various color spaces.
@ -152,16 +140,16 @@ class CharacterColor
friend class Character; friend class Character;
public: public:
/** Constructs a new CharacterColor whoose color and color space are undefined. */ /** Constructs a new CharacterColor whose color and color space are undefined. */
CharacterColor() CharacterColor()
: _colorSpace(COLOR_SPACE_UNDEFINED), : _colorSpace(COLOR_SPACE_UNDEFINED),
_u(0), _u(0),
_v(0), _v(0),
_w(0) _w(0)
{} {}
/** /**
* Constructs a new CharacterColor using the specified @p colorSpace and with * Constructs a new CharacterColor using the specified @p colorSpace and with
* color value @p co * color value @p co
* *
* The meaning of @p co depends on the @p colorSpace used. * The meaning of @p co depends on the @p colorSpace used.
@ -170,10 +158,10 @@ public:
* *
* TODO : Add documentation about available color spaces. * TODO : Add documentation about available color spaces.
*/ */
CharacterColor(quint8 colorSpace, int co) CharacterColor(quint8 colorSpace, int co)
: _colorSpace(colorSpace), : _colorSpace(colorSpace),
_u(0), _u(0),
_v(0), _v(0),
_w(0) _w(0)
{ {
switch (colorSpace) switch (colorSpace)
@ -185,7 +173,7 @@ public:
_u = co & 7; _u = co & 7;
_v = (co >> 3) & 1; _v = (co >> 3) & 1;
break; break;
case COLOR_SPACE_256: case COLOR_SPACE_256:
_u = co & 255; _u = co & 255;
break; break;
case COLOR_SPACE_RGB: case COLOR_SPACE_RGB:
@ -198,32 +186,32 @@ public:
} }
} }
/** /**
* Returns true if this character color entry is valid. * Returns true if this character color entry is valid.
*/ */
bool isValid() bool isValid() const
{ {
return _colorSpace != COLOR_SPACE_UNDEFINED; return _colorSpace != COLOR_SPACE_UNDEFINED;
} }
/** /**
* Toggles the value of this color between a normal system color and the corresponding intensive * Set the value of this color from a normal system color to the corresponding intensive
* system color. * system color if it's not already an intensive system color.
* *
* This is only applicable if the color is using the COLOR_SPACE_DEFAULT or COLOR_SPACE_SYSTEM * This is only applicable if the color is using the COLOR_SPACE_DEFAULT or COLOR_SPACE_SYSTEM
* color spaces. * color spaces.
*/ */
void toggleIntensive(); void setIntensive();
/** /**
* Returns the color within the specified color @palette * Returns the color within the specified color @p palette
* *
* The @p palette is only used if this color is one of the 16 system colors, otherwise * The @p palette is only used if this color is one of the 16 system colors, otherwise
* it is ignored. * it is ignored.
*/ */
QColor color(const ColorEntry* palette) const; QColor color(const ColorEntry* palette) const;
/** /**
* Compares two colors and returns true if they represent the same color value and * Compares two colors and returns true if they represent the same color value and
* use the same color space. * use the same color space.
*/ */
@ -237,35 +225,38 @@ public:
private: private:
quint8 _colorSpace; quint8 _colorSpace;
// bytes storing the character color // bytes storing the character color
quint8 _u; quint8 _u;
quint8 _v; quint8 _v;
quint8 _w; quint8 _w;
}; };
inline bool operator == (const CharacterColor& a, const CharacterColor& b) inline bool operator == (const CharacterColor& a, const CharacterColor& b)
{ {
return *reinterpret_cast<const quint32*>(&a._colorSpace) == return a._colorSpace == b._colorSpace &&
*reinterpret_cast<const quint32*>(&b._colorSpace); a._u == b._u &&
a._v == b._v &&
a._w == b._w;
} }
inline bool operator != (const CharacterColor& a, const CharacterColor& b) inline bool operator != (const CharacterColor& a, const CharacterColor& b)
{ {
return *reinterpret_cast<const quint32*>(&a._colorSpace) != return !operator==(a,b);
*reinterpret_cast<const quint32*>(&b._colorSpace);
} }
inline const QColor color256(quint8 u, const ColorEntry* base) inline const QColor color256(quint8 u, const ColorEntry* base)
{ {
// 0.. 16: system colors // 0.. 16: system colors
if (u < 8) return base[u+2 ].color; u -= 8; if (u < 8) return base[u+2 ].color;
if (u < 8) return base[u+2+BASE_COLORS].color; u -= 8; u -= 8;
if (u < 8) return base[u+2+BASE_COLORS].color;
u -= 8;
// 16..231: 6x6x6 rgb color cube // 16..231: 6x6x6 rgb color cube
if (u < 216) return QColor(255*((u/36)%6)/5, if (u < 216) return QColor(((u/36)%6) ? (40*((u/36)%6)+55) : 0,
255*((u/ 6)%6)/5, ((u/ 6)%6) ? (40*((u/ 6)%6)+55) : 0,
255*((u/ 1)%6)/5); u -= 216; ((u/ 1)%6) ? (40*((u/ 1)%6)+55) : 0);
u -= 216;
// 232..255: gray, leaving out black and white // 232..255: gray, leaving out black and white
int gray = u*10+8; return QColor(gray,gray,gray); int gray = u*10+8; return QColor(gray,gray,gray);
} }
@ -277,7 +268,7 @@ inline QColor CharacterColor::color(const ColorEntry* base) const
case COLOR_SPACE_DEFAULT: return base[_u+0+(_v?BASE_COLORS:0)].color; case COLOR_SPACE_DEFAULT: return base[_u+0+(_v?BASE_COLORS:0)].color;
case COLOR_SPACE_SYSTEM: return base[_u+2+(_v?BASE_COLORS:0)].color; case COLOR_SPACE_SYSTEM: return base[_u+2+(_v?BASE_COLORS:0)].color;
case COLOR_SPACE_256: return color256(_u,base); case COLOR_SPACE_256: return color256(_u,base);
case COLOR_SPACE_RGB: return QColor(_u,_v,_w); case COLOR_SPACE_RGB: return {_u,_v,_w};
case COLOR_SPACE_UNDEFINED: return QColor(); case COLOR_SPACE_UNDEFINED: return QColor();
} }
@ -286,11 +277,11 @@ inline QColor CharacterColor::color(const ColorEntry* base) const
return QColor(); return QColor();
} }
inline void CharacterColor::toggleIntensive() inline void CharacterColor::setIntensive()
{ {
if (_colorSpace == COLOR_SPACE_SYSTEM || _colorSpace == COLOR_SPACE_DEFAULT) if (_colorSpace == COLOR_SPACE_SYSTEM || _colorSpace == COLOR_SPACE_DEFAULT)
{ {
_v = !_v; _v = 1;
} }
} }

686
qtermwidget/lib/ColorScheme.cpp 100644
View File

@ -0,0 +1,686 @@
/*
This source file is part of Konsole, a terminal emulator.
Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
// Own
#include "ColorScheme.h"
#include "tools.h"
// Qt
#include <QBrush>
#include <QFile>
#include <QFileInfo>
#include <QtDebug>
#include <QSettings>
#include <QDir>
#include <QRegularExpression>
#include <QRandomGenerator>
#if QT_VERSION >= 0x060000
#include <QStringView>
#endif
// KDE
//#include <KColorScheme>
//#include <KConfig>
//#include <KLocale>
//#include <KDebug>
//#include <KConfigGroup>
//#include <KStandardDirs>
using namespace Konsole;
const ColorEntry ColorScheme::defaultTable[TABLE_COLORS] =
// The following are almost IBM standard color codes, with some slight
// gamma correction for the dim colors to compensate for bright X screens.
// It contains the 8 ansiterm/xterm colors in 2 intensities.
{
ColorEntry( QColor(0x00,0x00,0x00), false), ColorEntry(
QColor(0xFF,0xFF,0xFF), true), // Dfore, Dback
ColorEntry( QColor(0x00,0x00,0x00), false), ColorEntry(
QColor(0xB2,0x18,0x18), false), // Black, Red
ColorEntry( QColor(0x18,0xB2,0x18), false), ColorEntry(
QColor(0xB2,0x68,0x18), false), // Green, Yellow
ColorEntry( QColor(0x18,0x18,0xB2), false), ColorEntry(
QColor(0xB2,0x18,0xB2), false), // Blue, Magenta
ColorEntry( QColor(0x18,0xB2,0xB2), false), ColorEntry(
QColor(0xB2,0xB2,0xB2), false), // Cyan, White
// intensive
ColorEntry( QColor(0x00,0x00,0x00), false), ColorEntry(
QColor(0xFF,0xFF,0xFF), true),
ColorEntry( QColor(0x68,0x68,0x68), false), ColorEntry(
QColor(0xFF,0x54,0x54), false),
ColorEntry( QColor(0x54,0xFF,0x54), false), ColorEntry(
QColor(0xFF,0xFF,0x54), false),
ColorEntry( QColor(0x54,0x54,0xFF), false), ColorEntry(
QColor(0xFF,0x54,0xFF), false),
ColorEntry( QColor(0x54,0xFF,0xFF), false), ColorEntry(
QColor(0xFF,0xFF,0xFF), false)
};
const char* const ColorScheme::colorNames[TABLE_COLORS] =
{
"Foreground",
"Background",
"Color0",
"Color1",
"Color2",
"Color3",
"Color4",
"Color5",
"Color6",
"Color7",
"ForegroundIntense",
"BackgroundIntense",
"Color0Intense",
"Color1Intense",
"Color2Intense",
"Color3Intense",
"Color4Intense",
"Color5Intense",
"Color6Intense",
"Color7Intense"
};
// dummy silently comment out the tr_NOOP
#define tr_NOOP
const char* const ColorScheme::translatedColorNames[TABLE_COLORS] =
{
tr_NOOP("Foreground"),
tr_NOOP("Background"),
tr_NOOP("Color 1"),
tr_NOOP("Color 2"),
tr_NOOP("Color 3"),
tr_NOOP("Color 4"),
tr_NOOP("Color 5"),
tr_NOOP("Color 6"),
tr_NOOP("Color 7"),
tr_NOOP("Color 8"),
tr_NOOP("Foreground (Intense)"),
tr_NOOP("Background (Intense)"),
tr_NOOP("Color 1 (Intense)"),
tr_NOOP("Color 2 (Intense)"),
tr_NOOP("Color 3 (Intense)"),
tr_NOOP("Color 4 (Intense)"),
tr_NOOP("Color 5 (Intense)"),
tr_NOOP("Color 6 (Intense)"),
tr_NOOP("Color 7 (Intense)"),
tr_NOOP("Color 8 (Intense)")
};
ColorScheme::ColorScheme()
{
_table = nullptr;
_randomTable = nullptr;
_opacity = 1.0;
}
ColorScheme::ColorScheme(const ColorScheme& other)
: _opacity(other._opacity)
,_table(nullptr)
,_randomTable(nullptr)
{
setName(other.name());
setDescription(other.description());
if ( other._table != nullptr )
{
for ( int i = 0 ; i < TABLE_COLORS ; i++ )
setColorTableEntry(i,other._table[i]);
}
if ( other._randomTable != nullptr )
{
for ( int i = 0 ; i < TABLE_COLORS ; i++ )
{
const RandomizationRange& range = other._randomTable[i];
setRandomizationRange(i,range.hue,range.saturation,range.value);
}
}
}
ColorScheme::~ColorScheme()
{
delete[] _table;
delete[] _randomTable;
}
void ColorScheme::setDescription(const QString& description) { _description = description; }
QString ColorScheme::description() const { return _description; }
void ColorScheme::setName(const QString& name) { _name = name; }
QString ColorScheme::name() const { return _name; }
void ColorScheme::setColorTableEntry(int index , const ColorEntry& entry)
{
Q_ASSERT( index >= 0 && index < TABLE_COLORS );
if ( !_table )
{
_table = new ColorEntry[TABLE_COLORS];
for (int i=0;i<TABLE_COLORS;i++)
_table[i] = defaultTable[i];
}
_table[index] = entry;
}
ColorEntry ColorScheme::colorEntry(int index) const
{
Q_ASSERT( index >= 0 && index < TABLE_COLORS );
ColorEntry entry = colorTable()[index];
if ( _randomTable != nullptr &&
!_randomTable[index].isNull() )
{
const RandomizationRange& range = _randomTable[index];
int hueDifference = range.hue ? QRandomGenerator::global()->bounded(range.hue) - range.hue/2 : 0;
int saturationDifference = range.saturation ? QRandomGenerator::global()->bounded(range.saturation) - range.saturation/2 : 0;
int valueDifference = range.value ? QRandomGenerator::global()->bounded(range.value) - range.value/2 : 0;
QColor& color = entry.color;
int newHue = qAbs( (color.hue() + hueDifference) % MAX_HUE );
int newValue = qMin( qAbs(color.value() + valueDifference) , 255 );
int newSaturation = qMin( qAbs(color.saturation() + saturationDifference) , 255 );
color.setHsv(newHue,newSaturation,newValue);
}
return entry;
}
void ColorScheme::getColorTable(ColorEntry* table) const
{
for ( int i = 0 ; i < TABLE_COLORS ; i++ )
table[i] = colorEntry(i);
}
bool ColorScheme::randomizedBackgroundColor() const
{
return _randomTable == nullptr ? false : !_randomTable[1].isNull();
}
void ColorScheme::setRandomizedBackgroundColor(bool randomize)
{
// the hue of the background colour is allowed to be randomly
// adjusted as much as possible.
//
// the value and saturation are left alone to maintain read-ability
if ( randomize )
{
setRandomizationRange( 1 /* background color index */ , MAX_HUE , 255 , 0 );
}
else
{
if ( _randomTable )
setRandomizationRange( 1 /* background color index */ , 0 , 0 , 0 );
}
}
void ColorScheme::setRandomizationRange( int index , quint16 hue , quint8 saturation ,
quint8 value )
{
Q_ASSERT( hue <= MAX_HUE );
Q_ASSERT( index >= 0 && index < TABLE_COLORS );
if ( _randomTable == nullptr )
_randomTable = new RandomizationRange[TABLE_COLORS];
_randomTable[index].hue = hue;
_randomTable[index].value = value;
_randomTable[index].saturation = saturation;
}
const ColorEntry* ColorScheme::colorTable() const
{
if ( _table )
return _table;
else
return defaultTable;
}
QColor ColorScheme::foregroundColor() const
{
return colorTable()[0].color;
}
QColor ColorScheme::backgroundColor() const
{
return colorTable()[1].color;
}
bool ColorScheme::hasDarkBackground() const
{
// value can range from 0 - 255, with larger values indicating higher brightness.
// so 127 is in the middle, anything less is deemed 'dark'
return backgroundColor().value() < 127;
}
void ColorScheme::setOpacity(qreal opacity) { _opacity = opacity; }
qreal ColorScheme::opacity() const { return _opacity; }
void ColorScheme::read(const QString & fileName)
{
QSettings s(fileName, QSettings::IniFormat);
s.beginGroup(QLatin1String("General"));
_description = s.value(QLatin1String("Description"), QObject::tr("Un-named Color Scheme")).toString();
_opacity = s.value(QLatin1String("Opacity"),qreal(1.0)).toDouble();
s.endGroup();
for (int i=0 ; i < TABLE_COLORS ; i++)
{
readColorEntry(&s, i);
}
}
#if 0
// implemented upstream - user apps
void ColorScheme::read(KConfig& config)
{
KConfigGroup configGroup = config.group("General");
QString description = configGroup.readEntry("Description", QObject::tr("Un-named Color Scheme"));
_description = tr(description.toUtf8());
_opacity = configGroup.readEntry("Opacity",qreal(1.0));
for (int i=0 ; i < TABLE_COLORS ; i++)
{
readColorEntry(config,i);
}
}
void ColorScheme::write(KConfig& config) const
{
KConfigGroup configGroup = config.group("General");
configGroup.writeEntry("Description",_description);
configGroup.writeEntry("Opacity",_opacity);
for (int i=0 ; i < TABLE_COLORS ; i++)
{
RandomizationRange random = _randomTable != 0 ? _randomTable[i] : RandomizationRange();
writeColorEntry(config,colorNameForIndex(i),colorTable()[i],random);
}
}
#endif
QString ColorScheme::colorNameForIndex(int index)
{
Q_ASSERT( index >= 0 && index < TABLE_COLORS );
return QString::fromLatin1(colorNames[index]);
}
QString ColorScheme::translatedColorNameForIndex(int index)
{
Q_ASSERT( index >= 0 && index < TABLE_COLORS );
return QString::fromLatin1(translatedColorNames[index]);
}
void ColorScheme::readColorEntry(QSettings * s , int index)
{
QString colorName = colorNameForIndex(index);
s->beginGroup(colorName);
ColorEntry entry;
QVariant colorValue = s->value(QLatin1String("Color"));
QString colorStr;
int r, g, b;
bool ok = false;
// XXX: Undocumented(?) QSettings behavior: values with commas are parsed
// as QStringList and others QString
#if QT_VERSION >= 0x060000
if (colorValue.typeId() == QMetaType::QStringList)
#else
if (colorValue.type() == QVariant::StringList)
#endif
{
QStringList rgbList = colorValue.toStringList();
colorStr = rgbList.join(QLatin1Char(','));
if (rgbList.count() == 3)
{
bool parse_ok;
ok = true;
r = rgbList[0].toInt(&parse_ok);
ok = ok && parse_ok && (r >= 0 && r <= 0xff);
g = rgbList[1].toInt(&parse_ok);
ok = ok && parse_ok && (g >= 0 && g <= 0xff);
b = rgbList[2].toInt(&parse_ok);
ok = ok && parse_ok && (b >= 0 && b <= 0xff);
}
}
else
{
colorStr = colorValue.toString();
QRegularExpression hexColorPattern(QLatin1String("^#[0-9a-f]{6}$"),
QRegularExpression::CaseInsensitiveOption);
if (hexColorPattern.match(colorStr).hasMatch())
{
// Parsing is always ok as already matched by the regexp
#if QT_VERSION >= 0x060000
r = QStringView{colorStr}.mid(1, 2).toInt(nullptr, 16);
g = QStringView{colorStr}.mid(3, 2).toInt(nullptr, 16);
b = QStringView{colorStr}.mid(5, 2).toInt(nullptr, 16);
#else
r = colorStr.midRef(1, 2).toInt(nullptr, 16);
g = colorStr.midRef(3, 2).toInt(nullptr, 16);
b = colorStr.midRef(5, 2).toInt(nullptr, 16);
#endif
ok = true;
}
}
if (!ok)
{
qWarning().nospace() << "Invalid color value " << colorStr
<< " for " << colorName << ". Fallback to black.";
r = g = b = 0;
}
entry.color = QColor(r, g, b);
entry.transparent = s->value(QLatin1String("Transparent"),false).toBool();
// Deprecated key from KDE 4.0 which set 'Bold' to true to force
// a color to be bold or false to use the current format
//
// TODO - Add a new tri-state key which allows for bold, normal or
// current format
if (s->contains(QLatin1String("Bold")))
entry.fontWeight = s->value(QLatin1String("Bold"),false).toBool() ? ColorEntry::Bold :
ColorEntry::UseCurrentFormat;
quint16 hue = s->value(QLatin1String("MaxRandomHue"),0).toInt();
quint8 value = s->value(QLatin1String("MaxRandomValue"),0).toInt();
quint8 saturation = s->value(QLatin1String("MaxRandomSaturation"),0).toInt();
setColorTableEntry( index , entry );
if ( hue != 0 || value != 0 || saturation != 0 )
setRandomizationRange( index , hue , saturation , value );
s->endGroup();
}
#if 0
// implemented upstream - user apps
void ColorScheme::writeColorEntry(KConfig& config , const QString& colorName, const ColorEntry& entry , const RandomizationRange& random) const
{
KConfigGroup configGroup(&config,colorName);
configGroup.writeEntry("Color",entry.color);
configGroup.writeEntry("Transparency",(bool)entry.transparent);
if (entry.fontWeight != ColorEntry::UseCurrentFormat)
{
configGroup.writeEntry("Bold",entry.fontWeight == ColorEntry::Bold);
}
// record randomization if this color has randomization or
// if one of the keys already exists
if ( !random.isNull() || configGroup.hasKey("MaxRandomHue") )
{
configGroup.writeEntry("MaxRandomHue",(int)random.hue);
configGroup.writeEntry("MaxRandomValue",(int)random.value);
configGroup.writeEntry("MaxRandomSaturation",(int)random.saturation);
}
}
#endif
//
// Work In Progress - A color scheme for use on KDE setups for users
// with visual disabilities which means that they may have trouble
// reading text with the supplied color schemes.
//
// This color scheme uses only the 'safe' colors defined by the
// KColorScheme class.
//
// A complication this introduces is that each color provided by
// KColorScheme is defined as a 'background' or 'foreground' color.
// Only foreground colors are allowed to be used to render text and
// only background colors are allowed to be used for backgrounds.
//
// The ColorEntry and TerminalDisplay classes do not currently
// support this restriction.
//
// Requirements:
// - A color scheme which uses only colors from the KColorScheme class
// - Ability to restrict which colors the TerminalDisplay widget
// uses as foreground and background color
// - Make use of KGlobalSettings::allowDefaultBackgroundImages() as
// a hint to determine whether this accessible color scheme should
// be used by default.
//
//
// -- Robert Knight <robertknight@gmail.com> 21/07/2007
//
AccessibleColorScheme::AccessibleColorScheme()
: ColorScheme()
{
#if 0
// It's not finished in konsole and it breaks Qt4 compilation as well
// basic attributes
setName("accessible");
setDescription(QObject::tr("Accessible Color Scheme"));
// setup colors
const int ColorRoleCount = 8;
const KColorScheme colorScheme(QPalette::Active);
QBrush colors[ColorRoleCount] =
{
colorScheme.foreground( colorScheme.NormalText ),
colorScheme.background( colorScheme.NormalBackground ),
colorScheme.foreground( colorScheme.InactiveText ),
colorScheme.foreground( colorScheme.ActiveText ),
colorScheme.foreground( colorScheme.LinkText ),
colorScheme.foreground( colorScheme.VisitedText ),
colorScheme.foreground( colorScheme.NegativeText ),
colorScheme.foreground( colorScheme.NeutralText )
};
for ( int i = 0 ; i < TABLE_COLORS ; i++ )
{
ColorEntry entry;
entry.color = colors[ i % ColorRoleCount ].color();
setColorTableEntry( i , entry );
}
#endif
}
ColorSchemeManager::ColorSchemeManager()
: _haveLoadedAll(false)
{
}
ColorSchemeManager::~ColorSchemeManager()
{
QHashIterator<QString,const ColorScheme*> iter(_colorSchemes);
while (iter.hasNext())
{
iter.next();
delete iter.value();
}
}
void ColorSchemeManager::loadAllColorSchemes()
{
//qDebug() << "loadAllColorSchemes";
int failed = 0;
QList<QString> nativeColorSchemes = listColorSchemes();
QListIterator<QString> nativeIter(nativeColorSchemes);
while ( nativeIter.hasNext() )
{
if ( !loadColorScheme( nativeIter.next() ) )
failed++;
}
/*if ( failed > 0 )
qDebug() << "failed to load " << failed << " color schemes.";*/
_haveLoadedAll = true;
}
QList<const ColorScheme*> ColorSchemeManager::allColorSchemes()
{
if ( !_haveLoadedAll )
{
loadAllColorSchemes();
}
return _colorSchemes.values();
}
#if 0
void ColorSchemeManager::addColorScheme(ColorScheme* scheme)
{
_colorSchemes.insert(scheme->name(),scheme);
// save changes to disk
QString path = KGlobal::dirs()->saveLocation("data","konsole/") + scheme->name() + ".colorscheme";
KConfig config(path , KConfig::NoGlobals);
scheme->write(config);
}
#endif
bool ColorSchemeManager::loadCustomColorScheme(const QString& path)
{
if (path.endsWith(QLatin1String(".colorscheme")))
return loadColorScheme(path);
return false;
}
void ColorSchemeManager::addCustomColorSchemeDir(const QString& custom_dir)
{
add_custom_color_scheme_dir(custom_dir);
}
bool ColorSchemeManager::loadColorScheme(const QString& filePath)
{
if ( !filePath.endsWith(QLatin1String(".colorscheme")) || !QFile::exists(filePath) )
return false;
QFileInfo info(filePath);
const QString& schemeName = info.baseName();
ColorScheme* scheme = new ColorScheme();
scheme->setName(schemeName);
scheme->read(filePath);
if (scheme->name().isEmpty())
{
//qDebug() << "Color scheme in" << filePath << "does not have a valid name and was not loaded.";
delete scheme;
return false;
}
if ( !_colorSchemes.contains(schemeName) )
{
_colorSchemes.insert(schemeName,scheme);
}
else
{
/*qDebug() << "color scheme with name" << schemeName << "has already been" <<
"found, ignoring.";*/
delete scheme;
}
return true;
}
QList<QString> ColorSchemeManager::listColorSchemes()
{
QList<QString> ret;
for (const QString &scheme_dir : get_color_schemes_dirs())
{
const QString dname(scheme_dir);
QDir dir(dname);
QStringList filters;
filters << QLatin1String("*.colorscheme");
dir.setNameFilters(filters);
const QStringList list = dir.entryList(filters);
for (const QString &i : list)
ret << dname + QLatin1Char('/') + i;
}
return ret;
// return KGlobal::dirs()->findAllResources("data",
// "konsole/*.colorscheme",
// KStandardDirs::NoDuplicates);
}
const ColorScheme ColorSchemeManager::_defaultColorScheme;
const ColorScheme* ColorSchemeManager::defaultColorScheme() const
{
return &_defaultColorScheme;
}
bool ColorSchemeManager::deleteColorScheme(const QString& name)
{
Q_ASSERT( _colorSchemes.contains(name) );
// lookup the path and delete
QString path = findColorSchemePath(name);
if ( QFile::remove(path) )
{
_colorSchemes.remove(name);
return true;
}
else
{
//qDebug() << "Failed to remove color scheme -" << path;
return false;
}
}
QString ColorSchemeManager::findColorSchemePath(const QString& name) const
{
// QString path = KStandardDirs::locate("data","konsole/"+name+".colorscheme");
const QStringList dirs = get_color_schemes_dirs();
if ( dirs.isEmpty() )
return QString();
const QString dir = dirs.first();
QString path(dir + QLatin1Char('/')+ name + QLatin1String(".colorscheme"));
if ( !path.isEmpty() )
return path;
//path = KStandardDirs::locate("data","konsole/"+name+".schema");
path = dir + QLatin1Char('/')+ name + QLatin1String(".schema");
return path;
}
const ColorScheme* ColorSchemeManager::findColorScheme(const QString& name)
{
if ( name.isEmpty() )
return defaultColorScheme();
if ( _colorSchemes.contains(name) )
return _colorSchemes[name];
else
{
// look for this color scheme
QString path = findColorSchemePath(name);
if ( !path.isEmpty() && loadColorScheme(path) )
{
return findColorScheme(name);
}
//qDebug() << "Could not find color scheme - " << name;
return nullptr;
}
}
Q_GLOBAL_STATIC(ColorSchemeManager, theColorSchemeManager)
ColorSchemeManager* ColorSchemeManager::instance()
{
return theColorSchemeManager;
}

325
qtermwidget/lib/ColorScheme.h 100644
View File

@ -0,0 +1,325 @@
/*
This source file is part of Konsole, a terminal emulator.
Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
#ifndef COLORSCHEME_H
#define COLORSCHEME_H
// Qt
#include <QHash>
#include <QList>
#include <QMetaType>
#include <QIODevice>
#include <QSet>
#include <QSettings>
// Konsole
#include "CharacterColor.h"
class QIODevice;
//class KConfig;
namespace Konsole
{
/**
* Represents a color scheme for a terminal display.
*
* The color scheme includes the palette of colors used to draw the text and character backgrounds
* in the display and the opacity level of the display background.
*/
class ColorScheme
{
public:
/**
* Constructs a new color scheme which is initialised to the default color set
* for Konsole.
*/
ColorScheme();
ColorScheme(const ColorScheme& other);
~ColorScheme();
/** Sets the descriptive name of the color scheme. */
void setDescription(const QString& description);
/** Returns the descriptive name of the color scheme. */
QString description() const;
/** Sets the name of the color scheme */
void setName(const QString& name);
/** Returns the name of the color scheme */
QString name() const;
#if 0
// Implemented upstream - in user apps
/** Reads the color scheme from the specified configuration source */
void read(KConfig& config);
/** Writes the color scheme to the specified configuration source */
void write(KConfig& config) const;
#endif
void read(const QString & filename);
/** Sets a single entry within the color palette. */
void setColorTableEntry(int index , const ColorEntry& entry);
/**
* Copies the color entries which form the palette for this color scheme
* into @p table. @p table should be an array with TABLE_COLORS entries.
*
* @param table Array into which the color entries for this color scheme
* are copied.
* @param randomSeed Color schemes may allow certain colors in their
* palette to be randomized. The seed is used to pick the random color.
*/
void getColorTable(ColorEntry* table) const;
/**
* Retrieves a single color entry from the table.
*
* See getColorTable()
*/
ColorEntry colorEntry(int index) const;
/**
* Convenience method. Returns the
* foreground color for this scheme,
* this is the primary color used to draw the
* text in this scheme.
*/
QColor foregroundColor() const;
/**
* Convenience method. Returns the background color for
* this scheme, this is the primary color used to
* draw the terminal background in this scheme.
*/
QColor backgroundColor() const;
/**
* Returns true if this color scheme has a dark background.
* The background color is said to be dark if it has a value of less than 127
* in the HSV color space.
*/
bool hasDarkBackground() const;
/**
* Sets the opacity level of the display background. @p opacity ranges
* between 0 (completely transparent background) and 1 (completely
* opaque background).
*
* Defaults to 1.
*
* TODO: More documentation
*/
void setOpacity(qreal opacity);
/**
* Returns the opacity level for this color scheme, see setOpacity()
* TODO: More documentation
*/
qreal opacity() const;
/**
* Enables randomization of the background color. This will cause
* the palette returned by getColorTable() and colorEntry() to
* be adjusted depending on the value of the random seed argument
* to them.
*/
void setRandomizedBackgroundColor(bool randomize);
/** Returns true if the background color is randomized. */
bool randomizedBackgroundColor() const;
static QString colorNameForIndex(int index);
static QString translatedColorNameForIndex(int index);
private:
// specifies how much a particular color can be randomized by
class RandomizationRange
{
public:
RandomizationRange() : hue(0) , saturation(0) , value(0) {}
bool isNull() const
{
return ( hue == 0 && saturation == 0 && value == 0 );
}
quint16 hue;
quint8 saturation;
quint8 value;
};
// returns the active color table. if none has been set specifically,
// this is the default color table.
const ColorEntry* colorTable() const;
#if 0
// implemented upstream - user apps
// reads a single colour entry from a KConfig source
// and sets the palette entry at 'index' to the entry read.
void readColorEntry(KConfig& config , int index);
// writes a single colour entry to a KConfig source
void writeColorEntry(KConfig& config , const QString& colorName, const ColorEntry& entry,const RandomizationRange& range) const;
#endif
void readColorEntry(QSettings *s, int index);
// sets the amount of randomization allowed for a particular color
// in the palette. creates the randomization table if
// it does not already exist
void setRandomizationRange( int index , quint16 hue , quint8 saturation , quint8 value );
QString _description;
QString _name;
qreal _opacity;
ColorEntry* _table; // pointer to custom color table or 0 if the default
// color scheme is being used
static const quint16 MAX_HUE = 340;
RandomizationRange* _randomTable; // pointer to randomization table or 0
// if no colors in the color scheme support
// randomization
static const char* const colorNames[TABLE_COLORS];
static const char* const translatedColorNames[TABLE_COLORS];
static const ColorEntry defaultTable[]; // table of default color entries
};
/**
* A color scheme which uses colors from the standard KDE color palette.
*
* This is designed primarily for the benefit of users who are using specially
* designed colors.
*
* TODO Implement and make it the default on systems with specialized KDE
* color schemes.
*/
class AccessibleColorScheme : public ColorScheme
{
public:
AccessibleColorScheme();
};
/**
* Manages the color schemes available for use by terminal displays.
* See ColorScheme
*/
class ColorSchemeManager
{
public:
/**
* Constructs a new ColorSchemeManager and loads the list
* of available color schemes.
*
* The color schemes themselves are not loaded until they are first
* requested via a call to findColorScheme()
*/
ColorSchemeManager();
/**
* Destroys the ColorSchemeManager and saves any modified color schemes to disk.
*/
~ColorSchemeManager();
/**
* Returns the default color scheme for Konsole
*/
const ColorScheme* defaultColorScheme() const;
/**
* Returns the color scheme with the given name or 0 if no
* scheme with that name exists. If @p name is empty, the
* default color scheme is returned.
*
* The first time that a color scheme with a particular name is
* requested, the configuration information is loaded from disk.
*/
const ColorScheme* findColorScheme(const QString& name);
#if 0
/**
* Adds a new color scheme to the manager. If @p scheme has the same name as
* an existing color scheme, it replaces the existing scheme.
*
* TODO - Ensure the old color scheme gets deleted
*/
void addColorScheme(ColorScheme* scheme);
#endif
/**
* Deletes a color scheme. Returns true on successful deletion or false otherwise.
*/
bool deleteColorScheme(const QString& name);
/**
* Returns a list of the all the available color schemes.
* This may be slow when first called because all of the color
* scheme resources on disk must be located, read and parsed.
*
* Subsequent calls will be inexpensive.
*/
QList<const ColorScheme*> allColorSchemes();
/** Returns the global color scheme manager instance. */
static ColorSchemeManager* instance();
/** @brief Loads a custom color scheme under given \em path.
*
* The \em path may refer to either KDE 4 .colorscheme or KDE 3
* .schema file
*
* The loaded color scheme is available under the name equal to
* the base name of the \em path via the allColorSchemes() and
* findColorScheme() methods after this call if loaded successfully.
*
* @param[in] path The path to KDE 4 .colorscheme or KDE 3 .schema.
* @return Whether the color scheme is loaded successfully.
*/
bool loadCustomColorScheme(const QString& path);
/**
* @brief Allows to add a custom location of color schemes.
*
* @param[in] custom_dir Custom location of color schemes (must end with /).
*/
void addCustomColorSchemeDir(const QString& custom_dir);
private:
// loads a color scheme from a KDE 4+ .colorscheme file
bool loadColorScheme(const QString& path);
// returns a list of paths of color schemes in the KDE 4+ .colorscheme file format
QList<QString> listColorSchemes();
// loads all of the color schemes
void loadAllColorSchemes();
// finds the path of a color scheme
QString findColorSchemePath(const QString& name) const;
QHash<QString,const ColorScheme*> _colorSchemes;
QSet<ColorScheme*> _modifiedSchemes;
bool _haveLoadedAll;
static const ColorScheme _defaultColorScheme;
};
}
Q_DECLARE_METATYPE(const Konsole::ColorScheme*)
#endif //COLORSCHEME_H

55
qtermwidget/lib/ColorTables.h 100644
View File

@ -0,0 +1,55 @@
#ifndef _COLOR_TABLE_H
#define _COLOR_TABLE_H
#include "CharacterColor.h"
//using namespace Konsole;
#if 0
static const ColorEntry whiteonblack_color_table[TABLE_COLORS] = {
// normal
ColorEntry(QColor(0xFF,0xFF,0xFF), false ), ColorEntry( QColor(0x00,0x00,0x00), true ), // Dfore, Dback
ColorEntry(QColor(0x00,0x00,0x00), false ), ColorEntry( QColor(0xB2,0x18,0x18), false ), // Black, Red
ColorEntry(QColor(0x18,0xB2,0x18), false ), ColorEntry( QColor(0xB2,0x68,0x18), false ), // Green, Yellow
ColorEntry(QColor(0x18,0x18,0xB2), false ), ColorEntry( QColor(0xB2,0x18,0xB2), false ), // Blue, Magenta
ColorEntry(QColor(0x18,0xB2,0xB2), false ), ColorEntry( QColor(0xB2,0xB2,0xB2), false ), // Cyan, White
// intensiv
ColorEntry(QColor(0x00,0x00,0x00), false ), ColorEntry( QColor(0xFF,0xFF,0xFF), true ),
ColorEntry(QColor(0x68,0x68,0x68), false ), ColorEntry( QColor(0xFF,0x54,0x54), false ),
ColorEntry(QColor(0x54,0xFF,0x54), false ), ColorEntry( QColor(0xFF,0xFF,0x54), false ),
ColorEntry(QColor(0x54,0x54,0xFF), false ), ColorEntry( QColor(0xFF,0x54,0xFF), false ),
ColorEntry(QColor(0x54,0xFF,0xFF), false ), ColorEntry( QColor(0xFF,0xFF,0xFF), false )
};
static const ColorEntry greenonblack_color_table[TABLE_COLORS] = {
ColorEntry(QColor( 24, 240, 24), false), ColorEntry(QColor( 0, 0, 0), true),
ColorEntry(QColor( 0, 0, 0), false), ColorEntry(QColor( 178, 24, 24), false),
ColorEntry(QColor( 24, 178, 24), false), ColorEntry(QColor( 178, 104, 24), false),
ColorEntry(QColor( 24, 24, 178), false), ColorEntry(QColor( 178, 24, 178), false),
ColorEntry(QColor( 24, 178, 178), false), ColorEntry(QColor( 178, 178, 178), false),
// intensive colors
ColorEntry(QColor( 24, 240, 24), false ), ColorEntry(QColor( 0, 0, 0), true ),
ColorEntry(QColor( 104, 104, 104), false ), ColorEntry(QColor( 255, 84, 84), false ),
ColorEntry(QColor( 84, 255, 84), false ), ColorEntry(QColor( 255, 255, 84), false ),
ColorEntry(QColor( 84, 84, 255), false ), ColorEntry(QColor( 255, 84, 255), false ),
ColorEntry(QColor( 84, 255, 255), false ), ColorEntry(QColor( 255, 255, 255), false )
};
static const ColorEntry blackonlightyellow_color_table[TABLE_COLORS] = {
ColorEntry(QColor( 0, 0, 0), false), ColorEntry(QColor( 255, 255, 221), true),
ColorEntry(QColor( 0, 0, 0), false), ColorEntry(QColor( 178, 24, 24), false),
ColorEntry(QColor( 24, 178, 24), false), ColorEntry(QColor( 178, 104, 24), false),
ColorEntry(QColor( 24, 24, 178), false), ColorEntry(QColor( 178, 24, 178), false),
ColorEntry(QColor( 24, 178, 178), false), ColorEntry(QColor( 178, 178, 178), false),
ColorEntry(QColor( 0, 0, 0), false), ColorEntry(QColor( 255, 255, 221), true),
ColorEntry(QColor(104, 104, 104), false), ColorEntry(QColor( 255, 84, 84), false),
ColorEntry(QColor( 84, 255, 84), false), ColorEntry(QColor( 255, 255, 84), false),
ColorEntry(QColor( 84, 84, 255), false), ColorEntry(QColor( 255, 84, 255), false),
ColorEntry(QColor( 84, 255, 255), false), ColorEntry(QColor( 255, 255, 255), false)
};
#endif
#endif

0
qtermwidget/src/DefaultTranslatorText.h → qtermwidget/lib/DefaultTranslatorText.h
View File

330
qtermwidget/src/Emulation.cpp → qtermwidget/lib/Emulation.cpp
View File

@ -1,11 +1,7 @@
/* /*
This file is part of Konsole, an X terminal. Copyright 2007-2008 Robert Knight <robertknight@gmail.com>
Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Copyright (C) 2007 Robert Knight <robertknight@gmail.com> Copyright 1996 by Matthias Ettrich <ettrich@kde.org>
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Copyright (C) 1996 by Matthias Ettrich <ettrich@kde.org>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -27,21 +23,31 @@
#include "Emulation.h" #include "Emulation.h"
// System // System
#include <assert.h> #include <cstdio>
#include <stdio.h> #include <cstdlib>
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string>
// Qt // Qt
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QClipboard> #include <QClipboard>
#include <QtCore/QHash> #include <QHash>
#include <QtGui/QKeyEvent> #include <QKeyEvent>
#include <QtCore/QRegExp> #if QT_VERSION >= 0x060000
#include <QtCore/QTextStream> #include <QRegularExpression>
#include <QtCore/QThread> #include <QtCore5Compat/QTextDecoder>
#else
#include <QRegExp>
#endif
#include <QTextStream>
#include <QThread>
#include <QtCore/QTime> #include <QTime>
//TODO REMOVE THIS
#include <QDebug>
// KDE
//#include <kdebug.h>
// Konsole // Konsole
#include "KeyboardTranslator.h" #include "KeyboardTranslator.h"
@ -51,25 +57,14 @@
using namespace Konsole; using namespace Konsole;
/* ------------------------------------------------------------------------- */
/* */
/* Emulation */
/* */
/* ------------------------------------------------------------------------- */
//#define CNTL(c) ((c)-'@')
/*!
*/
Emulation::Emulation() : Emulation::Emulation() :
_currentScreen(0), _currentScreen(nullptr),
_codec(0), _codec(nullptr),
_decoder(0), _decoder(nullptr),
_keyTranslator(0), _keyTranslator(nullptr),
_usesMouse(false) _usesMouse(false),
_bracketedPasteMode(false)
{ {
// create screens with a default size // create screens with a default size
_screen[0] = new Screen(40,80); _screen[0] = new Screen(40,80);
_screen[1] = new Screen(40,80); _screen[1] = new Screen(40,80);
@ -77,10 +72,17 @@ Emulation::Emulation() :
QObject::connect(&_bulkTimer1, SIGNAL(timeout()), this, SLOT(showBulk()) ); QObject::connect(&_bulkTimer1, SIGNAL(timeout()), this, SLOT(showBulk()) );
QObject::connect(&_bulkTimer2, SIGNAL(timeout()), this, SLOT(showBulk()) ); QObject::connect(&_bulkTimer2, SIGNAL(timeout()), this, SLOT(showBulk()) );
// listen for mouse status changes // listen for mouse status changes
connect( this , SIGNAL(programUsesMouseChanged(bool)) , connect(this , SIGNAL(programUsesMouseChanged(bool)) ,
SLOT(usesMouseChanged(bool)) ); SLOT(usesMouseChanged(bool)));
connect(this , SIGNAL(programBracketedPasteModeChanged(bool)) ,
SLOT(bracketedPasteModeChanged(bool)));
connect(this, &Emulation::cursorChanged, this, [this] (KeyboardCursorShape cursorShape, bool blinkingCursorEnabled) {
emit titleChanged( 50, QString(QLatin1String("CursorShape=%1;BlinkingCursorEnabled=%2"))
.arg(static_cast<int>(cursorShape)).arg(blinkingCursorEnabled) );
});
} }
bool Emulation::programUsesMouse() const bool Emulation::programUsesMouse() const
@ -93,6 +95,16 @@ void Emulation::usesMouseChanged(bool usesMouse)
_usesMouse = usesMouse; _usesMouse = usesMouse;
} }
bool Emulation::programBracketedPasteMode() const
{
return _bracketedPasteMode;
}
void Emulation::bracketedPasteModeChanged(bool bracketedPasteMode)
{
_bracketedPasteMode = bracketedPasteMode;
}
ScreenWindow* Emulation::createWindow() ScreenWindow* Emulation::createWindow()
{ {
ScreenWindow* window = new ScreenWindow(); ScreenWindow* window = new ScreenWindow();
@ -104,12 +116,15 @@ ScreenWindow* Emulation::createWindow()
connect(this , SIGNAL(outputChanged()), connect(this , SIGNAL(outputChanged()),
window , SLOT(notifyOutputChanged()) ); window , SLOT(notifyOutputChanged()) );
connect(this, &Emulation::handleCommandFromKeyboard,
window, &ScreenWindow::handleCommandFromKeyboard);
connect(this, &Emulation::outputFromKeypressEvent,
window, &ScreenWindow::scrollToEnd);
return window; return window;
} }
/*!
*/
Emulation::~Emulation() Emulation::~Emulation()
{ {
QListIterator<ScreenWindow*> windowIter(_windows); QListIterator<ScreenWindow*> windowIter(_windows);
@ -124,23 +139,15 @@ Emulation::~Emulation()
delete _decoder; delete _decoder;
} }
/*! change between primary and alternate _screen
*/
void Emulation::setScreen(int n) void Emulation::setScreen(int n)
{ {
Screen *old = _currentScreen; Screen *old = _currentScreen;
_currentScreen = _screen[n&1]; _currentScreen = _screen[n & 1];
if (_currentScreen != old) if (_currentScreen != old)
{ {
old->setBusySelecting(false); // tell all windows onto this emulation to switch to the newly active screen
for(ScreenWindow* window : qAsConst(_windows))
// tell all windows onto this emulation to switch to the newly active _screen window->setScreen(_currentScreen);
QListIterator<ScreenWindow*> windowIter(_windows);
while ( windowIter.hasNext() )
{
windowIter.next()->setScreen(_currentScreen);
}
} }
} }
@ -155,16 +162,18 @@ void Emulation::setHistory(const HistoryType& t)
showBulk(); showBulk();
} }
const HistoryType& Emulation::history() const HistoryType& Emulation::history() const
{ {
return _screen[0]->getScroll(); return _screen[0]->getScroll();
} }
void Emulation::setCodec(const QTextCodec * qtc) void Emulation::setCodec(const QTextCodec * qtc)
{ {
Q_ASSERT( qtc ); if (qtc)
_codec = qtc;
else
setCodec(LocaleCodec);
_codec = qtc;
delete _decoder; delete _decoder;
_decoder = _codec->makeDecoder(); _decoder = _codec->makeDecoder();
@ -182,63 +191,45 @@ void Emulation::setCodec(EmulationCodec codec)
void Emulation::setKeyBindings(const QString& name) void Emulation::setKeyBindings(const QString& name)
{ {
_keyTranslator = KeyboardTranslatorManager::instance()->findTranslator(name); _keyTranslator = KeyboardTranslatorManager::instance()->findTranslator(name);
if (!_keyTranslator)
{
_keyTranslator = KeyboardTranslatorManager::instance()->defaultTranslator();
}
} }
QString Emulation::keyBindings() QString Emulation::keyBindings() const
{ {
return _keyTranslator->name(); return _keyTranslator->name();
} }
void Emulation::receiveChar(wchar_t c)
// Interpreting Codes ---------------------------------------------------------
/*
This section deals with decoding the incoming character stream.
Decoding means here, that the stream is first separated into `tokens'
which are then mapped to a `meaning' provided as operations by the
`Screen' class.
*/
/*!
*/
void Emulation::receiveChar(int c)
// process application unicode input to terminal // process application unicode input to terminal
// this is a trivial scanner // this is a trivial scanner
{ {
qDebug() << "Emulation::receiveChar: character " << c;
c &= 0xff; c &= 0xff;
qDebug() << "Emulation::receiveChar (after &=): character " << c;
switch (c) switch (c)
{ {
case '\b' : _currentScreen->BackSpace(); break; case '\b' : _currentScreen->backspace(); break;
case '\t' : _currentScreen->Tabulate(); break; case '\t' : _currentScreen->tab(); break;
case '\n' : _currentScreen->NewLine(); break; case '\n' : _currentScreen->newLine(); break;
case '\r' : _currentScreen->Return(); break; case '\r' : _currentScreen->toStartOfLine(); break;
case 0x07 : emit stateSet(NOTIFYBELL); case 0x07 : emit stateSet(NOTIFYBELL);
break; break;
default : _currentScreen->ShowCharacter(c); break; default : _currentScreen->displayCharacter(c); break;
}; };
} }
/* ------------------------------------------------------------------------- */ void Emulation::sendKeyEvent(QKeyEvent* ev, bool)
/* */
/* Keyboard Handling */
/* */
/* ------------------------------------------------------------------------- */
/*!
*/
void Emulation::sendKeyEvent( QKeyEvent* ev )
{ {
emit stateSet(NOTIFYNORMAL); emit stateSet(NOTIFYNORMAL);
if (!ev->text().isEmpty()) if (!ev->text().isEmpty())
{ // A block of text { // A block of text
// Note that the text is proper unicode. // Note that the text is proper unicode.
// We should do a conversion here, but since this // We should do a conversion here
// routine will never be used, we simply emit plain ascii. emit sendData(ev->text().toUtf8().constData(),ev->text().length());
//emit sendBlock(ev->text().toAscii(),ev->text().length());
emit sendData(ev->text().toUtf8(),ev->text().length());
} }
} }
@ -252,8 +243,6 @@ void Emulation::sendMouseEvent(int /*buttons*/, int /*column*/, int /*row*/, int
// default implementation does nothing // default implementation does nothing
} }
// Unblocking, Byte to Unicode translation --------------------------------- --
/* /*
We are doing code conversion from locale to unicode first. We are doing code conversion from locale to unicode first.
TODO: Character composition from the old code. See #96536 TODO: Character composition from the old code. See #96536
@ -261,46 +250,50 @@ TODO: Character composition from the old code. See #96536
void Emulation::receiveData(const char* text, int length) void Emulation::receiveData(const char* text, int length)
{ {
emit stateSet(NOTIFYACTIVITY); emit stateSet(NOTIFYACTIVITY);
bufferedUpdate(); bufferedUpdate();
QString unicodeText = _decoder->toUnicode(text,length);
//send characters to terminal emulator /* XXX: the following code involves encoding & decoding of "UTF-16
for (int i=0;i<unicodeText.length();i++) * surrogate pairs", which does not work with characters higher than
{ * U+10FFFF
receiveChar(unicodeText[i].unicode()); * https://unicodebook.readthedocs.io/unicode_encodings.html#surrogates
} */
QString utf16Text = _decoder->toUnicode(text,length);
std::wstring unicodeText = utf16Text.toStdWString();
//look for z-modem indicator //send characters to terminal emulator
//-- someone who understands more about z-modems that I do may be able to move for (size_t i=0;i<unicodeText.length();i++)
//this check into the above for loop? receiveChar(unicodeText[i]);
for (int i=0;i<length;i++)
{ //look for z-modem indicator
if (text[i] == '\030') //-- someone who understands more about z-modems that I do may be able to move
{ //this check into the above for loop?
if ((length-i-1 > 3) && (strncmp(text+i+1, "B00", 3) == 0)) for (int i=0;i<length;i++)
emit zmodemDetected(); {
} if (text[i] == '\030')
} {
if ((length-i-1 > 3) && (strncmp(text+i+1, "B00", 3) == 0))
emit zmodemDetected();
}
}
} }
//OLDER VERSION //OLDER VERSION
//This version of onRcvBlock was commented out because //This version of onRcvBlock was commented out because
// a) It decoded incoming characters one-by-one, which is slow in the current version of Qt (4.2 tech preview) // a) It decoded incoming characters one-by-one, which is slow in the current version of Qt (4.2 tech preview)
// b) It messed up decoding of non-ASCII characters, with the result that (for example) chinese characters // b) It messed up decoding of non-ASCII characters, with the result that (for example) chinese characters
// were not printed properly. // were not printed properly.
// //
//There is something about stopping the _decoder if "we get a control code halfway a multi-byte sequence" (see below) //There is something about stopping the _decoder if "we get a control code halfway a multi-byte sequence" (see below)
//which hasn't been ported into the newer function (above). Hopefully someone who understands this better //which hasn't been ported into the newer function (above). Hopefully someone who understands this better
//can find an alternative way of handling the check. //can find an alternative way of handling the check.
/*void Emulation::onRcvBlock(const char *s, int len) /*void Emulation::onRcvBlock(const char *s, int len)
{ {
emit notifySessionState(NOTIFYACTIVITY); emit notifySessionState(NOTIFYACTIVITY);
bufferedUpdate(); bufferedUpdate();
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
{ {
@ -330,72 +323,27 @@ void Emulation::receiveData(const char* text, int length)
if (s[i] == '\030') if (s[i] == '\030')
{ {
if ((len-i-1 > 3) && (strncmp(s+i+1, "B00", 3) == 0)) if ((len-i-1 > 3) && (strncmp(s+i+1, "B00", 3) == 0))
emit zmodemDetected(); emit zmodemDetected();
} }
} }
}*/ }*/
// Selection --------------------------------------------------------------- -- void Emulation::writeToStream( TerminalCharacterDecoder* _decoder ,
#if 0
void Emulation::onSelectionBegin(const int x, const int y, const bool columnmode) {
if (!connected) return;
_currentScreen->setSelectionStart( x,y,columnmode);
showBulk();
}
void Emulation::onSelectionExtend(const int x, const int y) {
if (!connected) return;
_currentScreen->setSelectionEnd(x,y);
showBulk();
}
void Emulation::setSelection(const bool preserve_line_breaks) {
if (!connected) return;
QString t = _currentScreen->selectedText(preserve_line_breaks);
if (!t.isNull())
{
QListIterator< TerminalDisplay* > viewIter(_views);
while (viewIter.hasNext())
viewIter.next()->setSelection(t);
}
}
void Emulation::testIsSelected(const int x, const int y, bool &selected)
{
if (!connected) return;
selected=_currentScreen->isSelected(x,y);
}
void Emulation::clearSelection() {
if (!connected) return;
_currentScreen->clearSelection();
showBulk();
}
#endif
void Emulation::writeToStream( TerminalCharacterDecoder* _decoder ,
int startLine , int startLine ,
int endLine) int endLine)
{ {
_currentScreen->writeToStream(_decoder,startLine,endLine); _currentScreen->writeLinesToStream(_decoder,startLine,endLine);
} }
int Emulation::lineCount() int Emulation::lineCount() const
{ {
// sum number of lines currently on _screen plus number of lines in history // sum number of lines currently on _screen plus number of lines in history
return _currentScreen->getLines() + _currentScreen->getHistLines(); return _currentScreen->getLines() + _currentScreen->getHistLines();
} }
// Refreshing -------------------------------------------------------------- --
#define BULK_TIMEOUT1 10 #define BULK_TIMEOUT1 10
#define BULK_TIMEOUT2 40 #define BULK_TIMEOUT2 40
/*!
*/
void Emulation::showBulk() void Emulation::showBulk()
{ {
_bulkTimer1.stop(); _bulkTimer1.stop();
@ -418,16 +366,24 @@ void Emulation::bufferedUpdate()
} }
} }
char Emulation::getErase() const char Emulation::eraseChar() const
{ {
return '\b'; return '\b';
} }
void Emulation::setImageSize(int lines, int columns) void Emulation::setImageSize(int lines, int columns)
{ {
//kDebug() << "Resizing image to: " << lines << "by" << columns << QTime::currentTime().msec(); if ((lines < 1) || (columns < 1))
Q_ASSERT( lines > 0 ); return;
Q_ASSERT( columns > 0 );
QSize screenSize[2] = { QSize(_screen[0]->getColumns(),
_screen[0]->getLines()),
QSize(_screen[1]->getColumns(),
_screen[1]->getLines()) };
QSize newSize(columns,lines);
if (newSize == screenSize[0] && newSize == screenSize[1])
return;
_screen[0]->resizeImage(lines,columns); _screen[0]->resizeImage(lines,columns);
_screen[1]->resizeImage(lines,columns); _screen[1]->resizeImage(lines,columns);
@ -437,9 +393,9 @@ void Emulation::setImageSize(int lines, int columns)
bufferedUpdate(); bufferedUpdate();
} }
QSize Emulation::imageSize() QSize Emulation::imageSize() const
{ {
return QSize(_currentScreen->getColumns(), _currentScreen->getLines()); return {_currentScreen->getColumns(), _currentScreen->getLines()};
} }
ushort ExtendedCharTable::extendedCharHash(ushort* unicodePoints , ushort length) const ushort ExtendedCharTable::extendedCharHash(ushort* unicodePoints , ushort length) const
@ -455,17 +411,17 @@ bool ExtendedCharTable::extendedCharMatch(ushort hash , ushort* unicodePoints ,
{ {
ushort* entry = extendedCharTable[hash]; ushort* entry = extendedCharTable[hash];
// compare given length with stored sequence length ( given as the first ushort in the // compare given length with stored sequence length ( given as the first ushort in the
// stored buffer ) // stored buffer )
if ( entry == 0 || entry[0] != length ) if ( entry == nullptr || entry[0] != length )
return false; return false;
// if the lengths match, each character must be checked. the stored buffer starts at // if the lengths match, each character must be checked. the stored buffer starts at
// entry[1] // entry[1]
for ( int i = 0 ; i < length ; i++ ) for ( int i = 0 ; i < length ; i++ )
{ {
if ( entry[i+1] != unicodePoints[i] ) if ( entry[i+1] != unicodePoints[i] )
return false; return false;
} }
return true; return true;
} }
ushort ExtendedCharTable::createExtendedChar(ushort* unicodePoints , ushort length) ushort ExtendedCharTable::createExtendedChar(ushort* unicodePoints , ushort length)
@ -478,7 +434,7 @@ ushort ExtendedCharTable::createExtendedChar(ushort* unicodePoints , ushort leng
{ {
if ( extendedCharMatch(hash,unicodePoints,length) ) if ( extendedCharMatch(hash,unicodePoints,length) )
{ {
// this sequence already has an entry in the table, // this sequence already has an entry in the table,
// return its hash // return its hash
return hash; return hash;
} }
@ -488,16 +444,16 @@ ushort ExtendedCharTable::createExtendedChar(ushort* unicodePoints , ushort leng
// points then try next hash // points then try next hash
hash++; hash++;
} }
} }
// add the new sequence to the table and // add the new sequence to the table and
// return that index // return that index
ushort* buffer = new ushort[length+1]; ushort* buffer = new ushort[length+1];
buffer[0] = length; buffer[0] = length;
for ( int i = 0 ; i < length ; i++ ) for ( int i = 0 ; i < length ; i++ )
buffer[i+1] = unicodePoints[i]; buffer[i+1] = unicodePoints[i];
extendedCharTable.insert(hash,buffer); extendedCharTable.insert(hash,buffer);
return hash; return hash;
@ -517,7 +473,7 @@ ushort* ExtendedCharTable::lookupExtendedChar(ushort hash , ushort& length) cons
else else
{ {
length = 0; length = 0;
return 0; return nullptr;
} }
} }
@ -539,5 +495,5 @@ ExtendedCharTable::~ExtendedCharTable()
ExtendedCharTable ExtendedCharTable::instance; ExtendedCharTable ExtendedCharTable::instance;
//#include "moc_Emulation.cpp" //#include "Emulation.moc"

305
qtermwidget/src/Emulation.h → qtermwidget/lib/Emulation.h
View File

@ -1,10 +1,8 @@
/* /*
This file is part of Konsole, an X terminal. This file is part of Konsole, an X terminal.
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com>
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008 Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -26,75 +24,80 @@
#define EMULATION_H #define EMULATION_H
// System // System
#include <stdio.h> #include <cstdio>
// Qt // Qt
#include <QtGui/QKeyEvent> #include <QKeyEvent>
//#include <QPointer> //#include <QPointer>
#include <QtCore/QTextCodec> #if QT_VERSION >= 0x060000
#include <QtCore/QTextStream> #include <QtCore5Compat/QTextCodec>
#include <QtCore/QTimer> #else
#include <QTextCodec>
#endif
#include <QTextStream>
#include <QTimer>
#include "qtermwidget_export.h"
#include "KeyboardTranslator.h"
namespace Konsole namespace Konsole
{ {
class KeyboardTranslator;
class HistoryType; class HistoryType;
class Screen; class Screen;
class ScreenWindow; class ScreenWindow;
class TerminalCharacterDecoder; class TerminalCharacterDecoder;
/** /**
* This enum describes the available states which * This enum describes the available states which
* the terminal emulation may be set to. * the terminal emulation may be set to.
* *
* These are the values used by Emulation::stateChanged() * These are the values used by Emulation::stateChanged()
*/ */
enum enum
{ {
/** The emulation is currently receiving user input. */ /** The emulation is currently receiving user input. */
NOTIFYNORMAL=0, NOTIFYNORMAL=0,
/** /**
* The terminal program has triggered a bell event * The terminal program has triggered a bell event
* to get the user's attention. * to get the user's attention.
*/ */
NOTIFYBELL=1, NOTIFYBELL=1,
/** /**
* The emulation is currently receiving data from its * The emulation is currently receiving data from its
* terminal input. * terminal input.
*/ */
NOTIFYACTIVITY=2, NOTIFYACTIVITY=2,
// unused here? // unused here?
NOTIFYSILENCE=3 NOTIFYSILENCE=3
}; };
/** /**
* Base class for terminal emulation back-ends. * Base class for terminal emulation back-ends.
* *
* The back-end is responsible for decoding an incoming character stream and * The back-end is responsible for decoding an incoming character stream and
* producing an output image of characters. * producing an output image of characters.
* *
* When input from the terminal is received, the receiveData() slot should be called with * When input from the terminal is received, the receiveData() slot should be called with
* the data which has arrived. The emulation will process the data and update the * the data which has arrived. The emulation will process the data and update the
* screen image accordingly. The codec used to decode the incoming character stream * screen image accordingly. The codec used to decode the incoming character stream
* into the unicode characters used internally can be specified using setCodec() * into the unicode characters used internally can be specified using setCodec()
* *
* The size of the screen image can be specified by calling setImageSize() with the * The size of the screen image can be specified by calling setImageSize() with the
* desired number of lines and columns. When new lines are added, old content * desired number of lines and columns. When new lines are added, old content
* is moved into a history store, which can be set by calling setHistory(). * is moved into a history store, which can be set by calling setHistory().
* *
* The screen image can be accessed by creating a ScreenWindow onto this emulation * The screen image can be accessed by creating a ScreenWindow onto this emulation
* by calling createWindow(). Screen windows provide access to a section of the * by calling createWindow(). Screen windows provide access to a section of the
* output. Each screen window covers the same number of lines and columns as the * output. Each screen window covers the same number of lines and columns as the
* image size returned by imageSize(). The screen window can be moved up and down * image size returned by imageSize(). The screen window can be moved up and down
* and provides transparent access to both the current on-screen image and the * and provides transparent access to both the current on-screen image and the
* previous output. The screen windows emit an outputChanged signal * previous output. The screen windows emit an outputChanged signal
* when the section of the image they are looking at changes. * when the section of the image they are looking at changes.
* Graphical views can then render the contents of a screen window, listening for notifications * Graphical views can then render the contents of a screen window, listening for notifications
* of output changes from the screen window which they are associated with and updating * of output changes from the screen window which they are associated with and updating
* accordingly. * accordingly.
* *
* The emulation also is also responsible for converting input from the connected views such * The emulation also is also responsible for converting input from the connected views such
* as keypresses and mouse activity into a character string which can be sent * as keypresses and mouse activity into a character string which can be sent
@ -107,9 +110,9 @@ enum
* character sequences. The name of the key bindings set used can be specified using * character sequences. The name of the key bindings set used can be specified using
* setKeyBindings() * setKeyBindings()
* *
* The emulation maintains certain state information which changes depending on the * The emulation maintains certain state information which changes depending on the
* input received. The emulation can be reset back to its starting state by calling * input received. The emulation can be reset back to its starting state by calling
* reset(). * reset().
* *
* The emulation also maintains an activity state, which specifies whether * The emulation also maintains an activity state, which specifies whether
* terminal is currently active ( when data is received ), normal * terminal is currently active ( when data is received ), normal
@ -119,15 +122,35 @@ enum
* how long the emulation has been active/idle for and also respond to * how long the emulation has been active/idle for and also respond to
* a 'bell' event in different ways. * a 'bell' event in different ways.
*/ */
class Emulation : public QObject class QTERMWIDGET_EXPORT Emulation : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
/** Constructs a new terminal emulation */ /**
* This enum describes the available shapes for the keyboard cursor.
* See setKeyboardCursorShape()
*/
enum class KeyboardCursorShape {
/** A rectangular block which covers the entire area of the cursor character. */
BlockCursor = 0,
/**
* A single flat line which occupies the space at the bottom of the cursor
* character's area.
*/
UnderlineCursor = 1,
/**
* An cursor shaped like the capital letter 'I', similar to the IBeam
* cursor used in Qt/KDE text editors.
*/
IBeamCursor = 2
};
/** Constructs a new terminal emulation */
Emulation(); Emulation();
~Emulation(); ~Emulation() override;
/** /**
* Creates a new window onto the output from this emulation. The contents * Creates a new window onto the output from this emulation. The contents
@ -137,70 +160,70 @@ public:
ScreenWindow* createWindow(); ScreenWindow* createWindow();
/** Returns the size of the screen image which the emulation produces */ /** Returns the size of the screen image which the emulation produces */
QSize imageSize(); QSize imageSize() const;
/** /**
* Returns the total number of lines, including those stored in the history. * Returns the total number of lines, including those stored in the history.
*/ */
int lineCount(); int lineCount() const;
/**
/**
* Sets the history store used by this emulation. When new lines * Sets the history store used by this emulation. When new lines
* are added to the output, older lines at the top of the screen are transferred to a history * are added to the output, older lines at the top of the screen are transferred to a history
* store. * store.
* *
* The number of lines which are kept and the storage location depend on the * The number of lines which are kept and the storage location depend on the
* type of store. * type of store.
*/ */
void setHistory(const HistoryType&); void setHistory(const HistoryType&);
/** Returns the history store used by this emulation. See setHistory() */ /** Returns the history store used by this emulation. See setHistory() */
const HistoryType& history(); const HistoryType& history() const;
/** Clears the history scroll. */ /** Clears the history scroll. */
void clearHistory(); void clearHistory();
/** /**
* Copies the output history from @p startLine to @p endLine * Copies the output history from @p startLine to @p endLine
* into @p stream, using @p decoder to convert the terminal * into @p stream, using @p decoder to convert the terminal
* characters into text. * characters into text.
* *
* @param decoder A decoder which converts lines of terminal characters with * @param decoder A decoder which converts lines of terminal characters with
* appearance attributes into output text. PlainTextDecoder is the most commonly * appearance attributes into output text. PlainTextDecoder is the most commonly
* used decoder. * used decoder.
* @param startLine The first * @param startLine Index of first line to copy
* @param endLine Index of last line to copy
*/ */
virtual void writeToStream(TerminalCharacterDecoder* decoder,int startLine,int endLine); virtual void writeToStream(TerminalCharacterDecoder* decoder,int startLine,int endLine);
/** Returns the codec used to decode incoming characters. See setCodec() */ /** Returns the codec used to decode incoming characters. See setCodec() */
const QTextCodec* codec() { return _codec; } const QTextCodec* codec() const { return _codec; }
/** Sets the codec used to decode incoming characters. */ /** Sets the codec used to decode incoming characters. */
void setCodec(const QTextCodec*); void setCodec(const QTextCodec*);
/** /**
* Convenience method. * Convenience method.
* Returns true if the current codec used to decode incoming * Returns true if the current codec used to decode incoming
* characters is UTF-8 * characters is UTF-8
*/ */
bool utf8() { Q_ASSERT(_codec); return _codec->mibEnum() == 106; } bool utf8() const
{ Q_ASSERT(_codec); return _codec->mibEnum() == 106; }
/** TODO Document me */ /** TODO Document me */
virtual char getErase() const; virtual char eraseChar() const;
/** /**
* Sets the key bindings used to key events * Sets the key bindings used to key events
* ( received through sendKeyEvent() ) into character * ( received through sendKeyEvent() ) into character
* streams to send to the terminal. * streams to send to the terminal.
*/ */
void setKeyBindings(const QString& name); void setKeyBindings(const QString& name);
/** /**
* Returns the name of the emulation's current key bindings. * Returns the name of the emulation's current key bindings.
* See setKeyBindings() * See setKeyBindings()
*/ */
QString keyBindings(); QString keyBindings() const;
/** /**
* Copies the current image into the history and clears the screen. * Copies the current image into the history and clears the screen.
*/ */
virtual void clearEntireScreen() =0; virtual void clearEntireScreen() =0;
@ -208,7 +231,7 @@ public:
/** Resets the state of the terminal. */ /** Resets the state of the terminal. */
virtual void reset() =0; virtual void reset() =0;
/** /**
* Returns true if the active terminal program wants * Returns true if the active terminal program wants
* mouse input events. * mouse input events.
* *
@ -217,42 +240,44 @@ public:
*/ */
bool programUsesMouse() const; bool programUsesMouse() const;
public slots: bool programBracketedPasteMode() const;
public slots:
/** Change the size of the emulation's image */ /** Change the size of the emulation's image */
virtual void setImageSize(int lines, int columns); virtual void setImageSize(int lines, int columns);
/** /**
* Interprets a sequence of characters and sends the result to the terminal. * Interprets a sequence of characters and sends the result to the terminal.
* This is equivalent to calling sendKeyEvent() for each character in @p text in succession. * This is equivalent to calling sendKeyEvent() for each character in @p text in succession.
*/ */
virtual void sendText(const QString& text) = 0; virtual void sendText(const QString& text) = 0;
/** /**
* Interprets a key press event and emits the sendData() signal with * Interprets a key press event and emits the sendData() signal with
* the resulting character stream. * the resulting character stream.
*/ */
virtual void sendKeyEvent(QKeyEvent*); virtual void sendKeyEvent(QKeyEvent*, bool fromPaste);
/** /**
* Converts information about a mouse event into an xterm-compatible escape * Converts information about a mouse event into an xterm-compatible escape
* sequence and emits the character sequence via sendData() * sequence and emits the character sequence via sendData()
*/ */
virtual void sendMouseEvent(int buttons, int column, int line, int eventType); virtual void sendMouseEvent(int buttons, int column, int line, int eventType);
/** /**
* Sends a string of characters to the foreground terminal process. * Sends a string of characters to the foreground terminal process.
* *
* @param string The characters to send. * @param string The characters to send.
* @param length Length of @p string or if set to a negative value, @p string will * @param length Length of @p string or if set to a negative value, @p string will
* be treated as a null-terminated string and its length will be determined automatically. * be treated as a null-terminated string and its length will be determined automatically.
*/ */
virtual void sendString(const char* string, int length = -1) = 0; virtual void sendString(const char* string, int length = -1) = 0;
/** /**
* Processes an incoming stream of characters. receiveData() decodes the incoming * Processes an incoming stream of characters. receiveData() decodes the incoming
* character buffer using the current codec(), and then calls receiveChar() for * character buffer using the current codec(), and then calls receiveChar() for
* each unicode character in the resulting buffer. * each unicode character in the resulting buffer.
* *
* receiveData() also starts a timer which causes the outputChanged() signal * receiveData() also starts a timer which causes the outputChanged() signal
* to be emitted when it expires. The timer allows multiple updates in quick * to be emitted when it expires. The timer allows multiple updates in quick
@ -265,29 +290,29 @@ public slots:
signals: signals:
/** /**
* Emitted when a buffer of data is ready to send to the * Emitted when a buffer of data is ready to send to the
* standard input of the terminal. * standard input of the terminal.
* *
* @param data The buffer of data ready to be sent * @param data The buffer of data ready to be sent
* @paran len The length of @p data in bytes * @param len The length of @p data in bytes
*/ */
void sendData(const char* data,int len); void sendData(const char* data,int len);
/** /**
* Requests that sending of input to the emulation * Requests that sending of input to the emulation
* from the terminal process be suspended or resumed. * from the terminal process be suspended or resumed.
* *
* @param suspend If true, requests that sending of * @param suspend If true, requests that sending of
* input from the terminal process' stdout be * input from the terminal process' stdout be
* suspended. Otherwise requests that sending of * suspended. Otherwise requests that sending of
* input be resumed. * input be resumed.
*/ */
void lockPtyRequest(bool suspend); void lockPtyRequest(bool suspend);
/** /**
* Requests that the pty used by the terminal process * Requests that the pty used by the terminal process
* be set to UTF 8 mode. * be set to UTF 8 mode.
* *
* TODO: More documentation * TODO: More documentation
*/ */
@ -315,7 +340,7 @@ signals:
*/ */
void changeTabTextColorRequest(int color); void changeTabTextColorRequest(int color);
/** /**
* This is emitted when the program running in the shell indicates whether or * This is emitted when the program running in the shell indicates whether or
* not it is interested in mouse events. * not it is interested in mouse events.
* *
@ -324,7 +349,9 @@ signals:
*/ */
void programUsesMouseChanged(bool usesMouse); void programUsesMouseChanged(bool usesMouse);
/** void programBracketedPasteModeChanged(bool bracketedPasteMode);
/**
* Emitted when the contents of the screen image change. * Emitted when the contents of the screen image change.
* The emulation buffers the updates from successive image changes, * The emulation buffers the updates from successive image changes,
* and only emits outputChanged() at sensible intervals when * and only emits outputChanged() at sensible intervals when
@ -334,14 +361,14 @@ signals:
* created with createWindow() to listen for this signal. * created with createWindow() to listen for this signal.
* *
* ScreenWindow objects created using createWindow() will emit their * ScreenWindow objects created using createWindow() will emit their
* own outputChanged() signal in response to this signal. * own outputChanged() signal in response to this signal.
*/ */
void outputChanged(); void outputChanged();
/** /**
* Emitted when the program running in the terminal wishes to update the * Emitted when the program running in the terminal wishes to update the
* session's title. This also allows terminal programs to customize other * session's title. This also allows terminal programs to customize other
* aspects of the terminal emulation display. * aspects of the terminal emulation display.
* *
* This signal is emitted when the escape sequence "\033]ARG;VALUE\007" * This signal is emitted when the escape sequence "\033]ARG;VALUE\007"
* is received in the input string, where ARG is a number specifying what * is received in the input string, where ARG is a number specifying what
@ -349,7 +376,7 @@ signals:
* *
* TODO: The name of this method is not very accurate since this method * TODO: The name of this method is not very accurate since this method
* is used to perform a whole range of tasks besides just setting * is used to perform a whole range of tasks besides just setting
* the user-title of the session. * the user-title of the session.
* *
* @param title Specifies what to change. * @param title Specifies what to change.
* <ul> * <ul>
@ -357,17 +384,17 @@ signals:
* <li>1 - Set window icon text to @p newTitle</li> * <li>1 - Set window icon text to @p newTitle</li>
* <li>2 - Set session title to @p newTitle</li> * <li>2 - Set session title to @p newTitle</li>
* <li>11 - Set the session's default background color to @p newTitle, * <li>11 - Set the session's default background color to @p newTitle,
* where @p newTitle can be an HTML-style string (#RRGGBB) or a named * where @p newTitle can be an HTML-style string ("#RRGGBB") or a named
* color (eg 'red', 'blue'). * color (eg 'red', 'blue').
* See http://doc.trolltech.com/4.2/qcolor.html#setNamedColor for more * See http://doc.trolltech.com/4.2/qcolor.html#setNamedColor for more
* details. * details.
* </li> * </li>
* <li>31 - Supposedly treats @p newTitle as a URL and opens it (NOT IMPLEMENTED)</li> * <li>31 - Supposedly treats @p newTitle as a URL and opens it (NOT IMPLEMENTED)</li>
* <li>32 - Sets the icon associated with the session. @p newTitle is the name * <li>32 - Sets the icon associated with the session. @p newTitle is the name
* of the icon to use, which can be the name of any icon in the current KDE icon * of the icon to use, which can be the name of any icon in the current KDE icon
* theme (eg: 'konsole', 'kate', 'folder_home')</li> * theme (eg: 'konsole', 'kate', 'folder_home')</li>
* </ul> * </ul>
* @param newTitle Specifies the new title * @param newTitle Specifies the new title
*/ */
void titleChanged(int title,const QString& newTitle); void titleChanged(int title,const QString& newTitle);
@ -378,9 +405,21 @@ signals:
*/ */
void imageSizeChanged(int lineCount , int columnCount); void imageSizeChanged(int lineCount , int columnCount);
/** /**
* Emitted when the setImageSize() is called on this emulation for
* the first time.
*/
void imageSizeInitialized();
/**
* Emitted after receiving the escape sequence which asks to change
* the terminal emulator's size
*/
void imageResizeRequest(const QSize& sizz);
/**
* Emitted when the terminal program requests to change various properties * Emitted when the terminal program requests to change various properties
* of the terminal display. * of the terminal display.
* *
* A profile change command occurs when a special escape sequence, followed * A profile change command occurs when a special escape sequence, followed
* by a string containing a series of name and value pairs is received. * by a string containing a series of name and value pairs is received.
@ -391,24 +430,43 @@ signals:
*/ */
void profileChangeCommandReceived(const QString& text); void profileChangeCommandReceived(const QString& text);
protected: /**
virtual void setMode (int mode) = 0; * Emitted when a flow control key combination ( Ctrl+S or Ctrl+Q ) is pressed.
virtual void resetMode(int mode) = 0; * @param suspendKeyPressed True if Ctrl+S was pressed to suspend output or Ctrl+Q to
* resume output.
/**
* Processes an incoming character. See receiveData()
* @p ch A unicode character code.
*/ */
virtual void receiveChar(int ch); void flowControlKeyPressed(bool suspendKeyPressed);
/** /**
* Emitted when the cursor shape or its blinking state is changed via
* DECSCUSR sequences.
*
* @param cursorShape One of 3 possible values in KeyboardCursorShape enum
* @param blinkingCursorEnabled Whether to enable blinking or not
*/
void cursorChanged(KeyboardCursorShape cursorShape, bool blinkingCursorEnabled);
void handleCommandFromKeyboard(KeyboardTranslator::Command command);
void outputFromKeypressEvent(void);
protected:
virtual void setMode(int mode) = 0;
virtual void resetMode(int mode) = 0;
/**
* Processes an incoming character. See receiveData()
* @p ch A unicode character code.
*/
virtual void receiveChar(wchar_t ch);
/**
* Sets the active screen. The terminal has two screens, primary and alternate. * Sets the active screen. The terminal has two screens, primary and alternate.
* The primary screen is used by default. When certain interactive programs such * The primary screen is used by default. When certain interactive programs such
* as Vim are run, they trigger a switch to the alternate screen. * as Vim are run, they trigger a switch to the alternate screen.
* *
* @param index 0 to switch to the primary screen, or 1 to switch to the alternate screen * @param index 0 to switch to the primary screen, or 1 to switch to the alternate screen
*/ */
void setScreen(int index); void setScreen(int index);
enum EmulationCodec enum EmulationCodec
{ {
@ -419,45 +477,46 @@ protected:
QList<ScreenWindow*> _windows; QList<ScreenWindow*> _windows;
Screen* _currentScreen; // pointer to the screen which is currently active, Screen* _currentScreen; // pointer to the screen which is currently active,
// this is one of the elements in the screen[] array // this is one of the elements in the screen[] array
Screen* _screen[2]; // 0 = primary screen ( used by most programs, including the shell Screen* _screen[2]; // 0 = primary screen ( used by most programs, including the shell
// scrollbars are enabled in this mode ) // scrollbars are enabled in this mode )
// 1 = alternate ( used by vi , emacs etc. // 1 = alternate ( used by vi , emacs etc.
// scrollbars are not enabled in this mode ) // scrollbars are not enabled in this mode )
//decodes an incoming C-style character stream into a unicode QString using //decodes an incoming C-style character stream into a unicode QString using
//the current text codec. (this allows for rendering of non-ASCII characters in text files etc.) //the current text codec. (this allows for rendering of non-ASCII characters in text files etc.)
const QTextCodec* _codec; const QTextCodec* _codec;
QTextDecoder* _decoder; QTextDecoder* _decoder;
const KeyboardTranslator* _keyTranslator; // the keyboard layout const KeyboardTranslator* _keyTranslator; // the keyboard layout
protected slots: protected slots:
/** /**
* Schedules an update of attached views. * Schedules an update of attached views.
* Repeated calls to bufferedUpdate() in close succession will result in only a single update, * Repeated calls to bufferedUpdate() in close succession will result in only a single update,
* much like the Qt buffered update of widgets. * much like the Qt buffered update of widgets.
*/ */
void bufferedUpdate(); void bufferedUpdate();
private slots: private slots:
// triggered by timer, causes the emulation to send an updated screen image to each // triggered by timer, causes the emulation to send an updated screen image to each
// view // view
void showBulk(); void showBulk();
void usesMouseChanged(bool usesMouse); void usesMouseChanged(bool usesMouse);
private: void bracketedPasteModeChanged(bool bracketedPasteMode);
private:
bool _usesMouse; bool _usesMouse;
bool _bracketedPasteMode;
QTimer _bulkTimer1; QTimer _bulkTimer1;
QTimer _bulkTimer2; QTimer _bulkTimer2;
}; };
} }

0
qtermwidget/src/ExtendedDefaultTranslator.h → qtermwidget/lib/ExtendedDefaultTranslator.h
View File

196
qtermwidget/src/Filter.cpp → qtermwidget/lib/Filter.cpp
View File

@ -1,7 +1,5 @@
/* /*
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com> Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -22,18 +20,20 @@
// Own // Own
#include "Filter.h" #include "Filter.h"
// System // System
#include <iostream> #include <iostream>
// Qt // Qt
#include <QtGui/QAction> #include <QAction>
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QClipboard> #include <QtAlgorithms>
#include <QtCore/QString> #include <QClipboard>
#include <QString>
#include <QtCore/QSharedData> #include <QTextStream>
#include <QtCore> #include <QSharedData>
#include <QFile>
#include <QDesktopServices>
#include <QUrl>
// KDE // KDE
//#include <KLocale> //#include <KLocale>
@ -41,13 +41,14 @@
// Konsole // Konsole
#include "TerminalCharacterDecoder.h" #include "TerminalCharacterDecoder.h"
#include "konsole_wcwidth.h"
using namespace Konsole; using namespace Konsole;
FilterChain::~FilterChain() FilterChain::~FilterChain()
{ {
QMutableListIterator<Filter*> iter(*this); QMutableListIterator<Filter*> iter(*this);
while ( iter.hasNext() ) while ( iter.hasNext() )
{ {
Filter* filter = iter.next(); Filter* filter = iter.next();
@ -97,13 +98,13 @@ Filter::HotSpot* FilterChain::hotSpotAt(int line , int column) const
{ {
Filter* filter = iter.next(); Filter* filter = iter.next();
Filter::HotSpot* spot = filter->hotSpotAt(line,column); Filter::HotSpot* spot = filter->hotSpotAt(line,column);
if ( spot != 0 ) if ( spot != nullptr )
{ {
return spot; return spot;
} }
} }
return 0; return nullptr;
} }
QList<Filter::HotSpot*> FilterChain::hotSpots() const QList<Filter::HotSpot*> FilterChain::hotSpots() const
@ -120,8 +121,8 @@ QList<Filter::HotSpot*> FilterChain::hotSpots() const
//QList<Filter::HotSpot*> FilterChain::hotSpotsAtLine(int line) const; //QList<Filter::HotSpot*> FilterChain::hotSpotsAtLine(int line) const;
TerminalImageFilterChain::TerminalImageFilterChain() TerminalImageFilterChain::TerminalImageFilterChain()
: _buffer(0) : _buffer(nullptr)
, _linePositions(0) , _linePositions(nullptr)
{ {
} }
@ -133,19 +134,15 @@ TerminalImageFilterChain::~TerminalImageFilterChain()
void TerminalImageFilterChain::setImage(const Character* const image , int lines , int columns, const QVector<LineProperty>& lineProperties) void TerminalImageFilterChain::setImage(const Character* const image , int lines , int columns, const QVector<LineProperty>& lineProperties)
{ {
//qDebug("%s %d", __FILE__, __LINE__);
if (empty()) if (empty())
return; return;
//qDebug("%s %d", __FILE__, __LINE__);
// reset all filters and hotspots // reset all filters and hotspots
reset(); reset();
//qDebug("%s %d", __FILE__, __LINE__);
PlainTextDecoder decoder; PlainTextDecoder decoder;
decoder.setTrailingWhitespace(false); decoder.setTrailingWhitespace(false);
//qDebug("%s %d", __FILE__, __LINE__);
// setup new shared buffers for the filters to process on // setup new shared buffers for the filters to process on
QString* newBuffer = new QString(); QString* newBuffer = new QString();
QList<int>* newLinePositions = new QList<int>(); QList<int>* newLinePositions = new QList<int>();
@ -171,34 +168,31 @@ void TerminalImageFilterChain::setImage(const Character* const image , int lines
// being treated as part of a link that occurs at the start of the next line // being treated as part of a link that occurs at the start of the next line
// //
// the downside is that links which are spread over more than one line are not // the downside is that links which are spread over more than one line are not
// highlighted. // highlighted.
// //
// TODO - Use the "line wrapped" attribute associated with lines in a // TODO - Use the "line wrapped" attribute associated with lines in a
// terminal image to avoid adding this imaginary character for wrapped // terminal image to avoid adding this imaginary character for wrapped
// lines // lines
if ( !(lineProperties.value(i,LINE_DEFAULT) & LINE_WRAPPED) ) if ( !(lineProperties.value(i,LINE_DEFAULT) & LINE_WRAPPED) )
lineStream << QChar('\n'); lineStream << QLatin1Char('\n');
} }
decoder.end(); decoder.end();
// qDebug("%s %d", __FILE__, __LINE__);
} }
Filter::Filter() : Filter::Filter() :
_linePositions(0), _linePositions(nullptr),
_buffer(0) _buffer(nullptr)
{ {
} }
Filter::~Filter() Filter::~Filter()
{ {
QListIterator<HotSpot*> iter(_hotspotList); qDeleteAll(_hotspotList);
while (iter.hasNext()) _hotspotList.clear();
{
delete iter.next();
}
} }
void Filter::reset() void Filter::reset()
{ {
qDeleteAll(_hotspotList);
_hotspots.clear(); _hotspots.clear();
_hotspotList.clear(); _hotspotList.clear();
} }
@ -217,30 +211,22 @@ void Filter::getLineColumn(int position , int& startLine , int& startColumn)
for (int i = 0 ; i < _linePositions->count() ; i++) for (int i = 0 ; i < _linePositions->count() ; i++)
{ {
//kDebug() << "line position at " << i << " = " << _linePositions[i];
int nextLine = 0; int nextLine = 0;
if ( i == _linePositions->count()-1 ) if ( i == _linePositions->count()-1 )
{
nextLine = _buffer->length() + 1; nextLine = _buffer->length() + 1;
}
else else
{
nextLine = _linePositions->value(i+1); nextLine = _linePositions->value(i+1);
}
// kDebug() << "pos - " << position << " line pos(" << i<< ") " << _linePositions->value(i) << if ( _linePositions->value(i) <= position && position < nextLine )
// " next = " << nextLine << " buffer len = " << _buffer->length();
if ( _linePositions->value(i) <= position && position < nextLine )
{ {
startLine = i; startLine = i;
startColumn = position - _linePositions->value(i); startColumn = string_width(buffer()->mid(_linePositions->value(i),position - _linePositions->value(i)).toStdWString());
return; return;
} }
} }
} }
/*void Filter::addLine(const QString& text) /*void Filter::addLine(const QString& text)
{ {
@ -262,7 +248,7 @@ void Filter::addHotSpot(HotSpot* spot)
for (int line = spot->startLine() ; line <= spot->endLine() ; line++) for (int line = spot->startLine() ; line <= spot->endLine() ; line++)
{ {
_hotspots.insert(line,spot); _hotspots.insert(line,spot);
} }
} }
QList<Filter::HotSpot*> Filter::hotSpots() const QList<Filter::HotSpot*> Filter::hotSpots() const
{ {
@ -280,16 +266,16 @@ Filter::HotSpot* Filter::hotSpotAt(int line , int column) const
while (spotIter.hasNext()) while (spotIter.hasNext())
{ {
HotSpot* spot = spotIter.next(); HotSpot* spot = spotIter.next();
if ( spot->startLine() == line && spot->startColumn() > column ) if ( spot->startLine() == line && spot->startColumn() > column )
continue; continue;
if ( spot->endLine() == line && spot->endColumn() < column ) if ( spot->endLine() == line && spot->endColumn() < column )
continue; continue;
return spot; return spot;
} }
return 0; return nullptr;
} }
Filter::HotSpot::HotSpot(int startLine , int startColumn , int endLine , int endColumn) Filter::HotSpot::HotSpot(int startLine , int startColumn , int endLine , int endColumn)
@ -300,10 +286,6 @@ Filter::HotSpot::HotSpot(int startLine , int startColumn , int endLine , int end
, _type(NotSpecified) , _type(NotSpecified)
{ {
} }
QString Filter::HotSpot::tooltip() const
{
return QString();
}
QList<QAction*> Filter::HotSpot::actions() QList<QAction*> Filter::HotSpot::actions()
{ {
return QList<QAction*>(); return QList<QAction*>();
@ -343,7 +325,7 @@ RegExpFilter::HotSpot::HotSpot(int startLine,int startColumn,int endLine,int end
setType(Marker); setType(Marker);
} }
void RegExpFilter::HotSpot::activate(QObject*) void RegExpFilter::HotSpot::activate(const QString&)
{ {
} }
@ -356,7 +338,7 @@ QStringList RegExpFilter::HotSpot::capturedTexts() const
return _capturedTexts; return _capturedTexts;
} }
void RegExpFilter::setRegExp(const QRegExp& regExp) void RegExpFilter::setRegExp(const QRegExp& regExp)
{ {
_searchText = regExp; _searchText = regExp;
} }
@ -377,7 +359,7 @@ void RegExpFilter::process()
// ignore any regular expressions which match an empty string. // ignore any regular expressions which match an empty string.
// otherwise the while loop below will run indefinitely // otherwise the while loop below will run indefinitely
static const QString emptyString(""); static const QString emptyString;
if ( _searchText.exactMatch(emptyString) ) if ( _searchText.exactMatch(emptyString) )
return; return;
@ -387,32 +369,26 @@ void RegExpFilter::process()
if ( pos >= 0 ) if ( pos >= 0 )
{ {
int startLine = 0; int startLine = 0;
int endLine = 0; int endLine = 0;
int startColumn = 0; int startColumn = 0;
int endColumn = 0; int endColumn = 0;
//kDebug() << "pos from " << pos << " to " << pos + _searchText.matchedLength();
getLineColumn(pos,startLine,startColumn); getLineColumn(pos,startLine,startColumn);
getLineColumn(pos + _searchText.matchedLength(),endLine,endColumn); getLineColumn(pos + _searchText.matchedLength(),endLine,endColumn);
//kDebug() << "start " << startLine << " / " << startColumn;
//kDebug() << "end " << endLine << " / " << endColumn;
RegExpFilter::HotSpot* spot = newHotSpot(startLine,startColumn, RegExpFilter::HotSpot* spot = newHotSpot(startLine,startColumn,
endLine,endColumn); endLine,endColumn);
spot->setCapturedTexts(_searchText.capturedTexts()); spot->setCapturedTexts(_searchText.capturedTexts());
addHotSpot( spot ); addHotSpot( spot );
pos += _searchText.matchedLength(); pos += _searchText.matchedLength();
// if matchedLength == 0, the program will get stuck in an infinite loop // if matchedLength == 0, the program will get stuck in an infinite loop
Q_ASSERT( _searchText.matchedLength() > 0 ); if ( _searchText.matchedLength() == 0 )
pos = -1;
} }
} }
} }
RegExpFilter::HotSpot* RegExpFilter::newHotSpot(int startLine,int startColumn, RegExpFilter::HotSpot* RegExpFilter::newHotSpot(int startLine,int startColumn,
@ -424,32 +400,23 @@ RegExpFilter::HotSpot* RegExpFilter::newHotSpot(int startLine,int startColumn,
RegExpFilter::HotSpot* UrlFilter::newHotSpot(int startLine,int startColumn,int endLine, RegExpFilter::HotSpot* UrlFilter::newHotSpot(int startLine,int startColumn,int endLine,
int endColumn) int endColumn)
{ {
return new UrlFilter::HotSpot(startLine,startColumn, HotSpot *spot = new UrlFilter::HotSpot(startLine,startColumn,
endLine,endColumn); endLine,endColumn);
connect(spot->getUrlObject(), &FilterObject::activated, this, &UrlFilter::activated);
return spot;
} }
UrlFilter::HotSpot::HotSpot(int startLine,int startColumn,int endLine,int endColumn) UrlFilter::HotSpot::HotSpot(int startLine,int startColumn,int endLine,int endColumn)
: RegExpFilter::HotSpot(startLine,startColumn,endLine,endColumn) : RegExpFilter::HotSpot(startLine,startColumn,endLine,endColumn)
, _urlObject(new FilterObject(this)) , _urlObject(new FilterObject(this))
{ {
setType(Link); setType(Link);
} }
QString UrlFilter::HotSpot::tooltip() const
{
QString url = capturedTexts().first();
const UrlType kind = urlType();
if ( kind == StandardUrl )
return QString();
else if ( kind == Email )
return QString();
else
return QString();
}
UrlFilter::HotSpot::UrlType UrlFilter::HotSpot::urlType() const UrlFilter::HotSpot::UrlType UrlFilter::HotSpot::urlType() const
{ {
QString url = capturedTexts().first(); QString url = capturedTexts().constFirst();
if ( FullUrlRegExp.exactMatch(url) ) if ( FullUrlRegExp.exactMatch(url) )
return StandardUrl; return StandardUrl;
else if ( EmailAddressRegExp.exactMatch(url) ) else if ( EmailAddressRegExp.exactMatch(url) )
@ -458,71 +425,80 @@ UrlFilter::HotSpot::UrlType UrlFilter::HotSpot::urlType() const
return Unknown; return Unknown;
} }
void UrlFilter::HotSpot::activate(QObject* object) void UrlFilter::HotSpot::activate(const QString& actionName)
{ {
QString url = capturedTexts().first(); QString url = capturedTexts().constFirst();
const UrlType kind = urlType(); const UrlType kind = urlType();
const QString& actionName = object ? object->objectName() : QString(); if ( actionName == QLatin1String("copy-action") )
if ( actionName == "copy-action" )
{ {
//kDebug() << "Copying url to clipboard:" << url;
QApplication::clipboard()->setText(url); QApplication::clipboard()->setText(url);
return; return;
} }
if ( !object || actionName == "open-action" ) if ( actionName.isEmpty() || actionName == QLatin1String("open-action") || actionName == QLatin1String("click-action") )
{ {
if ( kind == StandardUrl ) if ( kind == StandardUrl )
{ {
// if the URL path does not include the protocol ( eg. "www.kde.org" ) then // if the URL path does not include the protocol ( eg. "www.kde.org" ) then
// prepend http:// ( eg. "www.kde.org" --> "http://www.kde.org" ) // prepend http:// ( eg. "www.kde.org" --> "http://www.kde.org" )
if (!url.contains("://")) if (!url.contains(QLatin1String("://")))
{ {
url.prepend("http://"); url.prepend(QLatin1String("http://"));
} }
} }
else if ( kind == Email ) else if ( kind == Email )
{ {
url.prepend("mailto:"); url.prepend(QLatin1String("mailto:"));
} }
// new KRun(url,QApplication::activeWindow()); _urlObject->emitActivated(QUrl(url, QUrl::StrictMode), actionName != QLatin1String("click-action"));
} }
} }
// Note: Altering these regular expressions can have a major effect on the performance of the filters // Note: Altering these regular expressions can have a major effect on the performance of the filters
// used for finding URLs in the text, especially if they are very general and could match very long // used for finding URLs in the text, especially if they are very general and could match very long
// pieces of text. // pieces of text.
// Please be careful when altering them. // Please be careful when altering them.
//regexp matches: //regexp matches:
// full url: // full url:
// protocolname:// or www. followed by anything other than whitespaces, <, >, ' or ", and ends before whitespaces, <, >, ', ", ], !, comma and dot // protocolname:// or www. followed by anything other than whitespaces, <, >, ' or ", and ends before whitespaces, <, >, ', ", ], !, comma and dot
const QRegExp UrlFilter::FullUrlRegExp("(www\\.(?!\\.)|[a-z][a-z0-9+.-]*://)[^\\s<>'\"]+[^!,\\.\\s<>'\"\\]]"); const QRegExp UrlFilter::FullUrlRegExp(QLatin1String("(www\\.(?!\\.)|[a-z][a-z0-9+.-]*://)[^\\s<>'\"]+[^!,\\.\\s<>'\"\\]]"));
// email address: // email address:
// [word chars, dots or dashes]@[word chars, dots or dashes].[word chars] // [word chars, dots or dashes]@[word chars, dots or dashes].[word chars]
const QRegExp UrlFilter::EmailAddressRegExp("\\b(\\w|\\.|-)+@(\\w|\\.|-)+\\.\\w+\\b"); const QRegExp UrlFilter::EmailAddressRegExp(QLatin1String("\\b(\\w|\\.|-)+@(\\w|\\.|-)+\\.\\w+\\b"));
// matches full url or email address // matches full url or email address
const QRegExp UrlFilter::CompleteUrlRegExp('('+FullUrlRegExp.pattern()+'|'+ const QRegExp UrlFilter::CompleteUrlRegExp(QLatin1Char('(')+FullUrlRegExp.pattern()+QLatin1Char('|')+
EmailAddressRegExp.pattern()+')'); EmailAddressRegExp.pattern()+QLatin1Char(')'));
UrlFilter::UrlFilter() UrlFilter::UrlFilter()
{ {
setRegExp( CompleteUrlRegExp ); setRegExp( CompleteUrlRegExp );
} }
UrlFilter::HotSpot::~HotSpot() UrlFilter::HotSpot::~HotSpot()
{ {
delete _urlObject; delete _urlObject;
} }
void FilterObject::activated()
void FilterObject::emitActivated(const QUrl& url, bool fromContextMenu)
{ {
_filter->activate(sender()); emit activated(url, fromContextMenu);
} }
void FilterObject::activate()
{
_filter->activate(sender()->objectName());
}
FilterObject* UrlFilter::HotSpot::getUrlObject() const
{
return _urlObject;
}
QList<QAction*> UrlFilter::HotSpot::actions() QList<QAction*> UrlFilter::HotSpot::actions()
{ {
QList<QAction*> list; QList<QAction*> list;
@ -536,28 +512,28 @@ QList<QAction*> UrlFilter::HotSpot::actions()
if ( kind == StandardUrl ) if ( kind == StandardUrl )
{ {
openAction->setText(("Open Link")); openAction->setText(QObject::tr("Open Link"));
copyAction->setText(("Copy Link Address")); copyAction->setText(QObject::tr("Copy Link Address"));
} }
else if ( kind == Email ) else if ( kind == Email )
{ {
openAction->setText(("Send Email To...")); openAction->setText(QObject::tr("Send Email To..."));
copyAction->setText(("Copy Email Address")); copyAction->setText(QObject::tr("Copy Email Address"));
} }
// object names are set here so that the hotspot performs the // object names are set here so that the hotspot performs the
// correct action when activated() is called with the triggered // correct action when activated() is called with the triggered
// action passed as a parameter. // action passed as a parameter.
openAction->setObjectName("open-action"); openAction->setObjectName( QLatin1String("open-action" ));
copyAction->setObjectName("copy-action"); copyAction->setObjectName( QLatin1String("copy-action" ));
QObject::connect( openAction , SIGNAL(triggered()) , _urlObject , SLOT(activated()) ); QObject::connect( openAction , &QAction::triggered , _urlObject , &FilterObject::activate );
QObject::connect( copyAction , SIGNAL(triggered()) , _urlObject , SLOT(activated()) ); QObject::connect( copyAction , &QAction::triggered , _urlObject , &FilterObject::activate );
list << openAction; list << openAction;
list << copyAction; list << copyAction;
return list; return list;
} }
//#include "moc_Filter.cpp" //#include "Filter.moc"

169
qtermwidget/src/Filter.h → qtermwidget/lib/Filter.h
View File

@ -1,7 +1,5 @@
/* /*
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com> Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -23,19 +21,26 @@
#define FILTER_H #define FILTER_H
// Qt // Qt
#include <QtGui/QAction> #include <QAction>
#include <QtCore/QList> #include <QList>
#include <QtCore/QObject> #include <QObject>
#include <QtCore/QStringList> #include <QStringList>
#include <QtCore/QHash> #include <QHash>
#include <QtCore/QRegExp> #if QT_VERSION >= 0x060000
#include <QtCore5Compat/QRegExp>
#else
#include <QRegExp>
#endif
// Local // Local
#include "Character.h" #include "qtermwidget_export.h"
namespace Konsole namespace Konsole
{ {
typedef unsigned char LineProperty;
class Character;
/** /**
* A filter processes blocks of text looking for certain patterns (such as URLs or keywords from a list) * A filter processes blocks of text looking for certain patterns (such as URLs or keywords from a list)
* and marks the areas which match the filter's patterns as 'hotspots'. * and marks the areas which match the filter's patterns as 'hotspots'.
@ -46,7 +51,7 @@ namespace Konsole
* activate() method should be called. Depending on the type of hotspot this will trigger a suitable response. * activate() method should be called. Depending on the type of hotspot this will trigger a suitable response.
* *
* For example, if a hotspot represents a URL then a suitable action would be opening that URL in a web browser. * For example, if a hotspot represents a URL then a suitable action would be opening that URL in a web browser.
* Hotspots may have more than one action, in which case the list of actions can be obtained using the * Hotspots may have more than one action, in which case the list of actions can be obtained using the
* actions() method. * actions() method.
* *
* Different subclasses of filter will return different types of hotspot. * Different subclasses of filter will return different types of hotspot.
@ -54,7 +59,7 @@ namespace Konsole
* When processing the text they should create instances of Filter::HotSpot subclasses for sections of interest * When processing the text they should create instances of Filter::HotSpot subclasses for sections of interest
* and add them to the filter's list of hotspots using addHotSpot() * and add them to the filter's list of hotspots using addHotSpot()
*/ */
class Filter class QTERMWIDGET_EXPORT Filter : public QObject
{ {
public: public:
/** /**
@ -66,13 +71,13 @@ public:
* activate() method should be called. Depending on the type of hotspot this will trigger a suitable response. * activate() method should be called. Depending on the type of hotspot this will trigger a suitable response.
* *
* For example, if a hotspot represents a URL then a suitable action would be opening that URL in a web browser. * For example, if a hotspot represents a URL then a suitable action would be opening that URL in a web browser.
* Hotspots may have more than one action, in which case the list of actions can be obtained using the * Hotspots may have more than one action, in which case the list of actions can be obtained using the
* actions() method. These actions may then be displayed in a popup menu or toolbar for example. * actions() method. These actions may then be displayed in a popup menu or toolbar for example.
*/ */
class HotSpot class HotSpot
{ {
public: public:
/** /**
* Constructs a new hotspot which covers the area from (@p startLine,@p startColumn) to (@p endLine,@p endColumn) * Constructs a new hotspot which covers the area from (@p startLine,@p startColumn) to (@p endLine,@p endColumn)
* in a block of text. * in a block of text.
*/ */
@ -87,7 +92,7 @@ public:
Link, Link,
// this hotspot represents a marker // this hotspot represents a marker
Marker Marker
}; };
/** Returns the line when the hotspot area starts */ /** Returns the line when the hotspot area starts */
int startLine() const; int startLine() const;
@ -97,34 +102,26 @@ public:
int startColumn() const; int startColumn() const;
/** Returns the column on endLine() where the hotspot area ends */ /** Returns the column on endLine() where the hotspot area ends */
int endColumn() const; int endColumn() const;
/** /**
* Returns the type of the hotspot. This is usually used as a hint for views on how to represent * Returns the type of the hotspot. This is usually used as a hint for views on how to represent
* the hotspot graphically. eg. Link hotspots are typically underlined when the user mouses over them * the hotspot graphically. eg. Link hotspots are typically underlined when the user mouses over them
*/ */
Type type() const; Type type() const;
/** /**
* Causes the an action associated with a hotspot to be triggered. * Causes the an action associated with a hotspot to be triggered.
* *
* @param object The object which caused the hotspot to be triggered. This is * @param action The action to trigger. This is
* typically null ( in which case the default action should be performed ) or * typically empty ( in which case the default action should be performed ) or
* one of the objects from the actions() list. In which case the associated * one of the object names from the actions() list. In which case the associated
* action should be performed. * action should be performed.
*/ */
virtual void activate(QObject* object = 0) = 0; virtual void activate(const QString& action = QString()) = 0;
/** /**
* Returns a list of actions associated with the hotspot which can be used in a * Returns a list of actions associated with the hotspot which can be used in a
* menu or toolbar * menu or toolbar
*/ */
virtual QList<QAction*> actions(); virtual QList<QAction*> actions();
/**
* Returns the text of a tooltip to be shown when the mouse moves over the hotspot, or
* an empty string if there is no tooltip associated with this hotspot.
*
* The default implementation returns an empty string.
*/
virtual QString tooltip() const;
protected: protected:
/** Sets the type of a hotspot. This should only be set once */ /** Sets the type of a hotspot. This should only be set once */
void setType(Type type); void setType(Type type);
@ -135,19 +132,19 @@ public:
int _endLine; int _endLine;
int _endColumn; int _endColumn;
Type _type; Type _type;
}; };
/** Constructs a new filter. */ /** Constructs a new filter. */
Filter(); Filter();
virtual ~Filter(); ~Filter() override;
/** Causes the filter to process the block of text currently in its internal buffer */ /** Causes the filter to process the block of text currently in its internal buffer */
virtual void process() = 0; virtual void process() = 0;
/** /**
* Empties the filters internal buffer and resets the line count back to 0. * Empties the filters internal buffer and resets the line count back to 0.
* All hotspots are deleted. * All hotspots are deleted.
*/ */
void reset(); void reset();
@ -163,7 +160,7 @@ public:
/** Returns the list of hotspots identified by the filter which occur on a given line */ /** Returns the list of hotspots identified by the filter which occur on a given line */
QList<HotSpot*> hotSpotsAtLine(int line) const; QList<HotSpot*> hotSpotsAtLine(int line) const;
/** /**
* TODO: Document me * TODO: Document me
*/ */
void setBuffer(const QString* buffer , const QList<int>* linePositions); void setBuffer(const QString* buffer , const QList<int>* linePositions);
@ -179,22 +176,22 @@ protected:
private: private:
QMultiHash<int,HotSpot*> _hotspots; QMultiHash<int,HotSpot*> _hotspots;
QList<HotSpot*> _hotspotList; QList<HotSpot*> _hotspotList;
const QList<int>* _linePositions; const QList<int>* _linePositions;
const QString* _buffer; const QString* _buffer;
}; };
/** /**
* A filter which searches for sections of text matching a regular expression and creates a new RegExpFilter::HotSpot * A filter which searches for sections of text matching a regular expression and creates a new RegExpFilter::HotSpot
* instance for them. * instance for them.
* *
* Subclasses can reimplement newHotSpot() to return custom hotspot types when matches for the regular expression * Subclasses can reimplement newHotSpot() to return custom hotspot types when matches for the regular expression
* are found. * are found.
*/ */
class RegExpFilter : public Filter class QTERMWIDGET_EXPORT RegExpFilter : public Filter
{ {
public: public:
/** /**
* Type of hotspot created by RegExpFilter. The capturedTexts() method can be used to find the text * Type of hotspot created by RegExpFilter. The capturedTexts() method can be used to find the text
* matched by the filter's regular expression. * matched by the filter's regular expression.
*/ */
@ -202,7 +199,7 @@ public:
{ {
public: public:
HotSpot(int startLine, int startColumn, int endLine , int endColumn); HotSpot(int startLine, int startColumn, int endLine , int endColumn);
virtual void activate(QObject* object = 0); void activate(const QString& action = QString()) override;
/** Sets the captured texts associated with this hotspot */ /** Sets the captured texts associated with this hotspot */
void setCapturedTexts(const QStringList& texts); void setCapturedTexts(const QStringList& texts);
@ -215,26 +212,26 @@ public:
/** Constructs a new regular expression filter */ /** Constructs a new regular expression filter */
RegExpFilter(); RegExpFilter();
/** /**
* Sets the regular expression which the filter searches for in blocks of text. * Sets the regular expression which the filter searches for in blocks of text.
* *
* Regular expressions which match the empty string are treated as not matching * Regular expressions which match the empty string are treated as not matching
* anything. * anything.
*/ */
void setRegExp(const QRegExp& text); void setRegExp(const QRegExp& text);
/** Returns the regular expression which the filter searches for in blocks of text */ /** Returns the regular expression which the filter searches for in blocks of text */
QRegExp regExp() const; QRegExp regExp() const;
/** /**
* Reimplemented to search the filter's text buffer for text matching regExp() * Reimplemented to search the filter's text buffer for text matching regExp()
* *
* If regexp matches the empty string, then process() will return immediately * If regexp matches the empty string, then process() will return immediately
* without finding results. * without finding results.
*/ */
virtual void process(); void process() override;
protected: protected:
/** /**
* Called when a match for the regular expression is encountered. Subclasses should reimplement this * Called when a match for the regular expression is encountered. Subclasses should reimplement this
* to return custom hotspot types * to return custom hotspot types
*/ */
@ -248,28 +245,30 @@ private:
class FilterObject; class FilterObject;
/** A filter which matches URLs in blocks of text */ /** A filter which matches URLs in blocks of text */
class UrlFilter : public RegExpFilter class QTERMWIDGET_EXPORT UrlFilter : public RegExpFilter
{ {
Q_OBJECT
public: public:
/** /**
* Hotspot type created by UrlFilter instances. The activate() method opens a web browser * Hotspot type created by UrlFilter instances. The activate() method opens a web browser
* at the given URL when called. * at the given URL when called.
*/ */
class HotSpot : public RegExpFilter::HotSpot class HotSpot : public RegExpFilter::HotSpot
{ {
public: public:
HotSpot(int startLine,int startColumn,int endLine,int endColumn); HotSpot(int startLine,int startColumn,int endLine,int endColumn);
virtual ~HotSpot(); ~HotSpot() override;
virtual QList<QAction*> actions(); FilterObject* getUrlObject() const;
/** QList<QAction*> actions() override;
/**
* Open a web browser at the current URL. The url itself can be determined using * Open a web browser at the current URL. The url itself can be determined using
* the capturedTexts() method. * the capturedTexts() method.
*/ */
virtual void activate(QObject* object = 0); void activate(const QString& action = QString()) override;
virtual QString tooltip() const;
private: private:
enum UrlType enum UrlType
{ {
@ -285,33 +284,39 @@ public:
UrlFilter(); UrlFilter();
protected: protected:
virtual RegExpFilter::HotSpot* newHotSpot(int,int,int,int); RegExpFilter::HotSpot* newHotSpot(int,int,int,int) override;
private: private:
static const QRegExp FullUrlRegExp; static const QRegExp FullUrlRegExp;
static const QRegExp EmailAddressRegExp; static const QRegExp EmailAddressRegExp;
// combined OR of FullUrlRegExp and EmailAddressRegExp // combined OR of FullUrlRegExp and EmailAddressRegExp
static const QRegExp CompleteUrlRegExp; static const QRegExp CompleteUrlRegExp;
signals:
void activated(const QUrl& url, bool fromContextMenu);
}; };
class FilterObject : public QObject class QTERMWIDGET_NO_EXPORT FilterObject : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
FilterObject(Filter::HotSpot* filter) : _filter(filter) {} FilterObject(Filter::HotSpot* filter) : _filter(filter) {}
private slots:
void activated(); void emitActivated(const QUrl& url, bool fromContextMenu);
public slots:
void activate();
private: private:
Filter::HotSpot* _filter; Filter::HotSpot* _filter;
signals:
void activated(const QUrl& url, bool fromContextMenu);
}; };
/** /**
* A chain which allows a group of filters to be processed as one. * A chain which allows a group of filters to be processed as one.
* The chain owns the filters added to it and deletes them when the chain itself is destroyed. * The chain owns the filters added to it and deletes them when the chain itself is destroyed.
* *
* Use addFilter() to add a new filter to the chain. * Use addFilter() to add a new filter to the chain.
* When new text to be filtered arrives, use addLine() to add each additional * When new text to be filtered arrives, use addLine() to add each additional
* line of text which needs to be processed and then after adding the last line, use * line of text which needs to be processed and then after adding the last line, use
* process() to cause each filter in the chain to process the text. * process() to cause each filter in the chain to process the text.
@ -324,7 +329,7 @@ private:
* The hotSpots() and hotSpotsAtLine() method return all of the hotspots in the text and on * The hotSpots() and hotSpotsAtLine() method return all of the hotspots in the text and on
* a given line respectively. * a given line respectively.
*/ */
class FilterChain : protected QList<Filter*> class QTERMWIDGET_EXPORT FilterChain : protected QList<Filter*>
{ {
public: public:
virtual ~FilterChain(); virtual ~FilterChain();
@ -341,12 +346,12 @@ public:
/** Resets each filter in the chain */ /** Resets each filter in the chain */
void reset(); void reset();
/** /**
* Processes each filter in the chain * Processes each filter in the chain
*/ */
void process(); void process();
/** Sets the buffer for each filter in the chain to process. */ /** Sets the buffer for each filter in the chain to process. */
void setBuffer(const QString* buffer , const QList<int>* linePositions); void setBuffer(const QString* buffer , const QList<int>* linePositions);
/** Returns the first hotspot which occurs at @p line, @p column or 0 if no hotspot was found */ /** Returns the first hotspot which occurs at @p line, @p column or 0 if no hotspot was found */
Filter::HotSpot* hotSpotAt(int line , int column) const; Filter::HotSpot* hotSpotAt(int line , int column) const;
@ -358,11 +363,11 @@ public:
}; };
/** A filter chain which processes character images from terminal displays */ /** A filter chain which processes character images from terminal displays */
class TerminalImageFilterChain : public FilterChain class QTERMWIDGET_NO_EXPORT TerminalImageFilterChain : public FilterChain
{ {
public: public:
TerminalImageFilterChain(); TerminalImageFilterChain();
virtual ~TerminalImageFilterChain(); ~TerminalImageFilterChain() override;
/** /**
* Set the current terminal image to @p image. * Set the current terminal image to @p image.
@ -370,9 +375,10 @@ public:
* @param image The terminal image * @param image The terminal image
* @param lines The number of lines in the terminal image * @param lines The number of lines in the terminal image
* @param columns The number of columns in the terminal image * @param columns The number of columns in the terminal image
* @param lineProperties The line properties to set for image
*/ */
void setImage(const Character* const image , int lines , int columns, void setImage(const Character* const image , int lines , int columns,
const QVector<LineProperty>& lineProperties); const QVector<LineProperty>& lineProperties);
private: private:
QString* _buffer; QString* _buffer;
@ -380,4 +386,7 @@ private:
}; };
} }
typedef Konsole::Filter Filter;
#endif //FILTER_H #endif //FILTER_H

425
qtermwidget/src/History.cpp → qtermwidget/lib/History.cpp
View File

@ -1,8 +1,6 @@
/* /*
This file is part of Konsole, an X terminal. This file is part of Konsole, an X terminal.
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -24,18 +22,24 @@
#include "History.h" #include "History.h"
// System // System
#include <algorithm>
#include <iostream> #include <iostream>
#include <stdlib.h> #include <cstdlib>
#include <assert.h> #include <cstdio>
#include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <cerrno>
#include <QtDebug>
// KDE
//#include <kde_file.h>
//#include <kdebug.h>
// Reasonable line size // Reasonable line size
#define LINE_SIZE 1024 #define LINE_SIZE 1024
#define KDE_lseek lseek
using namespace Konsole; using namespace Konsole;
@ -55,7 +59,7 @@ using namespace Konsole;
KDE4: Can we use QTemporaryFile here, instead of KTempFile? KDE4: Can we use QTemporaryFile here, instead of KTempFile?
FIXME: some complain about the history buffer comsuming the FIXME: some complain about the history buffer consuming the
memory of their machines. This problem is critical memory of their machines. This problem is critical
since the history does not behave gracefully in cases since the history does not behave gracefully in cases
where the memory is used up completely. where the memory is used up completely.
@ -72,7 +76,7 @@ FIXME: There is noticeable decrease in speed, also. Perhaps,
scheme with wrap around would be it's complexity. scheme with wrap around would be it's complexity.
*/ */
//FIXME: tempory replacement for tmpfile //FIXME: temporary replacement for tmpfile
// this is here one for debugging purpose. // this is here one for debugging purpose.
//#define tmpfile xTmpFile //#define tmpfile xTmpFile
@ -86,10 +90,11 @@ FIXME: There is noticeable decrease in speed, also. Perhaps,
HistoryFile::HistoryFile() HistoryFile::HistoryFile()
: ion(-1), : ion(-1),
length(0), length(0),
fileMap(0) fileMap(nullptr),
readWriteBalance(0)
{ {
if (tmpFile.open()) if (tmpFile.open())
{ {
tmpFile.setAutoRemove(true); tmpFile.setAutoRemove(true);
ion = tmpFile.handle(); ion = tmpFile.handle();
} }
@ -97,8 +102,8 @@ HistoryFile::HistoryFile()
HistoryFile::~HistoryFile() HistoryFile::~HistoryFile()
{ {
if (fileMap) if (fileMap)
unmap(); unmap();
} }
//TODO: Mapping the entire file in will cause problems if the history file becomes exceedingly large, //TODO: Mapping the entire file in will cause problems if the history file becomes exceedingly large,
@ -106,69 +111,69 @@ HistoryFile::~HistoryFile()
//to avoid this. //to avoid this.
void HistoryFile::map() void HistoryFile::map()
{ {
assert( fileMap == 0 ); Q_ASSERT( fileMap == nullptr );
fileMap = (char*)mmap( 0 , length , PROT_READ , MAP_PRIVATE , ion , 0 ); fileMap = (char*)mmap( nullptr , length , PROT_READ , MAP_PRIVATE , ion , 0 );
//if mmap'ing fails, fall back to the read-lseek combination //if mmap'ing fails, fall back to the read-lseek combination
if ( fileMap == MAP_FAILED ) if ( fileMap == MAP_FAILED )
{ {
readWriteBalance = 0; readWriteBalance = 0;
fileMap = 0; fileMap = nullptr;
qDebug() << ": mmap'ing history failed. errno = " << errno; //qDebug() << __FILE__ << __LINE__ << ": mmap'ing history failed. errno = " << errno;
} }
} }
void HistoryFile::unmap() void HistoryFile::unmap()
{ {
int result = munmap( fileMap , length ); int result = munmap( fileMap , length );
assert( result == 0 ); Q_ASSERT( result == 0 ); Q_UNUSED( result );
fileMap = 0; fileMap = nullptr;
} }
bool HistoryFile::isMapped() bool HistoryFile::isMapped() const
{ {
return (fileMap != 0); return (fileMap != nullptr);
} }
void HistoryFile::add(const unsigned char* bytes, int len) void HistoryFile::add(const unsigned char* bytes, int len)
{ {
if ( fileMap ) if ( fileMap )
unmap(); unmap();
readWriteBalance++; readWriteBalance++;
int rc = 0; int rc = 0;
rc = lseek(ion,length,SEEK_SET); if (rc < 0) { perror("HistoryFile::add.seek"); return; } rc = KDE_lseek(ion,length,SEEK_SET); if (rc < 0) { perror("HistoryFile::add.seek"); return; }
rc = write(ion,bytes,len); if (rc < 0) { perror("HistoryFile::add.write"); return; } rc = write(ion,bytes,len); if (rc < 0) { perror("HistoryFile::add.write"); return; }
length += rc; length += rc;
} }
void HistoryFile::get(unsigned char* bytes, int len, int loc) void HistoryFile::get(unsigned char* bytes, int len, int loc)
{ {
//count number of get() calls vs. number of add() calls. //count number of get() calls vs. number of add() calls.
//If there are many more get() calls compared with add() //If there are many more get() calls compared with add()
//calls (decided by using MAP_THRESHOLD) then mmap the log //calls (decided by using MAP_THRESHOLD) then mmap the log
//file to improve performance. //file to improve performance.
readWriteBalance--; readWriteBalance--;
if ( !fileMap && readWriteBalance < MAP_THRESHOLD ) if ( !fileMap && readWriteBalance < MAP_THRESHOLD )
map(); map();
if ( fileMap ) if ( fileMap )
{ {
for (int i=0;i<len;i++) for (int i=0;i<len;i++)
bytes[i]=fileMap[loc+i]; bytes[i]=fileMap[loc+i];
} }
else else
{ {
int rc = 0; int rc = 0;
if (loc < 0 || len < 0 || loc + len > length) if (loc < 0 || len < 0 || loc + len > length)
fprintf(stderr,"getHist(...,%d,%d): invalid args.\n",len,loc); fprintf(stderr,"getHist(...,%d,%d): invalid args.\n",len,loc);
rc = lseek(ion,loc,SEEK_SET); if (rc < 0) { perror("HistoryFile::get.seek"); return; } rc = KDE_lseek(ion,loc,SEEK_SET); if (rc < 0) { perror("HistoryFile::get.seek"); return; }
rc = read(ion,bytes,len); if (rc < 0) { perror("HistoryFile::get.read"); return; } rc = read(ion,bytes,len); if (rc < 0) { perror("HistoryFile::get.read"); return; }
} }
} }
@ -198,10 +203,10 @@ bool HistoryScroll::hasScroll()
// History Scroll File ////////////////////////////////////// // History Scroll File //////////////////////////////////////
/* /*
The history scroll makes a Row(Row(Cell)) from The history scroll makes a Row(Row(Cell)) from
two history buffers. The index buffer contains two history buffers. The index buffer contains
start of line positions which refere to the cells start of line positions which refers to the cells
buffer. buffer.
Note that index[0] addresses the second line Note that index[0] addresses the second line
@ -218,7 +223,7 @@ HistoryScrollFile::HistoryScrollFile(const QString &logFileName)
HistoryScrollFile::~HistoryScrollFile() HistoryScrollFile::~HistoryScrollFile()
{ {
} }
int HistoryScrollFile::getLines() int HistoryScrollFile::getLines()
{ {
return index.len() / sizeof(int); return index.len() / sizeof(int);
@ -243,12 +248,12 @@ int HistoryScrollFile::startOfLine(int lineno)
{ {
if (lineno <= 0) return 0; if (lineno <= 0) return 0;
if (lineno <= getLines()) if (lineno <= getLines())
{ {
if (!index.isMapped()) if (!index.isMapped())
index.map(); index.map();
int res; int res = 0;
index.get((unsigned char*)&res,sizeof(int),(lineno-1)*sizeof(int)); index.get((unsigned char*)&res,sizeof(int),(lineno-1)*sizeof(int));
return res; return res;
} }
@ -268,7 +273,7 @@ void HistoryScrollFile::addCells(const Character text[], int count)
void HistoryScrollFile::addLine(bool previousWrapped) void HistoryScrollFile::addLine(bool previousWrapped)
{ {
if (index.isMapped()) if (index.isMapped())
index.unmap(); index.unmap();
int locn = cells.len(); int locn = cells.len();
index.add((unsigned char*)&locn,sizeof(int)); index.add((unsigned char*)&locn,sizeof(int));
@ -310,7 +315,7 @@ void HistoryScrollBuffer::addCellsVector(const QVector<Character>& cells)
void HistoryScrollBuffer::addCells(const Character a[], int count) void HistoryScrollBuffer::addCells(const Character a[], int count)
{ {
HistoryLine newLine(count); HistoryLine newLine(count);
qCopy(a,a+count,newLine.begin()); std::copy(a,a+count,newLine.begin());
addCellsVector(newLine); addCellsVector(newLine);
} }
@ -342,7 +347,7 @@ int HistoryScrollBuffer::getLineLen(int lineNumber)
bool HistoryScrollBuffer::isWrappedLine(int lineNumber) bool HistoryScrollBuffer::isWrappedLine(int lineNumber)
{ {
Q_ASSERT( lineNumber >= 0 && lineNumber < _maxLineCount ); Q_ASSERT( lineNumber >= 0 && lineNumber < _maxLineCount );
if (lineNumber < _usedLines) if (lineNumber < _usedLines)
{ {
//kDebug() << "Line" << lineNumber << "wrapped is" << _wrappedLine[bufferIndex(lineNumber)]; //kDebug() << "Line" << lineNumber << "wrapped is" << _wrappedLine[bufferIndex(lineNumber)];
@ -352,18 +357,18 @@ bool HistoryScrollBuffer::isWrappedLine(int lineNumber)
return false; return false;
} }
void HistoryScrollBuffer::getCells(int lineNumber, int startColumn, int count, Character* buffer) void HistoryScrollBuffer::getCells(int lineNumber, int startColumn, int count, Character buffer[])
{ {
if ( count == 0 ) return; if ( count == 0 ) return;
Q_ASSERT( lineNumber < _maxLineCount ); Q_ASSERT( lineNumber < _maxLineCount );
if (lineNumber >= _usedLines) if (lineNumber >= _usedLines)
{ {
memset(buffer, 0, count * sizeof(Character)); memset(static_cast<void*>(buffer), 0, count * sizeof(Character));
return; return;
} }
const HistoryLine& line = _historyBuffer[bufferIndex(lineNumber)]; const HistoryLine& line = _historyBuffer[bufferIndex(lineNumber)];
//kDebug() << "startCol " << startColumn; //kDebug() << "startCol " << startColumn;
@ -371,7 +376,7 @@ void HistoryScrollBuffer::getCells(int lineNumber, int startColumn, int count, C
//kDebug() << "count " << count; //kDebug() << "count " << count;
Q_ASSERT( startColumn <= line.size() - count ); Q_ASSERT( startColumn <= line.size() - count );
memcpy(buffer, line.constData() + startColumn , count * sizeof(Character)); memcpy(buffer, line.constData() + startColumn , count * sizeof(Character));
} }
@ -379,12 +384,12 @@ void HistoryScrollBuffer::setMaxNbLines(unsigned int lineCount)
{ {
HistoryLine* oldBuffer = _historyBuffer; HistoryLine* oldBuffer = _historyBuffer;
HistoryLine* newBuffer = new HistoryLine[lineCount]; HistoryLine* newBuffer = new HistoryLine[lineCount];
for ( int i = 0 ; i < qMin(_usedLines,(int)lineCount) ; i++ ) for ( int i = 0 ; i < qMin(_usedLines,(int)lineCount) ; i++ )
{ {
newBuffer[i] = oldBuffer[bufferIndex(i)]; newBuffer[i] = oldBuffer[bufferIndex(i)];
} }
_usedLines = qMin(_usedLines,(int)lineCount); _usedLines = qMin(_usedLines,(int)lineCount);
_maxLineCount = lineCount; _maxLineCount = lineCount;
_head = ( _usedLines == _maxLineCount ) ? 0 : _usedLines-1; _head = ( _usedLines == _maxLineCount ) ? 0 : _usedLines-1;
@ -393,9 +398,10 @@ void HistoryScrollBuffer::setMaxNbLines(unsigned int lineCount)
delete[] oldBuffer; delete[] oldBuffer;
_wrappedLine.resize(lineCount); _wrappedLine.resize(lineCount);
dynamic_cast<HistoryTypeBuffer*>(m_histType)->m_nbLines = lineCount;
} }
int HistoryScrollBuffer::bufferIndex(int lineNumber) int HistoryScrollBuffer::bufferIndex(int lineNumber) const
{ {
Q_ASSERT( lineNumber >= 0 ); Q_ASSERT( lineNumber >= 0 );
Q_ASSERT( lineNumber < _maxLineCount ); Q_ASSERT( lineNumber < _maxLineCount );
@ -406,7 +412,7 @@ int HistoryScrollBuffer::bufferIndex(int lineNumber)
return (_head+lineNumber+1) % _maxLineCount; return (_head+lineNumber+1) % _maxLineCount;
} }
else else
{ {
return lineNumber; return lineNumber;
} }
} }
@ -493,30 +499,30 @@ void HistoryScrollBlockArray::getCells(int lineno, int colno,
const Block *b = m_blockArray.at(lineno); const Block *b = m_blockArray.at(lineno);
if (!b) { if (!b) {
memset(res, 0, count * sizeof(Character)); // still better than random data memset(static_cast<void*>(res), 0, count * sizeof(Character)); // still better than random data
return; return;
} }
assert(((colno + count) * sizeof(Character)) < ENTRIES); Q_ASSERT(((colno + count) * sizeof(Character)) < ENTRIES);
memcpy(res, b->data + (colno * sizeof(Character)), count * sizeof(Character)); memcpy(res, b->data + (colno * sizeof(Character)), count * sizeof(Character));
} }
void HistoryScrollBlockArray::addCells(const Character a[], int count) void HistoryScrollBlockArray::addCells(const Character a[], int count)
{ {
Block *b = m_blockArray.lastBlock(); Block *b = m_blockArray.lastBlock();
if (!b) return; if (!b) return;
// put cells in block's data // put cells in block's data
assert((count * sizeof(Character)) < ENTRIES); Q_ASSERT((count * sizeof(Character)) < ENTRIES);
memset(b->data, 0, ENTRIES); memset(b->data, 0, sizeof(b->data));
memcpy(b->data, a, count * sizeof(Character)); memcpy(b->data, a, count * sizeof(Character));
b->size = count * sizeof(Character); b->size = count * sizeof(Character);
size_t res = m_blockArray.newBlock(); size_t res = m_blockArray.newBlock();
assert (res > 0); Q_ASSERT(res > 0);
Q_UNUSED( res ); Q_UNUSED( res );
m_lineLengths.insert(m_blockArray.getCurrent(), count); m_lineLengths.insert(m_blockArray.getCurrent(), count);
@ -526,6 +532,257 @@ void HistoryScrollBlockArray::addLine(bool)
{ {
} }
////////////////////////////////////////////////////////////////
// Compact History Scroll //////////////////////////////////////
////////////////////////////////////////////////////////////////
void* CompactHistoryBlock::allocate ( size_t length )
{
Q_ASSERT ( length > 0 );
if ( tail-blockStart+length > blockLength )
return nullptr;
void* block = tail;
tail += length;
//kDebug() << "allocated " << length << " bytes at address " << block;
allocCount++;
return block;
}
void CompactHistoryBlock::deallocate ( )
{
allocCount--;
Q_ASSERT ( allocCount >= 0 );
}
void* CompactHistoryBlockList::allocate(size_t size)
{
CompactHistoryBlock* block;
if ( list.isEmpty() || list.last()->remaining() < size)
{
block = new CompactHistoryBlock();
list.append ( block );
//kDebug() << "new block created, remaining " << block->remaining() << "number of blocks=" << list.size();
}
else
{
block = list.last();
//kDebug() << "old block used, remaining " << block->remaining();
}
return block->allocate(size);
}
void CompactHistoryBlockList::deallocate(void* ptr)
{
Q_ASSERT( !list.isEmpty());
int i=0;
CompactHistoryBlock *block = list.at(i);
while ( i<list.size() && !block->contains(ptr) )
{
i++;
block=list.at(i);
}
Q_ASSERT( i<list.size() );
block->deallocate();
if (!block->isInUse())
{
list.removeAt(i);
delete block;
//kDebug() << "block deleted, new size = " << list.size();
}
}
CompactHistoryBlockList::~CompactHistoryBlockList()
{
qDeleteAll ( list.begin(), list.end() );
list.clear();
}
void* CompactHistoryLine::operator new (size_t size, CompactHistoryBlockList& blockList)
{
return blockList.allocate(size);
}
CompactHistoryLine::CompactHistoryLine ( const TextLine& line, CompactHistoryBlockList& bList )
: blockList(bList),
formatLength(0)
{
length=line.size();
if (!line.empty()) {
formatLength=1;
int k=1;
// count number of different formats in this text line
Character c = line[0];
while ( k<length )
{
if ( !(line[k].equalsFormat(c)))
{
formatLength++; // format change detected
c=line[k];
}
k++;
}
//kDebug() << "number of different formats in string: " << formatLength;
formatArray = (CharacterFormat*) blockList.allocate(sizeof(CharacterFormat)*formatLength);
Q_ASSERT (formatArray!=nullptr);
text = (quint16*) blockList.allocate(sizeof(quint16)*line.size());
Q_ASSERT (text!=nullptr);
length=line.size();
wrapped=false;
// record formats and their positions in the format array
c=line[0];
formatArray[0].setFormat ( c );
formatArray[0].startPos=0; // there's always at least 1 format (for the entire line, unless a change happens)
k=1; // look for possible format changes
int j=1;
while ( k<length && j<formatLength )
{
if (!(line[k].equalsFormat(c)))
{
c=line[k];
formatArray[j].setFormat(c);
formatArray[j].startPos=k;
//kDebug() << "format entry " << j << " at pos " << formatArray[j].startPos << " " << &(formatArray[j].startPos) ;
j++;
}
k++;
}
// copy character values
for ( int i=0; i<line.size(); i++ )
{
text[i]=line[i].character;
//kDebug() << "char " << i << " at mem " << &(text[i]);
}
}
//kDebug() << "line created, length " << length << " at " << &(length);
}
CompactHistoryLine::~CompactHistoryLine()
{
//kDebug() << "~CHL";
if (length>0) {
blockList.deallocate(text);
blockList.deallocate(formatArray);
}
blockList.deallocate(this);
}
void CompactHistoryLine::getCharacter ( int index, Character &r )
{
Q_ASSERT ( index < length );
int formatPos=0;
while ( ( formatPos+1 ) < formatLength && index >= formatArray[formatPos+1].startPos )
formatPos++;
r.character=text[index];
r.rendition = formatArray[formatPos].rendition;
r.foregroundColor = formatArray[formatPos].fgColor;
r.backgroundColor = formatArray[formatPos].bgColor;
}
void CompactHistoryLine::getCharacters ( Character* array, int length, int startColumn )
{
Q_ASSERT ( startColumn >= 0 && length >= 0 );
Q_ASSERT ( startColumn+length <= ( int ) getLength() );
for ( int i=startColumn; i<length+startColumn; i++ )
{
getCharacter ( i, array[i-startColumn] );
}
}
CompactHistoryScroll::CompactHistoryScroll ( unsigned int maxLineCount )
: HistoryScroll ( new CompactHistoryType ( maxLineCount ) )
,lines()
,blockList()
{
//kDebug() << "scroll of length " << maxLineCount << " created";
setMaxNbLines ( maxLineCount );
}
CompactHistoryScroll::~CompactHistoryScroll()
{
qDeleteAll ( lines.begin(), lines.end() );
lines.clear();
}
void CompactHistoryScroll::addCellsVector ( const TextLine& cells )
{
CompactHistoryLine *line;
line = new(blockList) CompactHistoryLine ( cells, blockList );
if ( lines.size() > ( int ) _maxLineCount )
{
delete lines.takeAt ( 0 );
}
lines.append ( line );
}
void CompactHistoryScroll::addCells ( const Character a[], int count )
{
TextLine newLine ( count );
std::copy ( a,a+count,newLine.begin() );
addCellsVector ( newLine );
}
void CompactHistoryScroll::addLine ( bool previousWrapped )
{
CompactHistoryLine *line = lines.last();
//kDebug() << "last line at address " << line;
line->setWrapped(previousWrapped);
}
int CompactHistoryScroll::getLines()
{
return lines.size();
}
int CompactHistoryScroll::getLineLen ( int lineNumber )
{
Q_ASSERT ( lineNumber >= 0 && lineNumber < lines.size() );
CompactHistoryLine* line = lines[lineNumber];
//kDebug() << "request for line at address " << line;
return line->getLength();
}
void CompactHistoryScroll::getCells ( int lineNumber, int startColumn, int count, Character buffer[] )
{
if ( count == 0 ) return;
Q_ASSERT ( lineNumber < lines.size() );
CompactHistoryLine* line = lines[lineNumber];
Q_ASSERT ( startColumn >= 0 );
Q_ASSERT ( (unsigned int)startColumn <= line->getLength() - count );
line->getCharacters ( buffer, count, startColumn );
}
void CompactHistoryScroll::setMaxNbLines ( unsigned int lineCount )
{
_maxLineCount = lineCount;
while (lines.size() > (int) lineCount) {
delete lines.takeAt(0);
}
//kDebug() << "set max lines to: " << _maxLineCount;
}
bool CompactHistoryScroll::isWrappedLine ( int lineNumber )
{
Q_ASSERT ( lineNumber < lines.size() );
return lines[lineNumber]->isWrapped();
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// History Types // History Types
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
@ -662,13 +919,13 @@ const QString& HistoryTypeFile::getFileName() const
HistoryScroll* HistoryTypeFile::scroll(HistoryScroll *old) const HistoryScroll* HistoryTypeFile::scroll(HistoryScroll *old) const
{ {
if (dynamic_cast<HistoryFile *>(old)) if (dynamic_cast<HistoryFile *>(old))
return old; // Unchanged. return old; // Unchanged.
HistoryScroll *newScroll = new HistoryScrollFile(m_fileName); HistoryScroll *newScroll = new HistoryScrollFile(m_fileName);
Character line[LINE_SIZE]; Character line[LINE_SIZE];
int lines = (old != 0) ? old->getLines() : 0; int lines = (old != nullptr) ? old->getLines() : 0;
for(int i = 0; i < lines; i++) for(int i = 0; i < lines; i++)
{ {
int size = old->getLineLen(i); int size = old->getLineLen(i);
@ -689,10 +946,42 @@ HistoryScroll* HistoryTypeFile::scroll(HistoryScroll *old) const
} }
delete old; delete old;
return newScroll; return newScroll;
} }
int HistoryTypeFile::maximumLineCount() const int HistoryTypeFile::maximumLineCount() const
{ {
return 0; return 0;
} }
//////////////////////////////
CompactHistoryType::CompactHistoryType ( unsigned int nbLines )
: m_nbLines ( nbLines )
{
}
bool CompactHistoryType::isEnabled() const
{
return true;
}
int CompactHistoryType::maximumLineCount() const
{
return m_nbLines;
}
HistoryScroll* CompactHistoryType::scroll ( HistoryScroll *old ) const
{
if ( old )
{
CompactHistoryScroll *oldBuffer = dynamic_cast<CompactHistoryScroll*> ( old );
if ( oldBuffer )
{
oldBuffer->setMaxNbLines ( m_nbLines );
return oldBuffer;
}
delete old;
}
return new CompactHistoryScroll ( m_nbLines );
}

269
qtermwidget/src/History.h → qtermwidget/lib/History.h
View File

@ -1,8 +1,6 @@
/* /*
This file is part of Konsole, an X terminal. This file is part of Konsole, an X terminal.
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -24,14 +22,21 @@
#define TEHISTORY_H #define TEHISTORY_H
// Qt // Qt
#include <QtCore/QBitRef> #include <QBitRef>
#include <QtCore/QHash> #include <QHash>
#include <QtCore> #include <QVector>
#include <QTemporaryFile>
// KDE
//#include <ktemporaryfile.h>
// Konsole // Konsole
#include "BlockArray.h" #include "BlockArray.h"
#include "Character.h" #include "Character.h"
// map
#include <sys/mman.h>
namespace Konsole namespace Konsole
{ {
@ -55,7 +60,7 @@ public:
//un-mmaps the file //un-mmaps the file
void unmap(); void unmap();
//returns true if the file is mmap'ed //returns true if the file is mmap'ed
bool isMapped(); bool isMapped() const;
private: private:
@ -65,8 +70,8 @@ private:
//pointer to start of mmap'ed file data, or 0 if the file is not mmap'ed //pointer to start of mmap'ed file data, or 0 if the file is not mmap'ed
char* fileMap; char* fileMap;
//incremented whenver 'add' is called and decremented whenever //incremented whenever 'add' is called and decremented whenever
//'get' is called. //'get' is called.
//this is used to detect when a large number of lines are being read and processed from the history //this is used to detect when a large number of lines are being read and processed from the history
//and automatically mmap the file for better performance (saves the overhead of many lseek-read calls). //and automatically mmap the file for better performance (saves the overhead of many lseek-read calls).
@ -134,15 +139,15 @@ class HistoryScrollFile : public HistoryScroll
{ {
public: public:
HistoryScrollFile(const QString &logFileName); HistoryScrollFile(const QString &logFileName);
virtual ~HistoryScrollFile(); ~HistoryScrollFile() override;
virtual int getLines(); int getLines() override;
virtual int getLineLen(int lineno); int getLineLen(int lineno) override;
virtual void getCells(int lineno, int colno, int count, Character res[]); void getCells(int lineno, int colno, int count, Character res[]) override;
virtual bool isWrappedLine(int lineno); bool isWrappedLine(int lineno) override;
virtual void addCells(const Character a[], int count); void addCells(const Character a[], int count) override;
virtual void addLine(bool previousWrapped=false); void addLine(bool previousWrapped=false) override;
private: private:
int startOfLine(int lineno); int startOfLine(int lineno);
@ -163,30 +168,30 @@ public:
typedef QVector<Character> HistoryLine; typedef QVector<Character> HistoryLine;
HistoryScrollBuffer(unsigned int maxNbLines = 1000); HistoryScrollBuffer(unsigned int maxNbLines = 1000);
virtual ~HistoryScrollBuffer(); ~HistoryScrollBuffer() override;
virtual int getLines(); int getLines() override;
virtual int getLineLen(int lineno); int getLineLen(int lineno) override;
virtual void getCells(int lineno, int colno, int count, Character res[]); void getCells(int lineno, int colno, int count, Character res[]) override;
virtual bool isWrappedLine(int lineno); bool isWrappedLine(int lineno) override;
virtual void addCells(const Character a[], int count); void addCells(const Character a[], int count) override;
virtual void addCellsVector(const QVector<Character>& cells); void addCellsVector(const QVector<Character>& cells) override;
virtual void addLine(bool previousWrapped=false); void addLine(bool previousWrapped=false) override;
void setMaxNbLines(unsigned int nbLines); void setMaxNbLines(unsigned int nbLines);
unsigned int maxNbLines() { return _maxLineCount; } unsigned int maxNbLines() const { return _maxLineCount; }
private: private:
int bufferIndex(int lineNumber); int bufferIndex(int lineNumber) const;
HistoryLine* _historyBuffer; HistoryLine* _historyBuffer;
QBitArray _wrappedLine; QBitArray _wrappedLine;
int _maxLineCount; int _maxLineCount;
int _usedLines; int _usedLines;
int _head; int _head;
//QVector<histline*> m_histBuffer; //QVector<histline*> m_histBuffer;
//QBitArray m_wrappedLine; //QBitArray m_wrappedLine;
//unsigned int m_maxNbLines; //unsigned int m_maxNbLines;
@ -218,17 +223,17 @@ class HistoryScrollNone : public HistoryScroll
{ {
public: public:
HistoryScrollNone(); HistoryScrollNone();
virtual ~HistoryScrollNone(); ~HistoryScrollNone() override;
virtual bool hasScroll(); bool hasScroll() override;
virtual int getLines(); int getLines() override;
virtual int getLineLen(int lineno); int getLineLen(int lineno) override;
virtual void getCells(int lineno, int colno, int count, Character res[]); void getCells(int lineno, int colno, int count, Character res[]) override;
virtual bool isWrappedLine(int lineno); bool isWrappedLine(int lineno) override;
virtual void addCells(const Character a[], int count); void addCells(const Character a[], int count) override;
virtual void addLine(bool previousWrapped=false); void addLine(bool previousWrapped=false) override;
}; };
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
@ -238,21 +243,148 @@ class HistoryScrollBlockArray : public HistoryScroll
{ {
public: public:
HistoryScrollBlockArray(size_t size); HistoryScrollBlockArray(size_t size);
virtual ~HistoryScrollBlockArray(); ~HistoryScrollBlockArray() override;
virtual int getLines(); int getLines() override;
virtual int getLineLen(int lineno); int getLineLen(int lineno) override;
virtual void getCells(int lineno, int colno, int count, Character res[]); void getCells(int lineno, int colno, int count, Character res[]) override;
virtual bool isWrappedLine(int lineno); bool isWrappedLine(int lineno) override;
virtual void addCells(const Character a[], int count); void addCells(const Character a[], int count) override;
virtual void addLine(bool previousWrapped=false); void addLine(bool previousWrapped=false) override;
protected: protected:
BlockArray m_blockArray; BlockArray m_blockArray;
QHash<int,size_t> m_lineLengths; QHash<int,size_t> m_lineLengths;
}; };
//////////////////////////////////////////////////////////////////////
// History using compact storage
// This implementation uses a list of fixed-sized blocks
// where history lines are allocated in (avoids heap fragmentation)
//////////////////////////////////////////////////////////////////////
typedef QVector<Character> TextLine;
class CharacterFormat
{
public:
bool equalsFormat(const CharacterFormat &other) const {
return other.rendition==rendition && other.fgColor==fgColor && other.bgColor==bgColor;
}
bool equalsFormat(const Character &c) const {
return c.rendition==rendition && c.foregroundColor==fgColor && c.backgroundColor==bgColor;
}
void setFormat(const Character& c) {
rendition=c.rendition;
fgColor=c.foregroundColor;
bgColor=c.backgroundColor;
}
CharacterColor fgColor, bgColor;
quint16 startPos;
quint8 rendition;
};
class CompactHistoryBlock
{
public:
CompactHistoryBlock(){
blockLength = 4096*64; // 256kb
head = (quint8*) mmap(nullptr, blockLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
//head = (quint8*) malloc(blockLength);
Q_ASSERT(head != MAP_FAILED);
tail = blockStart = head;
allocCount=0;
}
virtual ~CompactHistoryBlock(){
//free(blockStart);
munmap(blockStart, blockLength);
}
virtual unsigned int remaining(){ return blockStart+blockLength-tail;}
virtual unsigned length() { return blockLength; }
virtual void* allocate(size_t length);
virtual bool contains(void *addr) {return addr>=blockStart && addr<(blockStart+blockLength);}
virtual void deallocate();
virtual bool isInUse(){ return allocCount!=0; } ;
private:
size_t blockLength;
quint8* head;
quint8* tail;
quint8* blockStart;
int allocCount;
};
class CompactHistoryBlockList {
public:
CompactHistoryBlockList() {};
~CompactHistoryBlockList();
void *allocate( size_t size );
void deallocate(void *);
int length() {return list.size();}
private:
QList<CompactHistoryBlock*> list;
};
class CompactHistoryLine
{
public:
CompactHistoryLine(const TextLine&, CompactHistoryBlockList& blockList);
virtual ~CompactHistoryLine();
// custom new operator to allocate memory from custom pool instead of heap
static void *operator new( size_t size, CompactHistoryBlockList& blockList);
static void operator delete( void *) { /* do nothing, deallocation from pool is done in destructor*/ } ;
virtual void getCharacters(Character* array, int length, int startColumn) ;
virtual void getCharacter(int index, Character &r) ;
virtual bool isWrapped() const {return wrapped;};
virtual void setWrapped(bool isWrapped) { wrapped=isWrapped;};
virtual unsigned int getLength() const {return length;};
protected:
CompactHistoryBlockList& blockList;
CharacterFormat* formatArray;
quint16 length;
quint16* text;
quint16 formatLength;
bool wrapped;
};
class CompactHistoryScroll : public HistoryScroll
{
typedef QList<CompactHistoryLine*> HistoryArray;
public:
CompactHistoryScroll(unsigned int maxNbLines = 1000);
~CompactHistoryScroll() override;
int getLines() override;
int getLineLen(int lineno) override;
void getCells(int lineno, int colno, int count, Character res[]) override;
bool isWrappedLine(int lineno) override;
void addCells(const Character a[], int count) override;
void addCellsVector(const TextLine& cells) override;
void addLine(bool previousWrapped=false) override;
void setMaxNbLines(unsigned int nbLines);
unsigned int maxNbLines() const { return _maxLineCount; }
private:
bool hasDifferentColors(const TextLine& line) const;
HistoryArray lines;
CompactHistoryBlockList blockList;
unsigned int _maxLineCount;
};
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// History type // History type
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
@ -265,7 +397,7 @@ public:
/** /**
* Returns true if the history is enabled ( can store lines of output ) * Returns true if the history is enabled ( can store lines of output )
* or false otherwise. * or false otherwise.
*/ */
virtual bool isEnabled() const = 0; virtual bool isEnabled() const = 0;
/** /**
@ -286,37 +418,37 @@ class HistoryTypeNone : public HistoryType
public: public:
HistoryTypeNone(); HistoryTypeNone();
virtual bool isEnabled() const; bool isEnabled() const override;
virtual int maximumLineCount() const; int maximumLineCount() const override;
virtual HistoryScroll* scroll(HistoryScroll *) const; HistoryScroll* scroll(HistoryScroll *) const override;
}; };
class HistoryTypeBlockArray : public HistoryType class HistoryTypeBlockArray : public HistoryType
{ {
public: public:
HistoryTypeBlockArray(size_t size); HistoryTypeBlockArray(size_t size);
virtual bool isEnabled() const;
virtual int maximumLineCount() const;
virtual HistoryScroll* scroll(HistoryScroll *) const; bool isEnabled() const override;
int maximumLineCount() const override;
HistoryScroll* scroll(HistoryScroll *) const override;
protected: protected:
size_t m_size; size_t m_size;
}; };
#if 1 #if 1
class HistoryTypeFile : public HistoryType class HistoryTypeFile : public HistoryType
{ {
public: public:
HistoryTypeFile(const QString& fileName=QString()); HistoryTypeFile(const QString& fileName=QString());
virtual bool isEnabled() const; bool isEnabled() const override;
virtual const QString& getFileName() const; virtual const QString& getFileName() const;
virtual int maximumLineCount() const; int maximumLineCount() const override;
virtual HistoryScroll* scroll(HistoryScroll *) const; HistoryScroll* scroll(HistoryScroll *) const override;
protected: protected:
QString m_fileName; QString m_fileName;
@ -325,18 +457,35 @@ protected:
class HistoryTypeBuffer : public HistoryType class HistoryTypeBuffer : public HistoryType
{ {
friend class HistoryScrollBuffer;
public: public:
HistoryTypeBuffer(unsigned int nbLines); HistoryTypeBuffer(unsigned int nbLines);
virtual bool isEnabled() const;
virtual int maximumLineCount() const;
virtual HistoryScroll* scroll(HistoryScroll *) const; bool isEnabled() const override;
int maximumLineCount() const override;
HistoryScroll* scroll(HistoryScroll *) const override;
protected: protected:
unsigned int m_nbLines; unsigned int m_nbLines;
}; };
class CompactHistoryType : public HistoryType
{
public:
CompactHistoryType(unsigned int size);
bool isEnabled() const override;
int maximumLineCount() const override;
HistoryScroll* scroll(HistoryScroll *) const override;
protected:
unsigned int m_nbLines;
};
#endif #endif
} }

166
qtermwidget/lib/HistorySearch.cpp 100644
View File

@ -0,0 +1,166 @@
/*
Copyright 2013 Christian Surlykke
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
#include <QApplication>
#include <QTextStream>
#include <QDebug>
#include "TerminalCharacterDecoder.h"
#include "Emulation.h"
#include "HistorySearch.h"
HistorySearch::HistorySearch(EmulationPtr emulation, const RegExp& regExp,
bool forwards, int startColumn, int startLine,
QObject* parent) :
QObject(parent),
m_emulation(emulation),
m_regExp(regExp),
m_forwards(forwards),
m_startColumn(startColumn),
m_startLine(startLine) {
}
HistorySearch::~HistorySearch() {
}
void HistorySearch::search() {
bool found = false;
#if QT_VERSION >= 0x060000
if( ! m_regExp.isValid())
#else
if (! m_regExp.isEmpty())
#endif
{
if (m_forwards) {
found = search(m_startColumn, m_startLine, -1, m_emulation->lineCount()) || search(0, 0, m_startColumn, m_startLine);
} else {
found = search(0, 0, m_startColumn, m_startLine) || search(m_startColumn, m_startLine, -1, m_emulation->lineCount());
}
if (found) {
emit matchFound(m_foundStartColumn, m_foundStartLine, m_foundEndColumn, m_foundEndLine);
}
else {
emit noMatchFound();
}
}
deleteLater();
}
bool HistorySearch::search(int startColumn, int startLine, int endColumn, int endLine) {
qDebug() << "search from" << startColumn << "," << startLine
<< "to" << endColumn << "," << endLine;
int linesRead = 0;
int linesToRead = endLine - startLine + 1;
qDebug() << "linesToRead:" << linesToRead;
// We read process history from (and including) startLine to (and including) endLine in
// blocks of at most 10K lines so that we do not use unhealthy amounts of memory
int blockSize;
while ((blockSize = qMin(10000, linesToRead - linesRead)) > 0) {
QString string;
QTextStream searchStream(&string);
PlainTextDecoder decoder;
decoder.begin(&searchStream);
decoder.setRecordLinePositions(true);
// Calculate lines to read and read them
int blockStartLine = m_forwards ? startLine + linesRead : endLine - linesRead - blockSize + 1;
int chunkEndLine = blockStartLine + blockSize - 1;
m_emulation->writeToStream(&decoder, blockStartLine, chunkEndLine);
// We search between startColumn in the first line of the string and endColumn in the last
// line of the string. First we calculate the position (in the string) of endColumn in the
// last line of the string
int endPosition;
// The String that Emulator.writeToStream produces has a newline at the end, and so ends with an
// empty line - we ignore that.
int numberOfLinesInString = decoder.linePositions().size() - 1;
if (numberOfLinesInString > 0 && endColumn > -1 )
{
endPosition = decoder.linePositions().at(numberOfLinesInString - 1) + endColumn;
}
else
{
endPosition = string.size();
}
// So now we can log for m_regExp in the string between startColumn and endPosition
int matchStart;
if (m_forwards)
{
matchStart = string.indexOf(m_regExp, startColumn);
if (matchStart >= endPosition)
matchStart = -1;
}
else
{
matchStart = string.lastIndexOf(m_regExp, endPosition - 1);
if (matchStart < startColumn)
matchStart = -1;
}
if (matchStart > -1)
{
#if QT_VERSION >= 0x060000
auto match = m_regExp.match(string);
int matchEnd = matchStart + match.capturedLength() - 1;
#else
int matchEnd = matchStart + m_regExp.matchedLength() - 1;
#endif
qDebug() << "Found in string from" << matchStart << "to" << matchEnd;
// Translate startPos and endPos to startColum, startLine, endColumn and endLine in history.
int startLineNumberInString = findLineNumberInString(decoder.linePositions(), matchStart);
m_foundStartColumn = matchStart - decoder.linePositions().at(startLineNumberInString);
m_foundStartLine = startLineNumberInString + startLine + linesRead;
int endLineNumberInString = findLineNumberInString(decoder.linePositions(), matchEnd);
m_foundEndColumn = matchEnd - decoder.linePositions().at(endLineNumberInString);
m_foundEndLine = endLineNumberInString + startLine + linesRead;
qDebug() << "m_foundStartColumn" << m_foundStartColumn
<< "m_foundStartLine" << m_foundEndLine
<< "m_foundEndColumn" << m_foundEndColumn
<< "m_foundEndLine" << m_foundEndLine;
return true;
}
linesRead += blockSize;
}
qDebug() << "Not found";
return false;
}
int HistorySearch::findLineNumberInString(QList<int> linePositions, int position) {
int lineNum = 0;
while (lineNum + 1 < linePositions.size() && linePositions[lineNum + 1] <= position)
lineNum++;
return lineNum;
}

79
qtermwidget/lib/HistorySearch.h 100644
View File

@ -0,0 +1,79 @@
/*
Copyright 2013 Christian Surlykke
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
#ifndef TASK_H
#define TASK_H
#include <QObject>
#include <QPointer>
#include <QMap>
#include <Session.h>
#include <ScreenWindow.h>
#include "Emulation.h"
#include "TerminalCharacterDecoder.h"
#if QT_VERSION >= 0x060000
#include <QRegularExpression>
#include <QtCore5Compat/QRegExp>
#endif
using namespace Konsole;
typedef QPointer<Emulation> EmulationPtr;
#if QT_VERSION >= 0x060000
typedef QRegularExpression RegExp;
#else
typedef QRegExp RegExp;
#endif
class HistorySearch : public QObject
{
Q_OBJECT
public:
explicit HistorySearch(EmulationPtr emulation, const RegExp& regExp, bool forwards,
int startColumn, int startLine, QObject* parent);
~HistorySearch() override;
void search();
signals:
void matchFound(int startColumn, int startLine, int endColumn, int endLine);
void noMatchFound();
private:
bool search(int startColumn, int startLine, int endColumn, int endLine);
int findLineNumberInString(QList<int> linePositions, int position);
EmulationPtr m_emulation;
RegExp m_regExp;
bool m_forwards;
int m_startColumn;
int m_startLine;
int m_foundStartColumn;
int m_foundStartLine;
int m_foundEndColumn;
int m_foundEndLine;
};
#endif /* TASK_H */

475
qtermwidget/src/KeyboardTranslator.cpp → qtermwidget/lib/KeyboardTranslator.cpp
View File

@ -1,9 +1,7 @@
/* /*
This source file was part of Konsole, a terminal emulator. This source file is part of Konsole, a terminal emulator.
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com> Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -25,16 +23,22 @@
#include "KeyboardTranslator.h" #include "KeyboardTranslator.h"
// System // System
#include <ctype.h> #include <cctype>
#include <stdio.h> #include <cstdio>
// Qt // Qt
#include <QtCore/QBuffer> #include <QBuffer>
//#include <KDebug> #include <QFile>
#include <QtCore/QFile> #include <QFileInfo>
#include <QtCore/QFileInfo> #include <QTextStream>
#include <QtCore> #include <QKeySequence>
#include <QtGui> #include <QDir>
#include <QtDebug>
#if QT_VERSION >= 0x060000
#include <QtCore5Compat/QRegExp>
#include <QtCore5Compat/QStringRef>
#endif
#include "tools.h"
// KDE // KDE
//#include <KDebug> //#include <KDebug>
@ -43,16 +47,18 @@
using namespace Konsole; using namespace Konsole;
//this is for default REALLY fallback translator.
//const char* KeyboardTranslatorManager::defaultTranslatorText = const QByteArray KeyboardTranslatorManager::defaultTranslatorText(
//#include "DefaultTranslatorText.h" "keyboard \"Fallback Key Translator\"\n"
//; "key Tab : \"\\t\""
);
//and this is default now translator - default.keytab from original Konsole #ifdef Q_OS_MAC
const char* KeyboardTranslatorManager::defaultTranslatorText = // On Mac, Qt::ControlModifier means Cmd, and MetaModifier means Ctrl
#include "ExtendedDefaultTranslator.h" const Qt::KeyboardModifier KeyboardTranslator::CTRL_MOD = Qt::MetaModifier;
; #else
const Qt::KeyboardModifier KeyboardTranslator::CTRL_MOD = Qt::ControlModifier;
#endif
KeyboardTranslatorManager::KeyboardTranslatorManager() KeyboardTranslatorManager::KeyboardTranslatorManager()
: _haveLoadedAll(false) : _haveLoadedAll(false)
@ -60,22 +66,25 @@ KeyboardTranslatorManager::KeyboardTranslatorManager()
} }
KeyboardTranslatorManager::~KeyboardTranslatorManager() KeyboardTranslatorManager::~KeyboardTranslatorManager()
{ {
qDeleteAll(_translators.values()); qDeleteAll(_translators);
} }
QString KeyboardTranslatorManager::findTranslatorPath(const QString& name) QString KeyboardTranslatorManager::findTranslatorPath(const QString& name)
{ {
return QString("kb-layouts/" + name + ".keytab"); return QString(get_kb_layout_dir() + name + QLatin1String(".keytab"));
//return KGlobal::dirs()->findResource("data","konsole/"+name+".keytab");
} }
void KeyboardTranslatorManager::findTranslators() void KeyboardTranslatorManager::findTranslators()
{ {
QDir dir("kb-layouts/"); QDir dir(get_kb_layout_dir());
QStringList filters; QStringList filters;
filters << "*.keytab"; filters << QLatin1String("*.keytab");
dir.setNameFilters(filters); dir.setNameFilters(filters);
QStringList list = dir.entryList(filters); //(".keytab"); // = KGlobal::dirs()->findAllResources("data", QStringList list = dir.entryList(filters);
// "konsole/*.keytab", // QStringList list = KGlobal::dirs()->findAllResources("data",
// KStandardDirs::NoDuplicates); // "konsole/*.keytab",
list = dir.entryList(filters); // KStandardDirs::NoDuplicates);
// add the name of each translator to the list and associated // add the name of each translator to the list and associated
// the name with a null pointer to indicate that the translator // the name with a null pointer to indicate that the translator
// has not yet been loaded from disk // has not yet been loaded from disk
@ -85,11 +94,11 @@ void KeyboardTranslatorManager::findTranslators()
QString translatorPath = listIter.next(); QString translatorPath = listIter.next();
QString name = QFileInfo(translatorPath).baseName(); QString name = QFileInfo(translatorPath).baseName();
if ( !_translators.contains(name) ) { if ( !_translators.contains(name) )
_translators.insert(name,0); _translators.insert(name,0);
}
} }
_haveLoadedAll = true; _haveLoadedAll = true;
} }
@ -98,51 +107,48 @@ const KeyboardTranslator* KeyboardTranslatorManager::findTranslator(const QStrin
if ( name.isEmpty() ) if ( name.isEmpty() )
return defaultTranslator(); return defaultTranslator();
//here was smth wrong in original Konsole source if ( _translators.contains(name) && _translators[name] != 0 )
findTranslators();
if ( _translators.contains(name) && _translators[name] != 0 ) {
return _translators[name]; return _translators[name];
}
KeyboardTranslator* translator = loadTranslator(name); KeyboardTranslator* translator = loadTranslator(name);
if ( translator != 0 ) if ( translator != nullptr )
_translators[name] = translator; _translators[name] = translator;
else if ( !name.isEmpty() ) else if ( !name.isEmpty() )
qWarning() << "Unable to load translator" << name; qDebug() << "Unable to load translator" << name;
return translator; return translator;
} }
bool KeyboardTranslatorManager::saveTranslator(const KeyboardTranslator* translator) bool KeyboardTranslatorManager::saveTranslator(const KeyboardTranslator* translator)
{ {
const QString path = ".keytab";// = KGlobal::dirs()->saveLocation("data","konsole/")+translator->name() qDebug() << "KeyboardTranslatorManager::saveTranslator" << "unimplemented";
// +".keytab"; Q_UNUSED(translator);
#if 0
const QString path = KGlobal::dirs()->saveLocation("data","konsole/")+translator->name()
+".keytab";
qDebug() << "Saving translator to" << path; //kDebug() << "Saving translator to" << path;
QFile destination(path); QFile destination(path);
if (!destination.open(QIODevice::WriteOnly | QIODevice::Text)) if (!destination.open(QIODevice::WriteOnly | QIODevice::Text))
{ {
qWarning() << "Unable to save keyboard translation:" qDebug() << "Unable to save keyboard translation:"
<< destination.errorString(); << destination.errorString();
return false; return false;
} }
{ {
KeyboardTranslatorWriter writer(&destination); KeyboardTranslatorWriter writer(&destination);
writer.writeHeader(translator->description()); writer.writeHeader(translator->description());
QListIterator<KeyboardTranslator::Entry> iter(translator->entries()); QListIterator<KeyboardTranslator::Entry> iter(translator->entries());
while ( iter.hasNext() ) while ( iter.hasNext() )
writer.writeEntry(iter.next()); writer.writeEntry(iter.next());
} }
destination.close(); destination.close();
#endif
return true; return true;
} }
@ -150,24 +156,26 @@ KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(const QString& nam
{ {
const QString& path = findTranslatorPath(name); const QString& path = findTranslatorPath(name);
QFile source(path); QFile source(path);
if (name.isEmpty() || !source.open(QIODevice::ReadOnly | QIODevice::Text)) if (name.isEmpty() || !source.open(QIODevice::ReadOnly | QIODevice::Text))
return 0; return nullptr;
return loadTranslator(&source,name); return loadTranslator(&source,name);
} }
const KeyboardTranslator* KeyboardTranslatorManager::defaultTranslator() const KeyboardTranslator* KeyboardTranslatorManager::defaultTranslator()
{ {
qDebug() << "Loading default translator from text"; // Try to find the default.keytab file if it exists, otherwise
QBuffer textBuffer; // fall back to the hard-coded one
textBuffer.setData(defaultTranslatorText,strlen(defaultTranslatorText)); const KeyboardTranslator* translator = findTranslator(QLatin1String("default"));
if (!translator)
if (!textBuffer.open(QIODevice::ReadOnly)) {
return 0; QBuffer textBuffer;
textBuffer.setData(defaultTranslatorText);
return loadTranslator(&textBuffer,"fallback"); textBuffer.open(QIODevice::ReadOnly);
translator = loadTranslator(&textBuffer,QLatin1String("fallback"));
}
return translator;
} }
KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(QIODevice* source,const QString& name) KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(QIODevice* source,const QString& name)
@ -175,10 +183,8 @@ KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(QIODevice* source,
KeyboardTranslator* translator = new KeyboardTranslator(name); KeyboardTranslator* translator = new KeyboardTranslator(name);
KeyboardTranslatorReader reader(source); KeyboardTranslatorReader reader(source);
translator->setDescription( reader.description() ); translator->setDescription( reader.description() );
while ( reader.hasNextEntry() )
while ( reader.hasNextEntry() ) {
translator->addEntry(reader.nextEntry()); translator->addEntry(reader.nextEntry());
}
source->close(); source->close();
@ -189,7 +195,7 @@ KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(QIODevice* source,
else else
{ {
delete translator; delete translator;
return 0; return nullptr;
} }
} }
@ -211,13 +217,12 @@ void KeyboardTranslatorWriter::writeHeader( const QString& description )
void KeyboardTranslatorWriter::writeEntry( const KeyboardTranslator::Entry& entry ) void KeyboardTranslatorWriter::writeEntry( const KeyboardTranslator::Entry& entry )
{ {
QString result; QString result;
if ( entry.command() != KeyboardTranslator::NoCommand ) if ( entry.command() != KeyboardTranslator::NoCommand )
result = entry.resultToString(); result = entry.resultToString();
else else
result = '\"' + entry.resultToString() + '\"'; result = QLatin1Char('\"') + entry.resultToString() + QLatin1Char('\"');
*_writer << "key " << entry.conditionToString() << " : " << result << '\n'; *_writer << QLatin1String("key ") << entry.conditionToString() << QLatin1String(" : ") << result << QLatin1Char('\n');
} }
@ -230,7 +235,7 @@ void KeyboardTranslatorWriter::writeEntry( const KeyboardTranslator::Entry& entr
// KeySequence begins with the name of the key ( taken from the Qt::Key enum ) // KeySequence begins with the name of the key ( taken from the Qt::Key enum )
// and is followed by the keyboard modifiers and state flags ( with + or - in front // and is followed by the keyboard modifiers and state flags ( with + or - in front
// of each modifier or flag to indicate whether it is required ). All keyboard modifiers // of each modifier or flag to indicate whether it is required ). All keyboard modifiers
// and flags are optional, if a particular modifier or state is not specified it is // and flags are optional, if a particular modifier or state is not specified it is
// assumed not to be a part of the sequence. The key sequence may contain whitespace // assumed not to be a part of the sequence. The key sequence may contain whitespace
// //
// eg: "key Up+Shift : scrollLineUp" // eg: "key Up+Shift : scrollLineUp"
@ -247,22 +252,19 @@ KeyboardTranslatorReader::KeyboardTranslatorReader( QIODevice* source )
// read input until we find the description // read input until we find the description
while ( _description.isEmpty() && !source->atEnd() ) while ( _description.isEmpty() && !source->atEnd() )
{ {
const QList<Token>& tokens = tokenize( QString(source->readLine()) ); QList<Token> tokens = tokenize( QString::fromUtf8(source->readLine()) );
if ( !tokens.isEmpty() && tokens.first().type == Token::TitleKeyword ) if ( !tokens.isEmpty() && tokens.first().type == Token::TitleKeyword )
{ _description = tokens[1].text;
_description = (tokens[1].text.toUtf8());
}
} }
// read first entry (if any)
readNext(); readNext();
} }
void KeyboardTranslatorReader::readNext() void KeyboardTranslatorReader::readNext()
{ {
// find next entry // find next entry
while ( !_source->atEnd() ) while ( !_source->atEnd() )
{ {
const QList<Token>& tokens = tokenize( QString(_source->readLine()) ); const QList<Token>& tokens = tokenize( QString::fromUtf8(_source->readLine()) );
if ( !tokens.isEmpty() && tokens.first().type == Token::KeyKeyword ) if ( !tokens.isEmpty() && tokens.first().type == Token::KeyKeyword )
{ {
KeyboardTranslator::States flags = KeyboardTranslator::NoState; KeyboardTranslator::States flags = KeyboardTranslator::NoState;
@ -277,7 +279,7 @@ void KeyboardTranslatorReader::readNext()
modifiers, modifiers,
modifierMask, modifierMask,
flags, flags,
flagMask); flagMask);
KeyboardTranslator::Command command = KeyboardTranslator::NoCommand; KeyboardTranslator::Command command = KeyboardTranslator::NoCommand;
QByteArray text; QByteArray text;
@ -290,8 +292,8 @@ void KeyboardTranslatorReader::readNext()
else if ( tokens[2].type == Token::Command ) else if ( tokens[2].type == Token::Command )
{ {
// identify command // identify command
if (!parseAsCommand(tokens[2].text,command)) if (!parseAsCommand(tokens[2].text,command))
qWarning() << "Command" << tokens[2].text << "not understood."; qDebug() << "Command" << tokens[2].text << "not understood.";
} }
KeyboardTranslator::Entry newEntry; KeyboardTranslator::Entry newEntry;
@ -309,29 +311,33 @@ void KeyboardTranslatorReader::readNext()
return; return;
} }
} }
_hasNext = false; _hasNext = false;
} }
bool KeyboardTranslatorReader::parseAsCommand(const QString& text,KeyboardTranslator::Command& command) bool KeyboardTranslatorReader::parseAsCommand(const QString& text,KeyboardTranslator::Command& command)
{ {
if ( text.compare("erase",Qt::CaseInsensitive) == 0 ) if ( text.compare(QLatin1String("erase"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::EraseCommand; command = KeyboardTranslator::EraseCommand;
else if ( text.compare("scrollpageup",Qt::CaseInsensitive) == 0 ) else if ( text.compare(QLatin1String("scrollpageup"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollPageUpCommand; command = KeyboardTranslator::ScrollPageUpCommand;
else if ( text.compare("scrollpagedown",Qt::CaseInsensitive) == 0 ) else if ( text.compare(QLatin1String("scrollpagedown"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollPageDownCommand; command = KeyboardTranslator::ScrollPageDownCommand;
else if ( text.compare("scrolllineup",Qt::CaseInsensitive) == 0 ) else if ( text.compare(QLatin1String("scrolllineup"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollLineUpCommand; command = KeyboardTranslator::ScrollLineUpCommand;
else if ( text.compare("scrolllinedown",Qt::CaseInsensitive) == 0 ) else if ( text.compare(QLatin1String("scrolllinedown"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollLineDownCommand; command = KeyboardTranslator::ScrollLineDownCommand;
else if ( text.compare("scrolllock",Qt::CaseInsensitive) == 0 ) else if ( text.compare(QLatin1String("scrolllock"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollLockCommand; command = KeyboardTranslator::ScrollLockCommand;
else if ( text.compare(QLatin1String("scrolluptotop"),Qt::CaseInsensitive) == 0)
command = KeyboardTranslator::ScrollUpToTopCommand;
else if ( text.compare(QLatin1String("scrolldowntobottom"),Qt::CaseInsensitive) == 0)
command = KeyboardTranslator::ScrollDownToBottomCommand;
else else
return false; return false;
return true; return true;
} }
bool KeyboardTranslatorReader::decodeSequence(const QString& text, bool KeyboardTranslatorReader::decodeSequence(const QString& text,
@ -341,7 +347,7 @@ bool KeyboardTranslatorReader::decodeSequence(const QString& text,
KeyboardTranslator::States& flags, KeyboardTranslator::States& flags,
KeyboardTranslator::States& flagMask) KeyboardTranslator::States& flagMask)
{ {
bool isWanted = true; bool isWanted = true;
bool endOfItem = false; bool endOfItem = false;
QString buffer; QString buffer;
@ -350,16 +356,19 @@ bool KeyboardTranslatorReader::decodeSequence(const QString& text,
KeyboardTranslator::States tempFlags = flags; KeyboardTranslator::States tempFlags = flags;
KeyboardTranslator::States tempFlagMask = flagMask; KeyboardTranslator::States tempFlagMask = flagMask;
for ( int i = 0 ; i < text.count() ; i++ ) for ( int i = 0 ; i < text.length() ; i++ )
{ {
const QChar& ch = text[i]; const QChar& ch = text[i];
bool isLastLetter = ( i == text.count()-1 ); bool isFirstLetter = i == 0;
bool isLastLetter = ( i == text.length()-1 );
endOfItem = true; endOfItem = true;
if ( ch.isLetterOrNumber() ) if ( ch.isLetterOrNumber() )
{ {
endOfItem = false; endOfItem = false;
buffer.append(ch); buffer.append(ch);
} else if ( isFirstLetter )
{
buffer.append(ch);
} }
if ( (endOfItem || isLastLetter) && !buffer.isEmpty() ) if ( (endOfItem || isLastLetter) && !buffer.isEmpty() )
@ -390,13 +399,13 @@ bool KeyboardTranslatorReader::decodeSequence(const QString& text,
buffer.clear(); buffer.clear();
} }
// check if this is a wanted / not-wanted flag and update the // check if this is a wanted / not-wanted flag and update the
// state ready for the next item // state ready for the next item
if ( ch == '+' ) if ( ch == QLatin1Char('+') )
isWanted = true; isWanted = true;
else if ( ch == '-' ) else if ( ch == QLatin1Char('-') )
isWanted = false; isWanted = false;
} }
modifiers = tempModifiers; modifiers = tempModifiers;
modifierMask = tempModifierMask; modifierMask = tempModifierMask;
@ -408,16 +417,16 @@ bool KeyboardTranslatorReader::decodeSequence(const QString& text,
bool KeyboardTranslatorReader::parseAsModifier(const QString& item , Qt::KeyboardModifier& modifier) bool KeyboardTranslatorReader::parseAsModifier(const QString& item , Qt::KeyboardModifier& modifier)
{ {
if ( item == "shift" ) if ( item == QLatin1String("shift") )
modifier = Qt::ShiftModifier; modifier = Qt::ShiftModifier;
else if ( item == "ctrl" || item == "control" ) else if ( item == QLatin1String("ctrl") || item == QLatin1String("control") )
modifier = Qt::ControlModifier; modifier = Qt::ControlModifier;
else if ( item == "alt" ) else if ( item == QLatin1String("alt") )
modifier = Qt::AltModifier; modifier = Qt::AltModifier;
else if ( item == "meta" ) else if ( item == QLatin1String("meta") )
modifier = Qt::MetaModifier; modifier = Qt::MetaModifier;
else if ( item == "keypad" ) else if ( item == QLatin1String("keypad") )
modifier = Qt::KeypadModifier; modifier = Qt::KeypadModifier;
else else
return false; return false;
@ -425,16 +434,18 @@ bool KeyboardTranslatorReader::parseAsModifier(const QString& item , Qt::Keyboar
} }
bool KeyboardTranslatorReader::parseAsStateFlag(const QString& item , KeyboardTranslator::State& flag) bool KeyboardTranslatorReader::parseAsStateFlag(const QString& item , KeyboardTranslator::State& flag)
{ {
if ( item == "appcukeys" ) if ( item == QLatin1String("appcukeys") || item == QLatin1String("appcursorkeys") )
flag = KeyboardTranslator::CursorKeysState; flag = KeyboardTranslator::CursorKeysState;
else if ( item == "ansi" ) else if ( item == QLatin1String("ansi") )
flag = KeyboardTranslator::AnsiState; flag = KeyboardTranslator::AnsiState;
else if ( item == "newline" ) else if ( item == QLatin1String("newline") )
flag = KeyboardTranslator::NewLineState; flag = KeyboardTranslator::NewLineState;
else if ( item == "appscreen" ) else if ( item == QLatin1String("appscreen") )
flag = KeyboardTranslator::AlternateScreenState; flag = KeyboardTranslator::AlternateScreenState;
else if ( item == "anymod" ) else if ( item == QLatin1String("anymod") || item == QLatin1String("anymodifier") )
flag = KeyboardTranslator::AnyModifierState; flag = KeyboardTranslator::AnyModifierState;
else if ( item == QLatin1String("appkeypad") )
flag = KeyboardTranslator::ApplicationKeypadState;
else else
return false; return false;
@ -445,17 +456,20 @@ bool KeyboardTranslatorReader::parseAsKeyCode(const QString& item , int& keyCode
QKeySequence sequence = QKeySequence::fromString(item); QKeySequence sequence = QKeySequence::fromString(item);
if ( !sequence.isEmpty() ) if ( !sequence.isEmpty() )
{ {
#if QT_VERSION >= 0x060000
keyCode = sequence[0].toCombined();
#else
keyCode = sequence[0]; keyCode = sequence[0];
#endif
if ( sequence.count() > 1 ) if ( sequence.count() > 1 )
{ {
qDebug() << "Unhandled key codes in sequence: " << item; qDebug() << "Unhandled key codes in sequence: " << item;
} }
} }
// additional cases implemented for backwards compatibility with KDE 3 // additional cases implemented for backwards compatibility with KDE 3
else if ( item == "prior" ) else if ( item == QLatin1String("prior") )
keyCode = Qt::Key_PageUp; keyCode = Qt::Key_PageUp;
else if ( item == "next" ) else if ( item == QLatin1String("next") )
keyCode = Qt::Key_PageDown; keyCode = Qt::Key_PageDown;
else else
return false; return false;
@ -467,49 +481,43 @@ QString KeyboardTranslatorReader::description() const
{ {
return _description; return _description;
} }
bool KeyboardTranslatorReader::hasNextEntry() bool KeyboardTranslatorReader::hasNextEntry() const
{ {
return _hasNext; return _hasNext;
} }
KeyboardTranslator::Entry KeyboardTranslatorReader::createEntry( const QString& condition , KeyboardTranslator::Entry KeyboardTranslatorReader::createEntry( const QString& condition ,
const QString& result ) const QString& result )
{ {
QString entryString("keyboard \"temporary\"\nkey "); QString entryString = QString::fromLatin1("keyboard \"temporary\"\nkey ");
entryString.append(condition); entryString.append(condition);
entryString.append(" : "); entryString.append(QLatin1String(" : "));
// if 'result' is the name of a command then the entry result will be that command, // if 'result' is the name of a command then the entry result will be that command,
// otherwise the result will be treated as a string to echo when the key sequence // otherwise the result will be treated as a string to echo when the key sequence
// specified by 'condition' is pressed // specified by 'condition' is pressed
KeyboardTranslator::Command command; KeyboardTranslator::Command command;
if (parseAsCommand(result,command)) if (parseAsCommand(result,command))
entryString.append(result); entryString.append(result);
else else
entryString.append('\"' + result + '\"'); entryString.append(QLatin1Char('\"') + result + QLatin1Char('\"'));
QByteArray array = entryString.toUtf8(); QByteArray array = entryString.toUtf8();
KeyboardTranslator::Entry entry;
QBuffer buffer(&array); QBuffer buffer(&array);
buffer.open(QIODevice::ReadOnly); buffer.open(QIODevice::ReadOnly);
KeyboardTranslatorReader reader(&buffer); KeyboardTranslatorReader reader(&buffer);
KeyboardTranslator::Entry entry;
if ( reader.hasNextEntry() ) if ( reader.hasNextEntry() )
entry = reader.nextEntry(); entry = reader.nextEntry();
return entry; return entry;
} }
KeyboardTranslator::Entry KeyboardTranslatorReader::nextEntry() KeyboardTranslator::Entry KeyboardTranslatorReader::nextEntry()
{ {
Q_ASSERT( _hasNext ); Q_ASSERT( _hasNext );
KeyboardTranslator::Entry entry = _nextEntry; KeyboardTranslator::Entry entry = _nextEntry;
readNext(); readNext();
return entry; return entry;
} }
bool KeyboardTranslatorReader::parseError() bool KeyboardTranslatorReader::parseError()
@ -518,19 +526,32 @@ bool KeyboardTranslatorReader::parseError()
} }
QList<KeyboardTranslatorReader::Token> KeyboardTranslatorReader::tokenize(const QString& line) QList<KeyboardTranslatorReader::Token> KeyboardTranslatorReader::tokenize(const QString& line)
{ {
QString text = line.simplified(); QString text = line;
// remove comments
bool inQuotes = false;
int commentPos = -1;
for (int i=text.length()-1;i>=0;i--)
{
QChar ch = text[i];
if (ch == QLatin1Char('\"'))
inQuotes = !inQuotes;
else if (ch == QLatin1Char('#') && !inQuotes)
commentPos = i;
}
if (commentPos != -1)
text.remove(commentPos,text.length());
text = text.simplified();
// comment line: # comment
static QRegExp comment("\\#.*");
// title line: keyboard "title" // title line: keyboard "title"
static QRegExp title("keyboard\\s+\"(.*)\""); static QRegExp title(QLatin1String("keyboard\\s+\"(.*)\""));
// key line: key KeySequence : "output" // key line: key KeySequence : "output"
// key line: key KeySequence : command // key line: key KeySequence : command
static QRegExp key("key\\s+([\\w\\+\\s\\-]+)\\s*:\\s*(\"(.*)\"|\\w+)"); static QRegExp key(QLatin1String("key\\s+([\\w\\+\\s\\-\\*\\.]+)\\s*:\\s*(\"(.*)\"|\\w+)"));
QList<Token> list; QList<Token> list;
if ( text.isEmpty() )
if ( text.isEmpty() || comment.exactMatch(text) )
{ {
return list; return list;
} }
@ -538,39 +559,39 @@ QList<KeyboardTranslatorReader::Token> KeyboardTranslatorReader::tokenize(const
if ( title.exactMatch(text) ) if ( title.exactMatch(text) )
{ {
Token titleToken = { Token::TitleKeyword , QString() }; Token titleToken = { Token::TitleKeyword , QString() };
Token textToken = { Token::TitleText , title.capturedTexts()[1] }; Token textToken = { Token::TitleText , title.capturedTexts().at(1) };
list << titleToken << textToken; list << titleToken << textToken;
} }
else if ( key.exactMatch(text) ) else if ( key.exactMatch(text) )
{ {
Token keyToken = { Token::KeyKeyword , QString() }; Token keyToken = { Token::KeyKeyword , QString() };
Token sequenceToken = { Token::KeySequence , key.capturedTexts()[1].remove(' ') }; Token sequenceToken = { Token::KeySequence , key.capturedTexts().value(1).remove(QLatin1Char(' ')) };
list << keyToken << sequenceToken; list << keyToken << sequenceToken;
if ( key.capturedTexts()[3].isEmpty() ) if ( key.capturedTexts().at(3).isEmpty() )
{ {
// capturedTexts()[2] is a command // capturedTexts()[2] is a command
Token commandToken = { Token::Command , key.capturedTexts()[2] }; Token commandToken = { Token::Command , key.capturedTexts().at(2) };
list << commandToken; list << commandToken;
} }
else else
{ {
// capturedTexts()[3] is the output string // capturedTexts()[3] is the output string
Token outputToken = { Token::OutputText , key.capturedTexts()[3] }; Token outputToken = { Token::OutputText , key.capturedTexts().at(3) };
list << outputToken; list << outputToken;
} }
} }
else else
{ {
qWarning() << "Line in keyboard translator file could not be understood:" << text; qDebug() << "Line in keyboard translator file could not be understood:" << text;
} }
return list; return list;
} }
QList<QString> KeyboardTranslatorManager::allTranslators() QList<QString> KeyboardTranslatorManager::allTranslators()
{ {
if ( !_haveLoadedAll ) if ( !_haveLoadedAll )
{ {
@ -601,35 +622,36 @@ bool KeyboardTranslator::Entry::operator==(const Entry& rhs) const
_text == rhs._text; _text == rhs._text;
} }
bool KeyboardTranslator::Entry::matches(int keyCode , bool KeyboardTranslator::Entry::matches(int keyCode ,
Qt::KeyboardModifiers modifiers, Qt::KeyboardModifiers modifiers,
States state) const States testState) const
{ {
#ifdef Q_OS_MAC
// On Mac, arrow keys are considered part of keypad. Ignore that.
modifiers &= ~Qt::KeypadModifier;
#endif
if ( _keyCode != keyCode ) if ( _keyCode != keyCode )
return false; return false;
if ( (modifiers & _modifierMask) != (_modifiers & _modifierMask) ) if ( (modifiers & _modifierMask) != (_modifiers & _modifierMask) )
return false; return false;
// if modifiers is non-zero, the 'any modifier' state is implicit // if modifiers is non-zero, the 'any modifier' state is implicit
if ( modifiers != 0 ) if ( (modifiers & ~Qt::KeypadModifier) != 0 )
state |= AnyModifierState; testState |= AnyModifierState;
if ( (state & _stateMask) != (_state & _stateMask) ) if ( (testState & _stateMask) != (_state & _stateMask) )
return false; return false;
// special handling for the 'Any Modifier' state, which checks for the presence of // special handling for the 'Any Modifier' state, which checks for the presence of
// any or no modifiers. In this context, the 'keypad' modifier does not count. // any or no modifiers. In this context, the 'keypad' modifier does not count.
bool anyModifiersSet = modifiers != 0 && modifiers != Qt::KeypadModifier; bool anyModifiersSet = modifiers != 0 && modifiers != Qt::KeypadModifier;
bool wantAnyModifier = _state & KeyboardTranslator::AnyModifierState;
if ( _stateMask & KeyboardTranslator::AnyModifierState ) if ( _stateMask & KeyboardTranslator::AnyModifierState )
{ {
// test fails if any modifier is required but none are set if ( wantAnyModifier != anyModifiersSet )
if ( (_state & KeyboardTranslator::AnyModifierState) && !anyModifiersSet )
return false; return false;
// test fails if no modifier is allowed but one or more are set
if ( !(_state & KeyboardTranslator::AnyModifierState) && anyModifiersSet )
return false;
} }
return true; return true;
@ -638,7 +660,7 @@ QByteArray KeyboardTranslator::Entry::escapedText(bool expandWildCards,Qt::Keybo
{ {
QByteArray result(text(expandWildCards,modifiers)); QByteArray result(text(expandWildCards,modifiers));
for ( int i = 0 ; i < result.count() ; i++ ) for ( int i = 0 ; i < result.length() ; i++ )
{ {
char ch = result[i]; char ch = result[i];
char replacement = 0; char replacement = 0;
@ -654,13 +676,14 @@ QByteArray KeyboardTranslator::Entry::escapedText(bool expandWildCards,Qt::Keybo
default: default:
// any character which is not printable is replaced by an equivalent // any character which is not printable is replaced by an equivalent
// \xhh escape sequence (where 'hh' are the corresponding hex digits) // \xhh escape sequence (where 'hh' are the corresponding hex digits)
if ( !QChar(ch).isPrint() ) if ( !QChar(QLatin1Char(ch)).isPrint() )
replacement = 'x'; replacement = 'x';
} }
if ( replacement == 'x' ) if ( replacement == 'x' )
{ {
result.replace(i,1,"\\x"+QByteArray(1,ch).toInt(0, 16)); QByteArray data = "\\x"+QByteArray(1,ch).toHex();
result.replace(i,1,data);
} else if ( replacement != 0 ) } else if ( replacement != 0 )
{ {
result.remove(i,1); result.remove(i,1);
@ -675,15 +698,15 @@ QByteArray KeyboardTranslator::Entry::unescape(const QByteArray& input) const
{ {
QByteArray result(input); QByteArray result(input);
for ( int i = 0 ; i < result.count()-1 ; i++ ) for ( int i = 0 ; i < result.length()-1 ; i++ )
{ {
QByteRef ch = result[i]; auto ch = result[i];
if ( ch == '\\' ) if ( ch == '\\' )
{ {
char replacement[2] = {0,0}; char replacement[2] = {0,0};
int charsToRemove = 2; int charsToRemove = 2;
bool escapedChar = true; bool escapedChar = true;
switch ( result[i+1] ) switch ( result[i+1] )
{ {
@ -694,34 +717,33 @@ QByteArray KeyboardTranslator::Entry::unescape(const QByteArray& input) const
case 'r' : replacement[0] = 13; break; case 'r' : replacement[0] = 13; break;
case 'n' : replacement[0] = 10; break; case 'n' : replacement[0] = 10; break;
case 'x' : case 'x' :
{ {
// format is \xh or \xhh where 'h' is a hexadecimal // format is \xh or \xhh where 'h' is a hexadecimal
// digit from 0-9 or A-F which should be replaced // digit from 0-9 or A-F which should be replaced
// with the corresponding character value // with the corresponding character value
char hexDigits[3] = {0}; char hexDigits[3] = {0};
if ( (i < result.count()-2) && isxdigit(result[i+2]) ) if ( (i < result.length()-2) && isxdigit(result[i+2]) )
hexDigits[0] = result[i+2]; hexDigits[0] = result[i+2];
if ( (i < result.count()-3) && isxdigit(result[i+3]) ) if ( (i < result.length()-3) && isxdigit(result[i+3]) )
hexDigits[1] = result[i+3]; hexDigits[1] = result[i+3];
int charValue = 0; unsigned charValue = 0;
sscanf(hexDigits,"%x",&charValue); sscanf(hexDigits,"%x",&charValue);
replacement[0] = (char)charValue;
replacement[0] = (char)charValue;
charsToRemove = 2 + strlen(hexDigits); charsToRemove = 2 + strlen(hexDigits);
} }
break; break;
default: default:
escapedChar = false; escapedChar = false;
} }
if ( escapedChar ) if ( escapedChar )
result.replace(i,charsToRemove,replacement); result.replace(i,charsToRemove,replacement);
} }
} }
return result; return result;
} }
@ -731,20 +753,20 @@ void KeyboardTranslator::Entry::insertModifier( QString& item , int modifier ) c
return; return;
if ( modifier & _modifiers ) if ( modifier & _modifiers )
item += '+'; item += QLatin1Char('+');
else else
item += '-'; item += QLatin1Char('-');
if ( modifier == Qt::ShiftModifier ) if ( modifier == Qt::ShiftModifier )
item += "Shift"; item += QLatin1String("Shift");
else if ( modifier == Qt::ControlModifier ) else if ( modifier == Qt::ControlModifier )
item += "Ctrl"; item += QLatin1String("Ctrl");
else if ( modifier == Qt::AltModifier ) else if ( modifier == Qt::AltModifier )
item += "Alt"; item += QLatin1String("Alt");
else if ( modifier == Qt::MetaModifier ) else if ( modifier == Qt::MetaModifier )
item += "Meta"; item += QLatin1String("Meta");
else if ( modifier == Qt::KeypadModifier ) else if ( modifier == Qt::KeypadModifier )
item += "KeyPad"; item += QLatin1String("KeyPad");
} }
void KeyboardTranslator::Entry::insertState( QString& item , int state ) const void KeyboardTranslator::Entry::insertState( QString& item , int state ) const
{ {
@ -752,37 +774,43 @@ void KeyboardTranslator::Entry::insertState( QString& item , int state ) const
return; return;
if ( state & _state ) if ( state & _state )
item += '+' ; item += QLatin1Char('+') ;
else else
item += '-' ; item += QLatin1Char('-') ;
if ( state == KeyboardTranslator::AlternateScreenState ) if ( state == KeyboardTranslator::AlternateScreenState )
item += "AppScreen"; item += QLatin1String("AppScreen");
else if ( state == KeyboardTranslator::NewLineState ) else if ( state == KeyboardTranslator::NewLineState )
item += "NewLine"; item += QLatin1String("NewLine");
else if ( state == KeyboardTranslator::AnsiState ) else if ( state == KeyboardTranslator::AnsiState )
item += "Ansi"; item += QLatin1String("Ansi");
else if ( state == KeyboardTranslator::CursorKeysState ) else if ( state == KeyboardTranslator::CursorKeysState )
item += "AppCuKeys"; item += QLatin1String("AppCursorKeys");
else if ( state == KeyboardTranslator::AnyModifierState ) else if ( state == KeyboardTranslator::AnyModifierState )
item += "AnyMod"; item += QLatin1String("AnyModifier");
else if ( state == KeyboardTranslator::ApplicationKeypadState )
item += QLatin1String("AppKeypad");
} }
QString KeyboardTranslator::Entry::resultToString(bool expandWildCards,Qt::KeyboardModifiers modifiers) const QString KeyboardTranslator::Entry::resultToString(bool expandWildCards,Qt::KeyboardModifiers modifiers) const
{ {
if ( !_text.isEmpty() ) if ( !_text.isEmpty() )
return escapedText(expandWildCards,modifiers); return QString::fromLatin1(escapedText(expandWildCards,modifiers));
else if ( _command == EraseCommand ) else if ( _command == EraseCommand )
return "Erase"; return QLatin1String("Erase");
else if ( _command == ScrollPageUpCommand ) else if ( _command == ScrollPageUpCommand )
return "ScrollPageUp"; return QLatin1String("ScrollPageUp");
else if ( _command == ScrollPageDownCommand ) else if ( _command == ScrollPageDownCommand )
return "ScrollPageDown"; return QLatin1String("ScrollPageDown");
else if ( _command == ScrollLineUpCommand ) else if ( _command == ScrollLineUpCommand )
return "ScrollLineUp"; return QLatin1String("ScrollLineUp");
else if ( _command == ScrollLineDownCommand ) else if ( _command == ScrollLineDownCommand )
return "ScrollLineDown"; return QLatin1String("ScrollLineDown");
else if ( _command == ScrollLockCommand ) else if ( _command == ScrollLockCommand )
return "ScrollLock"; return QLatin1String("ScrollLock");
else if (_command == ScrollUpToTopCommand)
return QLatin1String("ScrollUpToTop");
else if (_command == ScrollDownToBottomCommand)
return QLatin1String("ScrollDownToBottom");
return QString(); return QString();
} }
@ -790,18 +818,18 @@ QString KeyboardTranslator::Entry::conditionToString() const
{ {
QString result = QKeySequence(_keyCode).toString(); QString result = QKeySequence(_keyCode).toString();
// add modifiers
insertModifier( result , Qt::ShiftModifier ); insertModifier( result , Qt::ShiftModifier );
insertModifier( result , Qt::ControlModifier ); insertModifier( result , Qt::ControlModifier );
insertModifier( result , Qt::AltModifier ); insertModifier( result , Qt::AltModifier );
insertModifier( result , Qt::MetaModifier ); insertModifier( result , Qt::MetaModifier );
insertModifier( result , Qt::KeypadModifier );
// add states
insertState( result , KeyboardTranslator::AlternateScreenState ); insertState( result , KeyboardTranslator::AlternateScreenState );
insertState( result , KeyboardTranslator::NewLineState ); insertState( result , KeyboardTranslator::NewLineState );
insertState( result , KeyboardTranslator::AnsiState ); insertState( result , KeyboardTranslator::AnsiState );
insertState( result , KeyboardTranslator::CursorKeysState ); insertState( result , KeyboardTranslator::CursorKeysState );
insertState( result , KeyboardTranslator::AnyModifierState ); insertState( result , KeyboardTranslator::AnyModifierState );
insertState( result , KeyboardTranslator::ApplicationKeypadState );
return result; return result;
} }
@ -811,7 +839,7 @@ KeyboardTranslator::KeyboardTranslator(const QString& name)
{ {
} }
void KeyboardTranslator::setDescription(const QString& description) void KeyboardTranslator::setDescription(const QString& description)
{ {
_description = description; _description = description;
} }
@ -836,47 +864,34 @@ QList<KeyboardTranslator::Entry> KeyboardTranslator::entries() const
void KeyboardTranslator::addEntry(const Entry& entry) void KeyboardTranslator::addEntry(const Entry& entry)
{ {
const int keyCode = entry.keyCode(); const int keyCode = entry.keyCode();
_entries.insertMulti(keyCode,entry); _entries.insert(keyCode,entry);
} }
void KeyboardTranslator::replaceEntry(const Entry& existing , const Entry& replacement) void KeyboardTranslator::replaceEntry(const Entry& existing , const Entry& replacement)
{ {
if ( !existing.isNull() ) if ( !existing.isNull() )
_entries.remove(existing.keyCode()); _entries.remove(existing.keyCode(),existing);
_entries.insertMulti(replacement.keyCode(),replacement); _entries.insert(replacement.keyCode(),replacement);
} }
void KeyboardTranslator::removeEntry(const Entry& entry) void KeyboardTranslator::removeEntry(const Entry& entry)
{ {
_entries.remove(entry.keyCode()); _entries.remove(entry.keyCode(),entry);
} }
KeyboardTranslator::Entry KeyboardTranslator::findEntry(int keyCode, Qt::KeyboardModifiers modifiers, States state) const KeyboardTranslator::Entry KeyboardTranslator::findEntry(int keyCode, Qt::KeyboardModifiers modifiers, States state) const
{ {
if ( _entries.contains(keyCode) ) for (auto it = _entries.cbegin(), end = _entries.cend(); it != end; ++it)
{ {
QList<Entry> entriesForKey = _entries.values(keyCode); if (it.key() == keyCode)
if ( it.value().matches(keyCode,modifiers,state) )
QListIterator<Entry> iter(entriesForKey); return *it;
while (iter.hasNext())
{
const Entry& next = iter.next();
if ( next.matches(keyCode,modifiers,state) )
return next;
}
return Entry(); // entry not found
} }
else return Entry(); // entry not found
{
return Entry();
}
} }
void KeyboardTranslatorManager::addTranslator(KeyboardTranslator* translator) void KeyboardTranslatorManager::addTranslator(KeyboardTranslator* translator)
{ {
_translators.insert(translator->name(),translator); _translators.insert(translator->name(),translator);
if ( !saveTranslator(translator) ) if ( !saveTranslator(translator) )
qWarning() << "Unable to save translator" << translator->name() qDebug() << "Unable to save translator" << translator->name()
<< "to disk."; << "to disk.";
} }
bool KeyboardTranslatorManager::deleteTranslator(const QString& name) bool KeyboardTranslatorManager::deleteTranslator(const QString& name)
@ -888,15 +903,15 @@ bool KeyboardTranslatorManager::deleteTranslator(const QString& name)
if ( QFile::remove(path) ) if ( QFile::remove(path) )
{ {
_translators.remove(name); _translators.remove(name);
return true; return true;
} }
else else
{ {
qWarning() << "Failed to remove translator - " << path; qDebug() << "Failed to remove translator - " << path;
return false; return false;
} }
} }
K_GLOBAL_STATIC( KeyboardTranslatorManager , theKeyboardTranslatorManager ) Q_GLOBAL_STATIC( KeyboardTranslatorManager , theKeyboardTranslatorManager )
KeyboardTranslatorManager* KeyboardTranslatorManager::instance() KeyboardTranslatorManager* KeyboardTranslatorManager::instance()
{ {
return theKeyboardTranslatorManager; return theKeyboardTranslatorManager;

268
qtermwidget/src/KeyboardTranslator.h → qtermwidget/lib/KeyboardTranslator.h
View File

@ -1,9 +1,7 @@
/* /*
This source file is part of Konsole, a terminal emulator. This source file is part of Konsole, a terminal emulator.
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com> Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -25,87 +23,15 @@
#define KEYBOARDTRANSLATOR_H #define KEYBOARDTRANSLATOR_H
// Qt // Qt
#include <QtCore/QHash> #include <QHash>
#include <QtCore/QList> #include <QList>
#include <QtGui/QKeySequence> #include <QKeySequence>
#include <QtCore/QMetaType> #include <QMetaType>
#include <QtCore/QVarLengthArray> #include <QVarLengthArray>
#include <QtCore>
typedef void (*CleanUpFunction)();
/**
* @internal
*
* Helper class for K_GLOBAL_STATIC to clean up the object on library unload or application
* shutdown.
*/
class CleanUpGlobalStatic
{
public:
CleanUpFunction func;
inline ~CleanUpGlobalStatic() { func(); }
};
//these directives are taken from the heart of kdecore
# define K_GLOBAL_STATIC_STRUCT_NAME(NAME)
#if QT_VERSION < 0x040400
# define Q_BASIC_ATOMIC_INITIALIZER Q_ATOMIC_INIT
# define testAndSetOrdered testAndSet
#endif
#define K_GLOBAL_STATIC(TYPE, NAME) K_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ())
#define K_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS) \
static QBasicAtomicPointer<TYPE > _k_static_##NAME = Q_BASIC_ATOMIC_INITIALIZER(0); \
static bool _k_static_##NAME##_destroyed; \
static struct K_GLOBAL_STATIC_STRUCT_NAME(NAME) \
{ \
bool isDestroyed() \
{ \
return _k_static_##NAME##_destroyed; \
} \
inline operator TYPE*() \
{ \
return operator->(); \
} \
inline TYPE *operator->() \
{ \
if (!_k_static_##NAME) { \
if (isDestroyed()) { \
qFatal("Fatal Error: Accessed global static '%s *%s()' after destruction. " \
"Defined at %s:%d", #TYPE, #NAME, __FILE__, __LINE__); \
} \
TYPE *x = new TYPE ARGS; \
if (!_k_static_##NAME.testAndSetOrdered(0, x) \
&& _k_static_##NAME != x ) { \
delete x; \
} else { \
static CleanUpGlobalStatic cleanUpObject = { destroy }; \
} \
} \
return _k_static_##NAME; \
} \
inline TYPE &operator*() \
{ \
return *operator->(); \
} \
static void destroy() \
{ \
_k_static_##NAME##_destroyed = true; \
TYPE *x = _k_static_##NAME; \
_k_static_##NAME = 0; \
delete x; \
} \
} NAME;
// Konsole
//#include "konsole_export.h"
#define KONSOLEPRIVATE_EXPORT
class QIODevice; class QIODevice;
class QTextStream; class QTextStream;
@ -113,7 +39,7 @@ class QTextStream;
namespace Konsole namespace Konsole
{ {
/** /**
* A convertor which maps between key sequences pressed by the user and the * A convertor which maps between key sequences pressed by the user and the
* character strings which should be sent to the terminal and commands * character strings which should be sent to the terminal and commands
* which should be invoked when those character sequences are pressed. * which should be invoked when those character sequences are pressed.
@ -129,7 +55,7 @@ namespace Konsole
class KeyboardTranslator class KeyboardTranslator
{ {
public: public:
/** /**
* The meaning of a particular key sequence may depend upon the state which * The meaning of a particular key sequence may depend upon the state which
* the terminal emulation is in. Therefore findEntry() may return a different * the terminal emulation is in. Therefore findEntry() may return a different
* Entry depending upon the state flags supplied. * Entry depending upon the state flags supplied.
@ -145,7 +71,7 @@ public:
* TODO More documentation * TODO More documentation
*/ */
NewLineState = 1, NewLineState = 1,
/** /**
* Indicates that the terminal is in 'Ansi' mode. * Indicates that the terminal is in 'Ansi' mode.
* TODO: More documentation * TODO: More documentation
*/ */
@ -156,11 +82,13 @@ public:
CursorKeysState = 4, CursorKeysState = 4,
/** /**
* Indicates that the alternate screen ( typically used by interactive programs * Indicates that the alternate screen ( typically used by interactive programs
* such as screen or vim ) is active * such as screen or vim ) is active
*/ */
AlternateScreenState = 8, AlternateScreenState = 8,
/** Indicates that any of the modifier keys is active. */ /** Indicates that any of the modifier keys is active. */
AnyModifierState = 16 AnyModifierState = 16,
/** Indicates that the numpad is in application mode. */
ApplicationKeypadState = 32
}; };
Q_DECLARE_FLAGS(States,State) Q_DECLARE_FLAGS(States,State)
@ -183,8 +111,12 @@ public:
ScrollLineDownCommand = 16, ScrollLineDownCommand = 16,
/** Toggles scroll lock mode */ /** Toggles scroll lock mode */
ScrollLockCommand = 32, ScrollLockCommand = 32,
/** Echos the operating system specific erase character. */ /** Scroll the terminal display up to the start of history */
EraseCommand = 64 ScrollUpToTopCommand = 64,
/** Scroll the terminal display down to the end of history */
ScrollDownToBottomCommand = 128,
/** Echos the operating system specific erase character. */
EraseCommand = 256
}; };
Q_DECLARE_FLAGS(Commands,Command) Q_DECLARE_FLAGS(Commands,Command)
@ -196,14 +128,14 @@ public:
class Entry class Entry
{ {
public: public:
/** /**
* Constructs a new entry for a keyboard translator. * Constructs a new entry for a keyboard translator.
*/ */
Entry(); Entry();
/** /**
* Returns true if this entry is null. * Returns true if this entry is null.
* This is true for newly constructed entries which have no properties set. * This is true for newly constructed entries which have no properties set.
*/ */
bool isNull() const; bool isNull() const;
@ -212,15 +144,15 @@ public:
/** Sets the command associated with this entry. */ /** Sets the command associated with this entry. */
void setCommand(Command command); void setCommand(Command command);
/** /**
* Returns the character sequence associated with this entry, optionally replacing * Returns the character sequence associated with this entry, optionally replacing
* wildcard '*' characters with numbers to indicate the keyboard modifiers being pressed. * wildcard '*' characters with numbers to indicate the keyboard modifiers being pressed.
* *
* TODO: The numbers used to replace '*' characters are taken from the Konsole/KDE 3 code. * TODO: The numbers used to replace '*' characters are taken from the Konsole/KDE 3 code.
* Document them. * Document them.
* *
* @param expandWildCards Specifies whether wild cards (occurrences of the '*' character) in * @param expandWildCards Specifies whether wild cards (occurrences of the '*' character) in
* the entry should be replaced with a number to indicate the modifier keys being pressed. * the entry should be replaced with a number to indicate the modifier keys being pressed.
* *
* @param modifiers The keyboard modifiers being pressed. * @param modifiers The keyboard modifiers being pressed.
*/ */
@ -230,7 +162,7 @@ public:
/** Sets the character sequence associated with this entry */ /** Sets the character sequence associated with this entry */
void setText(const QByteArray& text); void setText(const QByteArray& text);
/** /**
* Returns the character sequence associated with this entry, * Returns the character sequence associated with this entry,
* with any non-printable characters replaced with escape sequences. * with any non-printable characters replaced with escape sequences.
* *
@ -247,13 +179,13 @@ public:
/** Sets the character code associated with this entry */ /** Sets the character code associated with this entry */
void setKeyCode(int keyCode); void setKeyCode(int keyCode);
/** /**
* Returns a bitwise-OR of the enabled keyboard modifiers associated with this entry. * Returns a bitwise-OR of the enabled keyboard modifiers associated with this entry.
* If a modifier is set in modifierMask() but not in modifiers(), this means that the entry * If a modifier is set in modifierMask() but not in modifiers(), this means that the entry
* only matches when that modifier is NOT pressed. * only matches when that modifier is NOT pressed.
* *
* If a modifier is not set in modifierMask() then the entry matches whether the modifier * If a modifier is not set in modifierMask() then the entry matches whether the modifier
* is pressed or not. * is pressed or not.
*/ */
Qt::KeyboardModifiers modifiers() const; Qt::KeyboardModifiers modifiers() const;
@ -265,13 +197,13 @@ public:
/** See modifierMask() and modifiers() */ /** See modifierMask() and modifiers() */
void setModifierMask( Qt::KeyboardModifiers modifiers ); void setModifierMask( Qt::KeyboardModifiers modifiers );
/** /**
* Returns a bitwise-OR of the enabled state flags associated with this entry. * Returns a bitwise-OR of the enabled state flags associated with this entry.
* If flag is set in stateMask() but not in state(), this means that the entry only * If flag is set in stateMask() but not in state(), this means that the entry only
* matches when the terminal is NOT in that state. * matches when the terminal is NOT in that state.
* *
* If a state is not set in stateMask() then the entry matches whether the terminal * If a state is not set in stateMask() then the entry matches whether the terminal
* is in that state or not. * is in that state or not.
*/ */
States state() const; States state() const;
@ -283,13 +215,13 @@ public:
/** See stateMask() */ /** See stateMask() */
void setStateMask( States mask ); void setStateMask( States mask );
/** /**
* Returns the key code and modifiers associated with this entry * Returns the key code and modifiers associated with this entry
* as a QKeySequence * as a QKeySequence
*/ */
//QKeySequence keySequence() const; //QKeySequence keySequence() const;
/** /**
* Returns this entry's conditions ( ie. its key code, modifier and state criteria ) * Returns this entry's conditions ( ie. its key code, modifier and state criteria )
* as a string. * as a string.
*/ */
@ -305,16 +237,16 @@ public:
QString resultToString(bool expandWildCards = false, QString resultToString(bool expandWildCards = false,
Qt::KeyboardModifiers modifiers = Qt::NoModifier) const; Qt::KeyboardModifiers modifiers = Qt::NoModifier) const;
/** /**
* Returns true if this entry matches the given key sequence, specified * Returns true if this entry matches the given key sequence, specified
* as a combination of @p keyCode , @p modifiers and @p state. * as a combination of @p keyCode , @p modifiers and @p state.
*/ */
bool matches( int keyCode , bool matches( int keyCode ,
Qt::KeyboardModifiers modifiers , Qt::KeyboardModifiers modifiers ,
States flags ) const; States flags ) const;
bool operator==(const Entry& rhs) const; bool operator==(const Entry& rhs) const;
private: private:
void insertModifier( QString& item , int modifier ) const; void insertModifier( QString& item , int modifier ) const;
void insertState( QString& item , int state ) const; void insertState( QString& item , int state ) const;
@ -332,7 +264,7 @@ public:
/** Constructs a new keyboard translator with the given @p name */ /** Constructs a new keyboard translator with the given @p name */
KeyboardTranslator(const QString& name); KeyboardTranslator(const QString& name);
//KeyboardTranslator(const KeyboardTranslator& other); //KeyboardTranslator(const KeyboardTranslator& other);
/** Returns the name of this keyboard translator */ /** Returns the name of this keyboard translator */
@ -350,7 +282,7 @@ public:
/** /**
* Looks for an entry in this keyboard translator which matches the given * Looks for an entry in this keyboard translator which matches the given
* key code, keyboard modifiers and state flags. * key code, keyboard modifiers and state flags.
* *
* Returns the matching entry if found or a null Entry otherwise ( ie. * Returns the matching entry if found or a null Entry otherwise ( ie.
* entry.isNull() will return true ) * entry.isNull() will return true )
* *
@ -358,11 +290,11 @@ public:
* @param modifiers A combination of modifiers * @param modifiers A combination of modifiers
* @param state Optional flags which specify the current state of the terminal * @param state Optional flags which specify the current state of the terminal
*/ */
Entry findEntry(int keyCode , Entry findEntry(int keyCode ,
Qt::KeyboardModifiers modifiers , Qt::KeyboardModifiers modifiers ,
States state = NoState) const; States state = NoState) const;
/** /**
* Adds an entry to this keyboard translator's table. Entries can be looked up according * Adds an entry to this keyboard translator's table. Entries can be looked up according
* to their key sequence using findEntry() * to their key sequence using findEntry()
*/ */
@ -382,9 +314,12 @@ public:
/** Returns a list of all entries in the translator. */ /** Returns a list of all entries in the translator. */
QList<Entry> entries() const; QList<Entry> entries() const;
/** The modifier code for the actual Ctrl key on this OS. */
static const Qt::KeyboardModifier CTRL_MOD;
private: private:
QHash<int,Entry> _entries; // entries in this keyboard translation, QMultiHash<int,Entry> _entries; // entries in this keyboard translation,
// entries are indexed according to // entries are indexed according to
// their keycode // their keycode
QString _name; QString _name;
@ -393,8 +328,8 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(KeyboardTranslator::States) Q_DECLARE_OPERATORS_FOR_FLAGS(KeyboardTranslator::States)
Q_DECLARE_OPERATORS_FOR_FLAGS(KeyboardTranslator::Commands) Q_DECLARE_OPERATORS_FOR_FLAGS(KeyboardTranslator::Commands)
/** /**
* Parses the contents of a Keyboard Translator (.keytab) file and * Parses the contents of a Keyboard Translator (.keytab) file and
* returns the entries found in it. * returns the entries found in it.
* *
* Usage example: * Usage example:
@ -414,7 +349,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(KeyboardTranslator::Commands)
* if ( !reader.parseError() ) * if ( !reader.parseError() )
* { * {
* // parsing succeeded, do something with the translator * // parsing succeeded, do something with the translator
* } * }
* else * else
* { * {
* // parsing failed * // parsing failed
@ -427,18 +362,18 @@ public:
/** Constructs a new reader which parses the given @p source */ /** Constructs a new reader which parses the given @p source */
KeyboardTranslatorReader( QIODevice* source ); KeyboardTranslatorReader( QIODevice* source );
/** /**
* Returns the description text. * Returns the description text.
* TODO: More documentation * TODO: More documentation
*/ */
QString description() const; QString description() const;
/** Returns true if there is another entry in the source stream */ /** Returns true if there is another entry in the source stream */
bool hasNextEntry(); bool hasNextEntry() const;
/** Returns the next entry found in the source stream */ /** Returns the next entry found in the source stream */
KeyboardTranslator::Entry nextEntry(); KeyboardTranslator::Entry nextEntry();
/** /**
* Returns true if an error occurred whilst parsing the input or * Returns true if an error occurred whilst parsing the input or
* false if no error occurred. * false if no error occurred.
*/ */
@ -448,7 +383,7 @@ public:
* Parses a condition and result string for a translator entry * Parses a condition and result string for a translator entry
* and produces a keyboard translator entry. * and produces a keyboard translator entry.
* *
* The condition and result strings are in the same format as in * The condition and result strings are in the same format as in
*/ */
static KeyboardTranslator::Entry createEntry( const QString& condition , static KeyboardTranslator::Entry createEntry( const QString& condition ,
const QString& result ); const QString& result );
@ -469,7 +404,7 @@ private:
}; };
QList<Token> tokenize(const QString&); QList<Token> tokenize(const QString&);
void readNext(); void readNext();
bool decodeSequence(const QString& , bool decodeSequence(const QString& ,
int& keyCode, int& keyCode,
Qt::KeyboardModifiers& modifiers, Qt::KeyboardModifiers& modifiers,
Qt::KeyboardModifiers& modifierMask, Qt::KeyboardModifiers& modifierMask,
@ -479,7 +414,7 @@ private:
static bool parseAsModifier(const QString& item , Qt::KeyboardModifier& modifier); static bool parseAsModifier(const QString& item , Qt::KeyboardModifier& modifier);
static bool parseAsStateFlag(const QString& item , KeyboardTranslator::State& state); static bool parseAsStateFlag(const QString& item , KeyboardTranslator::State& state);
static bool parseAsKeyCode(const QString& item , int& keyCode); static bool parseAsKeyCode(const QString& item , int& keyCode);
static bool parseAsCommand(const QString& text , KeyboardTranslator::Command& command); static bool parseAsCommand(const QString& text , KeyboardTranslator::Command& command);
QIODevice* _source; QIODevice* _source;
QString _description; QString _description;
@ -491,23 +426,23 @@ private:
class KeyboardTranslatorWriter class KeyboardTranslatorWriter
{ {
public: public:
/** /**
* Constructs a new writer which saves data into @p destination. * Constructs a new writer which saves data into @p destination.
* The caller is responsible for closing the device when writing is complete. * The caller is responsible for closing the device when writing is complete.
*/ */
KeyboardTranslatorWriter(QIODevice* destination); KeyboardTranslatorWriter(QIODevice* destination);
~KeyboardTranslatorWriter(); ~KeyboardTranslatorWriter();
/** /**
* Writes the header for the keyboard translator. * Writes the header for the keyboard translator.
* @param description Description of the keyboard translator. * @param description Description of the keyboard translator.
*/ */
void writeHeader( const QString& description ); void writeHeader( const QString& description );
/** Writes a translator entry. */ /** Writes a translator entry. */
void writeEntry( const KeyboardTranslator::Entry& entry ); void writeEntry( const KeyboardTranslator::Entry& entry );
private: private:
QIODevice* _destination; QIODevice* _destination;
QTextStream* _writer; QTextStream* _writer;
}; };
@ -515,10 +450,10 @@ private:
* Manages the keyboard translations available for use by terminal sessions, * Manages the keyboard translations available for use by terminal sessions,
* see KeyboardTranslator. * see KeyboardTranslator.
*/ */
class KeyboardTranslatorManager class KONSOLEPRIVATE_EXPORT KeyboardTranslatorManager
{ {
public: public:
/** /**
* Constructs a new KeyboardTranslatorManager and loads the list of * Constructs a new KeyboardTranslatorManager and loads the list of
* available keyboard translations. * available keyboard translations.
* *
@ -528,8 +463,11 @@ public:
KeyboardTranslatorManager(); KeyboardTranslatorManager();
~KeyboardTranslatorManager(); ~KeyboardTranslatorManager();
KeyboardTranslatorManager(const KeyboardTranslatorManager&) = delete;
KeyboardTranslatorManager& operator=(const KeyboardTranslatorManager&) = delete;
/** /**
* Adds a new translator. If a translator with the same name * Adds a new translator. If a translator with the same name
* already exists, it will be replaced by the new translator. * already exists, it will be replaced by the new translator.
* *
* TODO: More documentation. * TODO: More documentation.
@ -546,18 +484,18 @@ public:
/** Returns the default translator for Konsole. */ /** Returns the default translator for Konsole. */
const KeyboardTranslator* defaultTranslator(); const KeyboardTranslator* defaultTranslator();
/** /**
* Returns the keyboard translator with the given name or 0 if no translator * Returns the keyboard translator with the given name or 0 if no translator
* with that name exists. * with that name exists.
* *
* The first time that a translator with a particular name is requested, * The first time that a translator with a particular name is requested,
* the on-disk .keyboard file is loaded and parsed. * the on-disk .keyboard file is loaded and parsed.
*/ */
const KeyboardTranslator* findTranslator(const QString& name); const KeyboardTranslator* findTranslator(const QString& name);
/** /**
* Returns a list of the names of available keyboard translators. * Returns a list of the names of available keyboard translators.
* *
* The first time this is called, a search for available * The first time this is called, a search for available
* translators is started. * translators is started.
*/ */
QList<QString> allTranslators(); QList<QString> allTranslators();
@ -566,16 +504,16 @@ public:
static KeyboardTranslatorManager* instance(); static KeyboardTranslatorManager* instance();
private: private:
static const char* defaultTranslatorText; static const QByteArray defaultTranslatorText;
void findTranslators(); // locate the available translators void findTranslators(); // locate the available translators
KeyboardTranslator* loadTranslator(const QString& name); // loads the translator KeyboardTranslator* loadTranslator(const QString& name); // loads the translator
// with the given name // with the given name
KeyboardTranslator* loadTranslator(QIODevice* device,const QString& name); KeyboardTranslator* loadTranslator(QIODevice* device,const QString& name);
bool saveTranslator(const KeyboardTranslator* translator); bool saveTranslator(const KeyboardTranslator* translator);
QString findTranslatorPath(const QString& name); QString findTranslatorPath(const QString& name);
QHash<QString,KeyboardTranslator*> _translators; // maps translator-name -> KeyboardTranslator QHash<QString,KeyboardTranslator*> _translators; // maps translator-name -> KeyboardTranslator
// instance // instance
bool _haveLoadedAll; bool _haveLoadedAll;
@ -584,15 +522,15 @@ private:
inline int KeyboardTranslator::Entry::keyCode() const { return _keyCode; } inline int KeyboardTranslator::Entry::keyCode() const { return _keyCode; }
inline void KeyboardTranslator::Entry::setKeyCode(int keyCode) { _keyCode = keyCode; } inline void KeyboardTranslator::Entry::setKeyCode(int keyCode) { _keyCode = keyCode; }
inline void KeyboardTranslator::Entry::setModifiers( Qt::KeyboardModifiers modifier ) inline void KeyboardTranslator::Entry::setModifiers( Qt::KeyboardModifiers modifier )
{ {
_modifiers = modifier; _modifiers = modifier;
} }
inline Qt::KeyboardModifiers KeyboardTranslator::Entry::modifiers() const { return _modifiers; } inline Qt::KeyboardModifiers KeyboardTranslator::Entry::modifiers() const { return _modifiers; }
inline void KeyboardTranslator::Entry::setModifierMask( Qt::KeyboardModifiers mask ) inline void KeyboardTranslator::Entry::setModifierMask( Qt::KeyboardModifiers mask )
{ {
_modifierMask = mask; _modifierMask = mask;
} }
inline Qt::KeyboardModifiers KeyboardTranslator::Entry::modifierMask() const { return _modifierMask; } inline Qt::KeyboardModifiers KeyboardTranslator::Entry::modifierMask() const { return _modifierMask; }
@ -602,49 +540,49 @@ inline bool KeyboardTranslator::Entry::isNull() const
} }
inline void KeyboardTranslator::Entry::setCommand( Command command ) inline void KeyboardTranslator::Entry::setCommand( Command command )
{ {
_command = command; _command = command;
} }
inline KeyboardTranslator::Command KeyboardTranslator::Entry::command() const { return _command; } inline KeyboardTranslator::Command KeyboardTranslator::Entry::command() const { return _command; }
inline void KeyboardTranslator::Entry::setText( const QByteArray& text ) inline void KeyboardTranslator::Entry::setText( const QByteArray& text )
{ {
_text = unescape(text); _text = unescape(text);
} }
inline int oneOrZero(int value) inline int oneOrZero(int value)
{ {
return value ? 1 : 0; return value ? 1 : 0;
} }
inline QByteArray KeyboardTranslator::Entry::text(bool expandWildCards,Qt::KeyboardModifiers modifiers) const inline QByteArray KeyboardTranslator::Entry::text(bool expandWildCards,Qt::KeyboardModifiers modifiers) const
{ {
QByteArray expandedText = _text; QByteArray expandedText = _text;
if (expandWildCards) if (expandWildCards)
{ {
int modifierValue = 1; int modifierValue = 1;
modifierValue += oneOrZero(modifiers & Qt::ShiftModifier); modifierValue += oneOrZero(modifiers & Qt::ShiftModifier);
modifierValue += oneOrZero(modifiers & Qt::AltModifier) << 1; modifierValue += oneOrZero(modifiers & Qt::AltModifier) << 1;
modifierValue += oneOrZero(modifiers & Qt::ControlModifier) << 2; modifierValue += oneOrZero(modifiers & KeyboardTranslator::CTRL_MOD) << 2;
for (int i=0;i<_text.length();i++) for (int i=0;i<_text.length();i++)
{ {
if (expandedText[i] == '*') if (expandedText[i] == '*')
expandedText[i] = '0' + modifierValue; expandedText[i] = '0' + modifierValue;
} }
} }
return expandedText; return expandedText;
} }
inline void KeyboardTranslator::Entry::setState( States state ) inline void KeyboardTranslator::Entry::setState( States state )
{ {
_state = state; _state = state;
} }
inline KeyboardTranslator::States KeyboardTranslator::Entry::state() const { return _state; } inline KeyboardTranslator::States KeyboardTranslator::Entry::state() const { return _state; }
inline void KeyboardTranslator::Entry::setStateMask( States stateMask ) inline void KeyboardTranslator::Entry::setStateMask( States stateMask )
{ {
_stateMask = stateMask; _stateMask = stateMask;
} }
inline KeyboardTranslator::States KeyboardTranslator::Entry::stateMask() const { return _stateMask; } inline KeyboardTranslator::States KeyboardTranslator::Entry::stateMask() const { return _stateMask; }

21
qtermwidget/lib/LineFont.h 100644
View File

@ -0,0 +1,21 @@
// WARNING: Autogenerated by "fontembedder ./linefont.src".
// You probably do not want to hand-edit this!
static const quint32 LineChars[] = {
0x00007c00, 0x000fffe0, 0x00421084, 0x00e739ce, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00427000, 0x004e7380, 0x00e77800, 0x00ef7bc0,
0x00421c00, 0x00439ce0, 0x00e73c00, 0x00e7bde0, 0x00007084, 0x000e7384, 0x000079ce, 0x000f7bce,
0x00001c84, 0x00039ce4, 0x00003dce, 0x0007bdee, 0x00427084, 0x004e7384, 0x004279ce, 0x00e77884,
0x00e779ce, 0x004f7bce, 0x00ef7bc4, 0x00ef7bce, 0x00421c84, 0x00439ce4, 0x00423dce, 0x00e73c84,
0x00e73dce, 0x0047bdee, 0x00e7bde4, 0x00e7bdee, 0x00427c00, 0x0043fce0, 0x004e7f80, 0x004fffe0,
0x004fffe0, 0x00e7fde0, 0x006f7fc0, 0x00efffe0, 0x00007c84, 0x0003fce4, 0x000e7f84, 0x000fffe4,
0x00007dce, 0x0007fdee, 0x000f7fce, 0x000fffee, 0x00427c84, 0x0043fce4, 0x004e7f84, 0x004fffe4,
0x00427dce, 0x00e77c84, 0x00e77dce, 0x0047fdee, 0x004e7fce, 0x00e7fde4, 0x00ef7f84, 0x004fffee,
0x00efffe4, 0x00e7fdee, 0x00ef7fce, 0x00efffee, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x000f83e0, 0x00a5294a, 0x004e1380, 0x00a57800, 0x00ad0bc0, 0x004390e0, 0x00a53c00, 0x00a5a1e0,
0x000e1384, 0x0000794a, 0x000f0b4a, 0x000390e4, 0x00003d4a, 0x0007a16a, 0x004e1384, 0x00a5694a,
0x00ad2b4a, 0x004390e4, 0x00a52d4a, 0x00a5a16a, 0x004f83e0, 0x00a57c00, 0x00ad83e0, 0x000f83e4,
0x00007d4a, 0x000f836a, 0x004f93e4, 0x00a57d4a, 0x00ad836a, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x00001084, 0x00007000, 0x00421000,
0x00039ce0, 0x000039ce, 0x000e7380, 0x00e73800, 0x000e7f80, 0x00e73884, 0x0003fce0, 0x004239ce
};

0
qtermwidget/src/LineFont.src → qtermwidget/lib/LineFont.src
View File

350
qtermwidget/lib/Pty.cpp 100644
View File

@ -0,0 +1,350 @@
/*
* This file is a part of QTerminal - http://gitorious.org/qterminal
*
* This file was un-linked from KDE and modified
* by Maxim Bourmistrov <maxim@unixconn.com>
*
*/
/*
This file is part of Konsole, an X terminal.
Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
// Own
#include "Pty.h"
// System
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <cerrno>
#include <termios.h>
#include <csignal>
// Qt
#include <QStringList>
#include <QtDebug>
#include "kpty.h"
#include "kptydevice.h"
using namespace Konsole;
void Pty::setWindowSize(int lines, int cols)
{
_windowColumns = cols;
_windowLines = lines;
if (pty()->masterFd() >= 0)
pty()->setWinSize(lines, cols);
}
QSize Pty::windowSize() const
{
return {_windowColumns,_windowLines};
}
void Pty::setFlowControlEnabled(bool enable)
{
_xonXoff = enable;
if (pty()->masterFd() >= 0)
{
struct ::termios ttmode;
pty()->tcGetAttr(&ttmode);
if (!enable)
ttmode.c_iflag &= ~(IXOFF | IXON);
else
ttmode.c_iflag |= (IXOFF | IXON);
if (!pty()->tcSetAttr(&ttmode))
qWarning() << "Unable to set terminal attributes.";
}
}
bool Pty::flowControlEnabled() const
{
if (pty()->masterFd() >= 0)
{
struct ::termios ttmode;
pty()->tcGetAttr(&ttmode);
return ttmode.c_iflag & IXOFF &&
ttmode.c_iflag & IXON;
}
qWarning() << "Unable to get flow control status, terminal not connected.";
return false;
}
void Pty::setUtf8Mode(bool enable)
{
#ifdef IUTF8 // XXX not a reasonable place to check it.
_utf8 = enable;
if (pty()->masterFd() >= 0)
{
struct ::termios ttmode;
pty()->tcGetAttr(&ttmode);
if (!enable)
ttmode.c_iflag &= ~IUTF8;
else
ttmode.c_iflag |= IUTF8;
if (!pty()->tcSetAttr(&ttmode))
qWarning() << "Unable to set terminal attributes.";
}
#endif
}
void Pty::setErase(char erase)
{
_eraseChar = erase;
if (pty()->masterFd() >= 0)
{
struct ::termios ttmode;
pty()->tcGetAttr(&ttmode);
ttmode.c_cc[VERASE] = erase;
if (!pty()->tcSetAttr(&ttmode))
qWarning() << "Unable to set terminal attributes.";
}
}
char Pty::erase() const
{
if (pty()->masterFd() >= 0)
{
struct ::termios ttyAttributes;
pty()->tcGetAttr(&ttyAttributes);
return ttyAttributes.c_cc[VERASE];
}
return _eraseChar;
}
void Pty::addEnvironmentVariables(const QStringList& environment)
{
bool termEnvVarAdded = false;
for (const QString &pair : environment)
{
// split on the first '=' character
int pos = pair.indexOf(QLatin1Char('='));
if ( pos >= 0 )
{
QString variable = pair.left(pos);
QString value = pair.mid(pos+1);
setEnv(variable,value);
if (variable == QLatin1String("TERM")) {
termEnvVarAdded = true;
}
}
// fallback to ensure that $TERM is always set
if (!termEnvVarAdded) {
setEnv(QStringLiteral("TERM"), QStringLiteral("xterm-256color"));
}
}
}
int Pty::start(const QString& program,
const QStringList& programArguments,
const QStringList& environment,
ulong winid,
bool addToUtmp
//const QString& dbusService,
//const QString& dbusSession
)
{
clearProgram();
// For historical reasons, the first argument in programArguments is the
// name of the program to execute, so create a list consisting of all
// but the first argument to pass to setProgram()
Q_ASSERT(programArguments.count() >= 1);
setProgram(program, programArguments.mid(1));
addEnvironmentVariables(environment);
setEnv(QLatin1String("WINDOWID"), QString::number(winid));
setEnv(QLatin1String("COLORTERM"), QLatin1String("truecolor"));
// unless the LANGUAGE environment variable has been set explicitly
// set it to a null string
// this fixes the problem where KCatalog sets the LANGUAGE environment
// variable during the application's startup to something which
// differs from LANG,LC_* etc. and causes programs run from
// the terminal to display messages in the wrong language
//
// this can happen if LANG contains a language which KDE
// does not have a translation for
//
// BR:149300
setEnv(QLatin1String("LANGUAGE"),QString(),false /* do not overwrite existing value if any */);
setUseUtmp(addToUtmp);
struct ::termios ttmode;
pty()->tcGetAttr(&ttmode);
if (!_xonXoff)
ttmode.c_iflag &= ~(IXOFF | IXON);
else
ttmode.c_iflag |= (IXOFF | IXON);
#ifdef IUTF8 // XXX not a reasonable place to check it.
if (!_utf8)
ttmode.c_iflag &= ~IUTF8;
else
ttmode.c_iflag |= IUTF8;
#endif
if (_eraseChar != 0)
ttmode.c_cc[VERASE] = _eraseChar;
if (!pty()->tcSetAttr(&ttmode))
qWarning() << "Unable to set terminal attributes.";
pty()->setWinSize(_windowLines, _windowColumns);
KProcess::start();
if (!waitForStarted())
return -1;
return 0;
}
void Pty::setEmptyPTYProperties()
{
struct ::termios ttmode;
pty()->tcGetAttr(&ttmode);
if (!_xonXoff)
ttmode.c_iflag &= ~(IXOFF | IXON);
else
ttmode.c_iflag |= (IXOFF | IXON);
#ifdef IUTF8 // XXX not a reasonable place to check it.
if (!_utf8)
ttmode.c_iflag &= ~IUTF8;
else
ttmode.c_iflag |= IUTF8;
#endif
if (_eraseChar != 0)
ttmode.c_cc[VERASE] = _eraseChar;
if (!pty()->tcSetAttr(&ttmode))
qWarning() << "Unable to set terminal attributes.";
}
void Pty::setWriteable(bool writeable)
{
struct stat sbuf;
stat(pty()->ttyName(), &sbuf);
if (writeable)
chmod(pty()->ttyName(), sbuf.st_mode | S_IWGRP);
else
chmod(pty()->ttyName(), sbuf.st_mode & ~(S_IWGRP|S_IWOTH));
}
Pty::Pty(int masterFd, QObject* parent)
: KPtyProcess(masterFd,parent)
{
init();
}
Pty::Pty(QObject* parent)
: KPtyProcess(parent)
{
init();
}
void Pty::init()
{
_windowColumns = 0;
_windowLines = 0;
_eraseChar = 0;
_xonXoff = true;
_utf8 =true;
connect(pty(), SIGNAL(readyRead()) , this , SLOT(dataReceived()));
setPtyChannels(KPtyProcess::AllChannels);
}
Pty::~Pty()
{
}
void Pty::sendData(const char* data, int length)
{
if (!length)
return;
if (!pty()->write(data,length))
{
qWarning() << "Pty::doSendJobs - Could not send input data to terminal process.";
return;
}
}
void Pty::dataReceived()
{
QByteArray data = pty()->readAll();
emit receivedData(data.constData(),data.length());
}
void Pty::lockPty(bool lock)
{
Q_UNUSED(lock);
// TODO: Support for locking the Pty
//if (lock)
//suspend();
//else
//resume();
}
int Pty::foregroundProcessGroup() const
{
int pid = tcgetpgrp(pty()->masterFd());
if ( pid != -1 )
{
return pid;
}
return 0;
}
// TODO: we need to handle this
#if QT_VERSION < 0x060000
void Pty::setupChildProcess()
{
KPtyProcess::setupChildProcess();
// reset all signal handlers
// this ensures that terminal applications respond to
// signals generated via key sequences such as Ctrl+C
// (which sends SIGINT)
struct sigaction action;
sigset_t sigset;
sigemptyset(&action.sa_mask);
sigemptyset(&sigset);
action.sa_handler = SIG_DFL;
action.sa_flags = 0;
for (int signal=1;signal < NSIG; signal++) {
sigaction(signal,&action,nullptr);
sigaddset(&sigset, signal);
}
sigprocmask(SIG_UNBLOCK, &sigset, nullptr);
}
#endif

177
qtermwidget/src/Pty.h → qtermwidget/lib/Pty.h
View File

@ -1,10 +1,16 @@
/* /*
This file is part of Konsole, KDE's terminal emulator. * This file is a part of QTerminal - http://gitorious.org/qterminal
*
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com> * This file was un-linked from KDE and modified
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> * by Maxim Bourmistrov <maxim@unixconn.com>
*
*/
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008 /*
This file is part of Konsole, KDE's terminal emulator.
Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -26,20 +32,19 @@
#define PTY_H #define PTY_H
// Qt // Qt
#include <QtCore/QStringList> #include <QStringList>
#include <QtCore/QVector> #include <QVector>
#include <QtCore/QList> #include <QList>
#include <QtCore> #include <QSize>
#include "k3process.h" // KDE
#include "kptyprocess.h"
namespace Konsole {
namespace Konsole
{
/** /**
* The Pty class is used to start the terminal process, * The Pty class is used to start the terminal process,
* send data to it, receive data from it and manipulate * send data to it, receive data from it and manipulate
* various properties of the pseudo-teletype interface * various properties of the pseudo-teletype interface
* used to communicate with the process. * used to communicate with the process.
* *
@ -48,28 +53,35 @@ namespace Konsole
* send data to or receive data from the process. * send data to or receive data from the process.
* *
* To start the terminal process, call the start() method * To start the terminal process, call the start() method
* with the program name and appropriate arguments. * with the program name and appropriate arguments.
*/ */
class Pty: public K3Process class Pty: public KPtyProcess
{ {
Q_OBJECT Q_OBJECT
public: public:
/** /**
* Constructs a new Pty. * Constructs a new Pty.
* *
* Connect to the sendData() slot and receivedData() signal to prepare * Connect to the sendData() slot and receivedData() signal to prepare
* for sending and receiving data from the terminal process. * for sending and receiving data from the terminal process.
* *
* To start the terminal process, call the run() method with the * To start the terminal process, call the run() method with the
* name of the program to start and appropriate arguments. * name of the program to start and appropriate arguments.
*/ */
Pty(); explicit Pty(QObject* parent = nullptr);
~Pty();
/** /**
* Starts the terminal process. * Construct a process using an open pty master.
* See KPtyProcess::KPtyProcess()
*/
explicit Pty(int ptyMasterFd, QObject* parent = nullptr);
~Pty() override;
/**
* Starts the terminal process.
* *
* Returns 0 if the process was started successfully or non-zero * Returns 0 if the process was started successfully or non-zero
* otherwise. * otherwise.
@ -82,43 +94,51 @@ Q_OBJECT
* @param winid Specifies the value of the WINDOWID environment variable * @param winid Specifies the value of the WINDOWID environment variable
* in the process's environment. * in the process's environment.
* @param addToUtmp Specifies whether a utmp entry should be created for * @param addToUtmp Specifies whether a utmp entry should be created for
* the pty used. See K3Process::setUsePty() * the pty used. See K3Process::setUsePty()
* @param dbusService Specifies the value of the KONSOLE_DBUS_SERVICE * @param dbusService Specifies the value of the KONSOLE_DBUS_SERVICE
* environment variable in the process's environment. * environment variable in the process's environment.
* @param dbusSession Specifies the value of the KONSOLE_DBUS_SESSION * @param dbusSession Specifies the value of the KONSOLE_DBUS_SESSION
* environment variable in the process's environment. * environment variable in the process's environment.
*/ */
int start( const QString& program, int start( const QString& program,
const QStringList& arguments, const QStringList& arguments,
const QStringList& environment, const QStringList& environment,
ulong winid, ulong winid,
bool addToUtmp bool addToUtmp
// const QString& dbusService,
// const QString& dbusSession
); );
/**
* set properties for "EmptyPTY"
*/
void setEmptyPTYProperties();
/** TODO: Document me */ /** TODO: Document me */
void setWriteable(bool writeable); void setWriteable(bool writeable);
/** /**
* Enables or disables Xon/Xoff flow control. * Enables or disables Xon/Xoff flow control. The flow control setting
* may be changed later by a terminal application, so flowControlEnabled()
* may not equal the value of @p on in the previous call to setFlowControlEnabled()
*/ */
void setXonXoff(bool on); void setFlowControlEnabled(bool on);
/** /** Queries the terminal state and returns true if Xon/Xoff flow control is enabled. */
* Sets the size of the window (in lines and columns of characters) bool flowControlEnabled() const;
/**
* Sets the size of the window (in lines and columns of characters)
* used by this teletype. * used by this teletype.
*/ */
void setWindowSize(int lines, int cols); void setWindowSize(int lines, int cols);
/** Returns the size of the window used by this teletype. See setWindowSize() */ /** Returns the size of the window used by this teletype. See setWindowSize() */
QSize windowSize() const; QSize windowSize() const;
/** TODO Document me */ /** TODO Document me */
void setErase(char erase); void setErase(char erase);
/** */ /** */
char erase() const; char erase() const;
/** /**
* Returns the process id of the teletype's current foreground * Returns the process id of the teletype's current foreground
@ -129,13 +149,6 @@ Q_OBJECT
* 0 will be returned. * 0 will be returned.
*/ */
int foregroundProcessGroup() const; int foregroundProcessGroup() const;
/**
* Returns whether the buffer used to send data to the
* terminal process is full.
*/
bool bufferFull() const { return _bufferFull; }
public slots: public slots:
@ -145,7 +158,7 @@ Q_OBJECT
void setUtf8Mode(bool on); void setUtf8Mode(bool on);
/** /**
* Suspend or resume processing of data from the standard * Suspend or resume processing of data from the standard
* output of the terminal process. * output of the terminal process.
* *
* See K3Process::suspend() and K3Process::resume() * See K3Process::suspend() and K3Process::resume()
@ -154,9 +167,9 @@ Q_OBJECT
* otherwise processing is resumed. * otherwise processing is resumed.
*/ */
void lockPty(bool lock); void lockPty(bool lock);
/** /**
* Sends data to the process currently controlling the * Sends data to the process currently controlling the
* teletype ( whose id is returned by foregroundProcessGroup() ) * teletype ( whose id is returned by foregroundProcessGroup() )
* *
* @param buffer Pointer to the data to send. * @param buffer Pointer to the data to send.
@ -166,13 +179,6 @@ Q_OBJECT
signals: signals:
/**
* Emitted when the terminal process terminates.
*
* @param exitCode The status code which the process exited with.
*/
void done(int exitCode);
/** /**
* Emitted when a new block of data is received from * Emitted when a new block of data is received from
* the teletype. * the teletype.
@ -181,61 +187,26 @@ Q_OBJECT
* @param length Length of @p buffer * @param length Length of @p buffer
*/ */
void receivedData(const char* buffer, int length); void receivedData(const char* buffer, int length);
#if QT_VERSION < 0x060000
/** protected:
* Emitted when the buffer used to send data to the terminal void setupChildProcess() override;
* process becomes empty, i.e. all data has been sent. #endif
*/
void bufferEmpty();
private slots: private slots:
// called when data is received from the terminal process
// called when terminal process exits void dataReceived();
void donePty();
// called when data is received from the terminal process
void dataReceived(K3Process*, char* buffer, int length);
// sends the first enqueued buffer of data to the
// terminal process
void doSendJobs();
// called when the terminal process is ready to
// receive more data
void writeReady();
private: private:
void init();
// takes a list of key=value pairs and adds them // takes a list of key=value pairs and adds them
// to the environment for the process // to the environment for the process
void addEnvironmentVariables(const QStringList& environment); void addEnvironmentVariables(const QStringList& environment);
// enqueues a buffer of data to be sent to the int _windowColumns;
// terminal process
void appendSendJob(const char* buffer, int length);
// a buffer of data in the queue to be sent to the
// terminal process
class SendJob {
public:
SendJob() {}
SendJob(const char* b, int len) : buffer(len)
{
memcpy( buffer.data() , b , len );
}
const char* data() const { return buffer.constData(); }
int length() const { return buffer.size(); }
private:
QVector<char> buffer;
};
QList<SendJob> _pendingSendJobs;
bool _bufferFull;
int _windowColumns;
int _windowLines; int _windowLines;
char _eraseChar; char _eraseChar;
bool _xonXoff; bool _xonXoff;
bool _utf8; bool _utf8;
KPty *_pty;
}; };
} }

1419
qtermwidget/lib/Screen.cpp 100644
View File

File diff suppressed because it is too large Load Diff

587
qtermwidget/src/Screen.h → qtermwidget/lib/Screen.h
View File

@ -1,10 +1,8 @@
/* /*
This file is part of Konsole, KDE's terminal. This file is part of Konsole, KDE's terminal.
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com> Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -26,9 +24,9 @@
#define SCREEN_H #define SCREEN_H
// Qt // Qt
#include <QtCore/QRect> #include <QRect>
#include <QtCore/QTextStream> #include <QTextStream>
#include <QtCore/QVarLengthArray> #include <QVarLengthArray>
// Konsole // Konsole
#include "Character.h" #include "Character.h"
@ -45,13 +43,6 @@
namespace Konsole namespace Konsole
{ {
/*!
*/
struct ScreenParm
{
int mode[MODES_SCREEN];
};
class TerminalCharacterDecoder; class TerminalCharacterDecoder;
/** /**
@ -61,21 +52,21 @@ class TerminalCharacterDecoder;
characters from the program currently running in the terminal. characters from the program currently running in the terminal.
From this stream it creates an image of characters which is ultimately From this stream it creates an image of characters which is ultimately
rendered by the display widget ( TerminalDisplay ). Some types of emulation rendered by the display widget ( TerminalDisplay ). Some types of emulation
may have more than one screen image. may have more than one screen image.
getImage() is used to retrieve the currently visible image getImage() is used to retrieve the currently visible image
which is then used by the display widget to draw the output from the which is then used by the display widget to draw the output from the
terminal. terminal.
The number of lines of output history which are kept in addition to the current The number of lines of output history which are kept in addition to the current
screen image depends on the history scroll being used to store the output. screen image depends on the history scroll being used to store the output.
The scroll is specified using setScroll() The scroll is specified using setScroll()
The output history can be retrieved using writeToStream() The output history can be retrieved using writeToStream()
The screen image has a selection associated with it, specified using The screen image has a selection associated with it, specified using
setSelectionStart() and setSelectionEnd(). The selected text can be retrieved setSelectionStart() and setSelectionEnd(). The selected text can be retrieved
using selectedText(). When getImage() is used to retrieve the the visible image, using selectedText(). When getImage() is used to retrieve the visible image,
characters which are part of the selection have their colours inverted. characters which are part of the selection have their colours inverted.
*/ */
class Screen class Screen
{ {
@ -84,74 +75,96 @@ public:
Screen(int lines, int columns); Screen(int lines, int columns);
~Screen(); ~Screen();
// VT100/2 Operations // VT100/2 Operations
// Cursor Movement // Cursor Movement
/** Move the cursor up by @p n lines. */ /**
void cursorUp (int n); * Move the cursor up by @p n lines. The cursor will stop at the
/** Move the cursor down by @p n lines. */ * top margin.
void cursorDown (int n); */
/** Move the cursor to the left by @p n columns. */ void cursorUp(int n);
void cursorLeft (int n); /**
/** Move the cursor to the right by @p n columns. */ * Move the cursor down by @p n lines. The cursor will stop at the
void cursorRight (int n); * bottom margin.
*/
void cursorDown(int n);
/**
* Move the cursor to the left by @p n columns.
* The cursor will stop at the first column.
*/
void cursorLeft(int n);
/**
* Moves cursor to beginning of the line by @p n lines down.
* The cursor will stop at the beginning of the line.
*/
void cursorNextLine(int n);
/**
* Moves cursor to beginning of the line by @p n lines up.
* The cursor will stop at the beginning of the line.
*/
void cursorPreviousLine(int n);
/**
* Move the cursor to the right by @p n columns.
* The cursor will stop at the right-most column.
*/
void cursorRight(int n);
/** Position the cursor on line @p y. */ /** Position the cursor on line @p y. */
void setCursorY (int y); void setCursorY(int y);
/** Position the cursor at column @p x. */ /** Position the cursor at column @p x. */
void setCursorX (int x); void setCursorX(int x);
/** Position the cursor at line @p y, column @p x. */ /** Position the cursor at line @p y, column @p x. */
void setCursorYX (int y, int x); void setCursorYX(int y, int x);
/** /**
* Sets the margins for scrolling the screen. * Sets the margins for scrolling the screen.
* *
* @param topLine The top line of the new scrolling margin. * @param topLine The top line of the new scrolling margin.
* @param bottomLine The bottom line of the new scrolling margin. * @param bottomLine The bottom line of the new scrolling margin.
*/ */
void setMargins (int topLine , int bottomLine); void setMargins(int topLine , int bottomLine);
/** Returns the top line of the scrolling region. */ /** Returns the top line of the scrolling region. */
int topMargin() const; int topMargin() const;
/** Returns the bottom line of the scrolling region. */ /** Returns the bottom line of the scrolling region. */
int bottomMargin() const; int bottomMargin() const;
/** /**
* Resets the scrolling margins back to the top and bottom lines * Resets the scrolling margins back to the top and bottom lines
* of the screen. * of the screen.
*/ */
void setDefaultMargins(); void setDefaultMargins();
/** /**
* Moves the cursor down one line, if the MODE_NewLine mode * Moves the cursor down one line, if the MODE_NewLine mode
* flag is enabled then the cursor is returned to the leftmost * flag is enabled then the cursor is returned to the leftmost
* column first. * column first.
* *
* Equivalent to NextLine() if the MODE_NewLine flag is set * Equivalent to NextLine() if the MODE_NewLine flag is set
* or index() otherwise. * or index() otherwise.
*/ */
void NewLine (); void newLine();
/** /**
* Moves the cursor down one line and positions it at the beginning * Moves the cursor down one line and positions it at the beginning
* of the line. * of the line. Equivalent to calling Return() followed by index()
*/ */
void NextLine (); void nextLine();
/** /**
* Move the cursor down one line. If the cursor is on the bottom * Move the cursor down one line. If the cursor is on the bottom
* line of the scrolling region (as returned by bottomMargin()) the * line of the scrolling region (as returned by bottomMargin()) the
* scrolling region is scrolled up by one line instead. * scrolling region is scrolled up by one line instead.
*/ */
void index (); void index();
/** /**
* Move the cursor up one line. If the cursor is on the top line * Move the cursor up one line. If the cursor is on the top line
* of the scrolling region (as returned by topMargin()) the scrolling * of the scrolling region (as returned by topMargin()) the scrolling
* region is scrolled down by one line instead. * region is scrolled down by one line instead.
*/ */
void reverseIndex(); void reverseIndex();
/** /**
* Scroll the scrolling region of the screen up by @p n lines. * Scroll the scrolling region of the screen up by @p n lines.
* The scrolling region is initially the whole screen, but can be changed * The scrolling region is initially the whole screen, but can be changed
* using setMargins() * using setMargins()
*/ */
void scrollUp(int n); void scrollUp(int n);
/** /**
* Scroll the scrolling region of the screen down by @p n lines. * Scroll the scrolling region of the screen down by @p n lines.
@ -159,89 +172,89 @@ public:
* using setMargins() * using setMargins()
*/ */
void scrollDown(int n); void scrollDown(int n);
/**
/** * Moves the cursor to the beginning of the current line.
* Moves the cursor to the beginning of the current line.
* Equivalent to setCursorX(0) * Equivalent to setCursorX(0)
*/ */
void Return (); void toStartOfLine();
/** /**
* Moves the cursor one column to the left and erases the character * Moves the cursor one column to the left and erases the character
* at the new cursor position. * at the new cursor position.
*/ */
void BackSpace (); void backspace();
/** /** Moves the cursor @p n tab-stops to the right. */
* Moves the cursor @p n tab-stops to the right. void tab(int n = 1);
*/ /** Moves the cursor @p n tab-stops to the left. */
void Tabulate (int n = 1); void backtab(int n);
/**
* Moves the cursor @p n tab-stops to the left.
*/
void backTabulate(int n);
// Editing // Editing
/** /**
* Erase @p n characters beginning from the current cursor position. * Erase @p n characters beginning from the current cursor position.
* This is equivalent to over-writing @p n characters starting with the current * This is equivalent to over-writing @p n characters starting with the current
* cursor position with spaces. * cursor position with spaces.
* If @p n is 0 then one character is erased. * If @p n is 0 then one character is erased.
*/ */
void eraseChars (int n); void eraseChars(int n);
/** /**
* Delete @p n characters beginning from the current cursor position. * Delete @p n characters beginning from the current cursor position.
* If @p n is 0 then one character is deleted. * If @p n is 0 then one character is deleted.
*/ */
void deleteChars (int n); void deleteChars(int n);
/** /**
* Insert @p n blank characters beginning from the current cursor position. * Insert @p n blank characters beginning from the current cursor position.
* The position of the cursor is not altered. * The position of the cursor is not altered.
* If @p n is 0 then one character is inserted. * If @p n is 0 then one character is inserted.
*/ */
void insertChars (int n); void insertChars(int n);
/** /**
* Repeat the preceding graphic character @count times, including SPACE.
* If @count is 0 then the character is repeated once.
*/
void repeatChars(int count);
/**
* Removes @p n lines beginning from the current cursor position. * Removes @p n lines beginning from the current cursor position.
* The position of the cursor is not altered. * The position of the cursor is not altered.
* If @p n is 0 then one line is removed. * If @p n is 0 then one line is removed.
*/ */
void deleteLines (int n); void deleteLines(int n);
/** /**
* Inserts @p lines beginning from the current cursor position. * Inserts @p lines beginning from the current cursor position.
* The position of the cursor is not altered. * The position of the cursor is not altered.
* If @p n is 0 then one line is inserted. * If @p n is 0 then one line is inserted.
*/ */
void insertLines (int n); void insertLines(int n);
/** Clears all the tab stops. */ /** Clears all the tab stops. */
void clearTabStops(); void clearTabStops();
/** Sets or removes a tab stop at the cursor's current column. */ /** Sets or removes a tab stop at the cursor's current column. */
void changeTabStop(bool set); void changeTabStop(bool set);
/** Resets (clears) the specified screen @p mode. */ /** Resets (clears) the specified screen @p mode. */
void resetMode (int mode); void resetMode(int mode);
/** Sets (enables) the specified screen @p mode. */ /** Sets (enables) the specified screen @p mode. */
void setMode (int mode); void setMode(int mode);
/** /**
* Saves the state of the specified screen @p mode. It can be restored * Saves the state of the specified screen @p mode. It can be restored
* using restoreMode() * using restoreMode()
*/ */
void saveMode (int mode); void saveMode(int mode);
/** Restores the state of a screen @p mode saved by calling saveMode() */ /** Restores the state of a screen @p mode saved by calling saveMode() */
void restoreMode (int mode); void restoreMode(int mode);
/** Returns whether the specified screen @p mode is enabled or not .*/ /** Returns whether the specified screen @p mode is enabled or not .*/
bool getMode (int mode) const; bool getMode(int mode) const;
/** /**
* Saves the current position and appearence (text color and style) of the cursor. * Saves the current position and appearance (text color and style) of the cursor.
* It can be restored by calling restoreCursor() * It can be restored by calling restoreCursor()
*/ */
void saveCursor (); void saveCursor();
/** Restores the position and appearence of the cursor. See saveCursor() */ /** Restores the position and appearance of the cursor. See saveCursor() */
void restoreCursor(); void restoreCursor();
/** Clear the whole screen, moving the current screen contents into the history first. */ /** Clear the whole screen, moving the current screen contents into the history first. */
void clearEntireScreen(); void clearEntireScreen();
/** /**
* Clear the area of the screen from the current cursor position to the end of * Clear the area of the screen from the current cursor position to the end of
* the screen. * the screen.
*/ */
void clearToEndOfScreen(); void clearToEndOfScreen();
@ -256,26 +269,26 @@ public:
void clearToEndOfLine(); void clearToEndOfLine();
/** Clears from the current cursor position to the beginning of the line. */ /** Clears from the current cursor position to the beginning of the line. */
void clearToBeginOfLine(); void clearToBeginOfLine();
/** Fills the entire screen with the letter 'E' */ /** Fills the entire screen with the letter 'E' */
void helpAlign (); void helpAlign();
/** /**
* Enables the given @p rendition flag. Rendition flags control the appearence * Enables the given @p rendition flag. Rendition flags control the appearance
* of characters on the screen. * of characters on the screen.
* *
* @see Character::rendition * @see Character::rendition
*/ */
void setRendition (int rendition); void setRendition(int rendition);
/** /**
* Disables the given @p rendition flag. Rendition flags control the appearence * Disables the given @p rendition flag. Rendition flags control the appearance
* of characters on the screen. * of characters on the screen.
* *
* @see Character::rendition * @see Character::rendition
*/ */
void resetRendition(int rendition); void resetRendition(int rendition);
/** /**
* Sets the cursor's foreground color. * Sets the cursor's foreground color.
* @param space The color space used by the @p color argument * @param space The color space used by the @p color argument
* @param color The new foreground color. The meaning of this depends on * @param color The new foreground color. The meaning of this depends on
@ -283,32 +296,34 @@ public:
* *
* @see CharacterColor * @see CharacterColor
*/ */
void setForeColor (int space, int color); void setForeColor(int space, int color);
/** /**
* Sets the cursor's background color. * Sets the cursor's background color.
* @param space The color space used by the @p color argumnet. * @param space The color space used by the @p color argument.
* @param color The new background color. The meaning of this depends on * @param color The new background color. The meaning of this depends on
* the color @p space used. * the color @p space used.
* *
* @see CharacterColor * @see CharacterColor
*/ */
void setBackColor (int space, int color); void setBackColor(int space, int color);
/** /**
* Resets the cursor's color back to the default and sets the * Resets the cursor's color back to the default and sets the
* character's rendition flags back to the default settings. * character's rendition flags back to the default settings.
*/ */
void setDefaultRendition(); void setDefaultRendition();
/** Returns the column which the cursor is positioned at. */ /** Returns the column which the cursor is positioned at. */
int getCursorX() const; int getCursorX() const;
/** Returns the line which the cursor is positioned on. */ /** Returns the line which the cursor is positioned on. */
int getCursorY() const; int getCursorY() const;
/** TODO Document me */ /** Clear the entire screen and move the cursor to the home position.
void clear(); * Equivalent to calling clearEntireScreen() followed by home().
/** */
void clear();
/**
* Sets the position of the cursor to the 'home' position at the top-left * Sets the position of the cursor to the 'home' position at the top-left
* corner of the screen (0,0) * corner of the screen (0,0)
*/ */
void home(); void home();
/** /**
@ -325,40 +340,41 @@ public:
* <li>New line mode is disabled. TODO Document me</li> * <li>New line mode is disabled. TODO Document me</li>
* </ul> * </ul>
* *
* If @p clearScreen is true then the screen contents are erased entirely, * If @p clearScreen is true then the screen contents are erased entirely,
* otherwise they are unaltered. * otherwise they are unaltered.
*/ */
void reset(bool clearScreen = true); void reset(bool clearScreen = true);
/** /**
* Displays a new character at the current cursor position. * Displays a new character at the current cursor position.
* *
* If the cursor is currently positioned at the right-edge of the screen and * If the cursor is currently positioned at the right-edge of the screen and
* line wrapping is enabled then the character is added at the start of a new * line wrapping is enabled then the character is added at the start of a new
* line below the current one. * line below the current one.
* *
* If the MODE_Insert screen mode is currently enabled then the character * If the MODE_Insert screen mode is currently enabled then the character
* is inserted at the current cursor position, otherwise it will replace the * is inserted at the current cursor position, otherwise it will replace the
* character already at the current cursor position. * character already at the current cursor position.
*/ */
void ShowCharacter(unsigned short c); void displayCharacter(wchar_t c);
// Do composition with last shown character FIXME: Not implemented yet for KDE 4 // Do composition with last shown character FIXME: Not implemented yet for KDE 4
void compose(const QString& compose); void compose(const QString& compose);
/** /**
* Resizes the image to a new fixed size of @p new_lines by @p new_columns. * Resizes the image to a new fixed size of @p new_lines by @p new_columns.
* In the case that @p new_columns is smaller than the current number of columns, * In the case that @p new_columns is smaller than the current number of columns,
* existing lines are not truncated. This prevents characters from being lost * existing lines are not truncated. This prevents characters from being lost
* if the terminal display is resized smaller and then larger again. * if the terminal display is resized smaller and then larger again.
* *
* (note that in versions of Konsole prior to KDE 4, existing lines were * The top and bottom margins are reset to the top and bottom of the new
* truncated when making the screen image smaller) * screen size. Tab stops are also reset and the current selection is
* cleared.
*/ */
void resizeImage(int new_lines, int new_columns); void resizeImage(int new_lines, int new_columns);
/** /**
* Returns the current screen image. * Returns the current screen image.
* The result is an array of Characters of size [getLines()][getColumns()] which * The result is an array of Characters of size [getLines()][getColumns()] which
* must be freed by the caller after use. * must be freed by the caller after use.
* *
@ -369,148 +385,153 @@ public:
*/ */
void getImage( Character* dest , int size , int startLine , int endLine ) const; void getImage( Character* dest , int size , int startLine , int endLine ) const;
/** /**
* Returns the additional attributes associated with lines in the image. * Returns the additional attributes associated with lines in the image.
* The most important attribute is LINE_WRAPPED which specifies that the * The most important attribute is LINE_WRAPPED which specifies that the
* line is wrapped, * line is wrapped,
* other attributes control the size of characters in the line. * other attributes control the size of characters in the line.
*/ */
QVector<LineProperty> getLineProperties( int startLine , int endLine ) const; QVector<LineProperty> getLineProperties( int startLine , int endLine ) const;
/** Return the number of lines. */ /** Return the number of lines. */
int getLines() { return lines; } int getLines() const
{ return lines; }
/** Return the number of columns. */ /** Return the number of columns. */
int getColumns() { return columns; } int getColumns() const
{ return columns; }
/** Return the number of lines in the history buffer. */ /** Return the number of lines in the history buffer. */
int getHistLines (); int getHistLines() const;
/** /**
* Sets the type of storage used to keep lines in the history. * Sets the type of storage used to keep lines in the history.
* If @p copyPreviousScroll is true then the contents of the previous * If @p copyPreviousScroll is true then the contents of the previous
* history buffer are copied into the new scroll. * history buffer are copied into the new scroll.
*/ */
void setScroll(const HistoryType& , bool copyPreviousScroll = true); void setScroll(const HistoryType& , bool copyPreviousScroll = true);
/** Returns the type of storage used to keep lines in the history. */ /** Returns the type of storage used to keep lines in the history. */
const HistoryType& getScroll(); const HistoryType& getScroll() const;
/** /**
* Returns true if this screen keeps lines that are scrolled off the screen * Returns true if this screen keeps lines that are scrolled off the screen
* in a history buffer. * in a history buffer.
*/ */
bool hasScroll(); bool hasScroll() const;
/** /**
* Sets the start of the selection. * Sets the start of the selection.
* *
* @param column The column index of the first character in the selection. * @param column The column index of the first character in the selection.
* @param line The line index of the first character in the selection. * @param line The line index of the first character in the selection.
* @param columnmode True if the selection is in column mode. * @param blockSelectionMode True if the selection is in column mode.
*/ */
void setSelectionStart(const int column, const int line, const bool columnmode); void setSelectionStart(const int column, const int line, const bool blockSelectionMode);
/** /**
* Sets the end of the current selection. * Sets the end of the current selection.
* *
* @param column The column index of the last character in the selection. * @param column The column index of the last character in the selection.
* @param line The line index of the last character in the selection. * @param line The line index of the last character in the selection.
*/ */
void setSelectionEnd(const int column, const int line); void setSelectionEnd(const int column, const int line);
/** /**
* Retrieves the start of the selection or the cursor position if there * Retrieves the start of the selection or the cursor position if there
* is no selection. * is no selection.
*/ */
void getSelectionStart(int& column , int& line); void getSelectionStart(int& column , int& line) const;
/** /**
* Retrieves the end of the selection or the cursor position if there * Retrieves the end of the selection or the cursor position if there
* is no selection. * is no selection.
*/ */
void getSelectionEnd(int& column , int& line); void getSelectionEnd(int& column , int& line) const;
/** Clears the current selection */ /** Clears the current selection */
void clearSelection(); void clearSelection();
void setBusySelecting(bool busy) { sel_busy = busy; } /**
* Returns true if the character at (@p column, @p line) is part of the
/** * current selection.
* Returns true if the character at (@p column, @p line) is part of the */
* current selection.
*/
bool isSelected(const int column,const int line) const; bool isSelected(const int column,const int line) const;
/** /**
* Convenience method. Returns the currently selected text. * Convenience method. Returns the currently selected text.
* @param preserveLineBreaks Specifies whether new line characters should * @param preserveLineBreaks Specifies whether new line characters should
* be inserted into the returned text at the end of each terminal line. * be inserted into the returned text at the end of each terminal line.
*/ */
QString selectedText(bool preserveLineBreaks); QString selectedText(bool preserveLineBreaks) const;
/**
* Copies part of the output to a stream.
*
* @param decoder A decoder which coverts terminal characters into text
* @param from The first line in the history to retrieve
* @param to The last line in the history to retrieve
*/
void writeToStream(TerminalCharacterDecoder* decoder, int from, int to);
/** /**
* Sets the selection to line @p no in the history and returns * Copies part of the output to a stream.
* the text of that line from the history buffer. *
* @param decoder A decoder which converts terminal characters into text
* @param fromLine The first line in the history to retrieve
* @param toLine The last line in the history to retrieve
*/ */
QString getHistoryLine(int no); void writeLinesToStream(TerminalCharacterDecoder* decoder, int fromLine, int toLine) const;
/** /**
* Copies the selected characters, set using @see setSelBeginXY and @see setSelExtentXY * Copies the selected characters, set using @see setSelBeginXY and @see setSelExtentXY
* into a stream. * into a stream.
* *
* @param decoder A decoder which converts terminal characters into text. * @param decoder A decoder which converts terminal characters into text.
* PlainTextDecoder is the most commonly used decoder which coverts characters * PlainTextDecoder is the most commonly used decoder which converts characters
* into plain text with no formatting. * into plain text with no formatting.
* @param preserveLineBreaks Specifies whether new line characters should * @param preserveLineBreaks Specifies whether new line characters should
* be inserted into the returned text at the end of each terminal line. * be inserted into the returned text at the end of each terminal line.
*/ */
void writeSelectionToStream(TerminalCharacterDecoder* decoder , bool void writeSelectionToStream(TerminalCharacterDecoder* decoder , bool
preserveLineBreaks = true); preserveLineBreaks = true) const;
/** TODO Document me */ /**
* Checks if the text between from and to is inside the current
* selection. If this is the case, the selection is cleared. The
* from and to are coordinates in the current viewable window.
* The loc(x,y) macro can be used to generate these values from a
* column,line pair.
*
* @param from The start of the area to check.
* @param to The end of the area to check
*/
void checkSelection(int from, int to); void checkSelection(int from, int to);
/** /**
* Sets or clears an attribute of the current line. * Sets or clears an attribute of the current line.
* *
* @param property The attribute to set or clear * @param property The attribute to set or clear
* Possible properties are: * Possible properties are:
* LINE_WRAPPED: Specifies that the line is wrapped. * LINE_WRAPPED: Specifies that the line is wrapped.
* LINE_DOUBLEWIDTH: Specifies that the characters in the current line should be double the normal width. * LINE_DOUBLEWIDTH: Specifies that the characters in the current line
* LINE_DOUBLEHEIGHT:Specifies that the characters in the current line should be double the normal height. * should be double the normal width.
* LINE_DOUBLEHEIGHT:Specifies that the characters in the current line
* should be double the normal height.
* Double-height lines are formed of two lines containing the same characters, * Double-height lines are formed of two lines containing the same characters,
* with both having the LINE_DOUBLEHEIGHT attribute. This allows other parts of the * with both having the LINE_DOUBLEHEIGHT attribute.
* code to work on the assumption that all lines are the same height. * This allows other parts of the code to work on the
* * assumption that all lines are the same height.
* @param enable true to apply the attribute to the current line or false to remove it *
*/ * @param enable true to apply the attribute to the current line or false to remove it
void setLineProperty(LineProperty property , bool enable); */
void setLineProperty(LineProperty property , bool enable);
/**
/**
* Returns the number of lines that the image has been scrolled up or down by, * Returns the number of lines that the image has been scrolled up or down by,
* since the last call to resetScrolledLines(). * since the last call to resetScrolledLines().
* *
* a positive return value indicates that the image has been scrolled up, * a positive return value indicates that the image has been scrolled up,
* a negative return value indicates that the image has been scrolled down. * a negative return value indicates that the image has been scrolled down.
*/ */
int scrolledLines() const; int scrolledLines() const;
/** /**
* Returns the region of the image which was last scrolled. * Returns the region of the image which was last scrolled.
* *
* This is the area of the image from the top margin to the * This is the area of the image from the top margin to the
* bottom margin when the last scroll occurred. * bottom margin when the last scroll occurred.
*/ */
QRect lastScrolledRegion() const; QRect lastScrolledRegion() const;
/** /**
* Resets the count of the number of lines that the image has been scrolled up or down by, * Resets the count of the number of lines that the image has been scrolled up or down by,
* see scrolledLines() * see scrolledLines()
*/ */
@ -523,7 +544,7 @@ public:
* *
* If the history is not unlimited then it will drop * If the history is not unlimited then it will drop
* the oldest lines of output if new lines are added when * the oldest lines of output if new lines are added when
* it is full. * it is full.
*/ */
int droppedLines() const; int droppedLines() const;
@ -533,29 +554,34 @@ public:
*/ */
void resetDroppedLines(); void resetDroppedLines();
/** /**
* Fills the buffer @p dest with @p count instances of the default (ie. blank) * Fills the buffer @p dest with @p count instances of the default (ie. blank)
* Character style. * Character style.
*/ */
static void fillWithDefaultChar(Character* dest, int count); static void fillWithDefaultChar(Character* dest, int count);
private: private:
Screen(const Screen &) = delete;
Screen &operator=(const Screen &) = delete;
//copies a line of text from the screen or history into a stream using a //copies a line of text from the screen or history into a stream using a
//specified character decoder //specified character decoder. Returns the number of lines actually copied,
//line - the line number to copy, from 0 (the earliest line in the history) up to //which may be less than 'count' if (start+count) is more than the number of characters on
// hist->getLines() + lines - 1 //the line
//start - the first column on the line to copy //
//count - the number of characters on the line to copy //line - the line number to copy, from 0 (the earliest line in the history) up to
//decoder - a decoder which coverts terminal characters (an Character array) into text // history->getLines() + lines - 1
//start - the first column on the line to copy
//count - the number of characters on the line to copy
//decoder - a decoder which converts terminal characters (an Character array) into text
//appendNewLine - if true a new line character (\n) is appended to the end of the line //appendNewLine - if true a new line character (\n) is appended to the end of the line
void copyLineToStream(int line, int copyLineToStream(int line,
int start, int start,
int count, int count,
TerminalCharacterDecoder* decoder, TerminalCharacterDecoder* decoder,
bool appendNewLine, bool appendNewLine,
bool preserveLineBreaks); bool preserveLineBreaks) const;
//fills a section of the screen image with the character 'c' //fills a section of the screen image with the character 'c'
//the parameters are specified as offsets from the start of the screen image. //the parameters are specified as offsets from the start of the screen image.
//the loc(x,y) macro can be used to generate these values from a column,line pair. //the loc(x,y) macro can be used to generate these values from a column,line pair.
@ -564,26 +590,32 @@ private:
//move screen image between 'sourceBegin' and 'sourceEnd' to 'dest'. //move screen image between 'sourceBegin' and 'sourceEnd' to 'dest'.
//the parameters are specified as offsets from the start of the screen image. //the parameters are specified as offsets from the start of the screen image.
//the loc(x,y) macro can be used to generate these values from a column,line pair. //the loc(x,y) macro can be used to generate these values from a column,line pair.
//
//NOTE: moveImage() can only move whole lines
void moveImage(int dest, int sourceBegin, int sourceEnd); void moveImage(int dest, int sourceBegin, int sourceEnd);
// scroll up 'i' lines in current region, clearing the bottom 'i' lines
void scrollUp(int from, int i); void scrollUp(int from, int i);
// scroll down 'i' lines in current region, clearing the top 'i' lines
void scrollDown(int from, int i); void scrollDown(int from, int i);
void addHistLine(); void addHistLine();
void initTabStops(); void initTabStops();
void effectiveRendition(); void updateEffectiveRendition();
void reverseRendition(Character& p) const; void reverseRendition(Character& p) const;
bool isSelectionValid() const; bool isSelectionValid() const;
// copies text from 'startIndex' to 'endIndex' to a stream
// copies 'count' lines from the screen buffer into 'dest', // startIndex and endIndex are positions generated using the loc(x,y) macro
// starting from 'startLine', where 0 is the first line in the screen buffer void writeToStream(TerminalCharacterDecoder* decoder, int startIndex,
void copyFromScreen(Character* dest, int startLine, int count) const; int endIndex, bool preserveLineBreaks = true) const;
// copies 'count' lines from the history buffer into 'dest', // copies 'count' lines from the screen buffer into 'dest',
// starting from 'startLine', where 0 is the first line in the history // starting from 'startLine', where 0 is the first line in the screen buffer
void copyFromHistory(Character* dest, int startLine, int count) const; void copyFromScreen(Character* dest, int startLine, int count) const;
// copies 'count' lines from the history buffer into 'dest',
// starting from 'startLine', where 0 is the first line in the history
void copyFromHistory(Character* dest, int startLine, int count) const;
// screen image ---------------- // screen image ----------------
@ -598,61 +630,62 @@ private:
int _droppedLines; int _droppedLines;
QVarLengthArray<LineProperty,64> lineProperties; QVarLengthArray<LineProperty,64> lineProperties;
// history buffer --------------- // history buffer ---------------
HistoryScroll *hist; HistoryScroll* history;
// cursor location // cursor location
int cuX; int cuX;
int cuY; int cuY;
// cursor color and rendition info // cursor color and rendition info
CharacterColor cu_fg; // foreground CharacterColor currentForeground;
CharacterColor cu_bg; // background CharacterColor currentBackground;
quint8 cu_re; // rendition quint8 currentRendition;
// margins ---------------- // margins ----------------
int tmargin; // top margin int _topMargin;
int bmargin; // bottom margin int _bottomMargin;
// states ---------------- // states ----------------
ScreenParm currParm; bool currentModes[MODES_SCREEN];
bool savedModes[MODES_SCREEN];
// ---------------------------- // ----------------------------
bool* tabstops; QBitArray tabStops;
// selection ------------------- // selection -------------------
int sel_begin; // The first location selected. int selBegin; // The first location selected.
int sel_TL; // TopLeft Location. int selTopLeft; // TopLeft Location.
int sel_BR; // Bottom Right Location. int selBottomRight; // Bottom Right Location.
bool sel_busy; // Busy making a selection. bool blockSelectionMode; // Column selection mode
bool columnmode; // Column selection mode
// effective colors and rendition ------------ // effective colors and rendition ------------
CharacterColor ef_fg; // These are derived from CharacterColor effectiveForeground; // These are derived from
CharacterColor ef_bg; // the cu_* variables above CharacterColor effectiveBackground; // the cu_* variables above
quint8 ef_re; // to speed up operation quint8 effectiveRendition; // to speed up operation
// class SavedState
// save cursor, rendition & states ------------ {
// public:
SavedState()
: cursorColumn(0),cursorLine(0),rendition(0) {}
// cursor location int cursorColumn;
int sa_cuX; int cursorLine;
int sa_cuY; quint8 rendition;
CharacterColor foreground;
CharacterColor background;
};
SavedState savedState;
// rendition info
quint8 sa_cu_re;
CharacterColor sa_cu_fg;
CharacterColor sa_cu_bg;
// last position where we added a character // last position where we added a character
int lastPos; int lastPos;
// modes // used in REP (repeating char)
ScreenParm saveParm; unsigned short lastDrawnChar;
static Character defaultChar; static Character defaultChar;
}; };

175
qtermwidget/src/ScreenWindow.cpp → qtermwidget/lib/ScreenWindow.cpp
View File

@ -1,8 +1,6 @@
/* /*
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com> Copyright (C) 2007 by Robert Knight <robertknight@gmail.com>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
@ -23,20 +21,20 @@
#include "ScreenWindow.h" #include "ScreenWindow.h"
// Qt // Qt
#include <QtCore> #include <QtDebug>
// Konsole // Konsole
#include "Screen.h" #include "Screen.h"
using namespace Konsole; using namespace Konsole;
ScreenWindow::ScreenWindow(QObject* parent) ScreenWindow::ScreenWindow(QObject* parent)
: QObject(parent) : QObject(parent)
, _windowBuffer(0) , _screen(nullptr)
, _windowBufferSize(0) , _windowBuffer(nullptr)
, _bufferNeedsUpdate(true) , _windowBufferSize(0)
, _windowLines(1) , _bufferNeedsUpdate(true)
, _windowLines(1)
, _currentLine(0) , _currentLine(0)
, _trackOutput(true) , _trackOutput(true)
, _scrollCount(0) , _scrollCount(0)
@ -44,7 +42,7 @@ ScreenWindow::ScreenWindow(QObject* parent)
} }
ScreenWindow::~ScreenWindow() ScreenWindow::~ScreenWindow()
{ {
delete[] _windowBuffer; delete[] _windowBuffer;
} }
void ScreenWindow::setScreen(Screen* screen) void ScreenWindow::setScreen(Screen* screen)
{ {
@ -60,43 +58,43 @@ Screen* ScreenWindow::screen() const
Character* ScreenWindow::getImage() Character* ScreenWindow::getImage()
{ {
// reallocate internal buffer if the window size has changed // reallocate internal buffer if the window size has changed
int size = windowLines() * windowColumns(); int size = windowLines() * windowColumns();
if (_windowBuffer == 0 || _windowBufferSize != size) if (_windowBuffer == nullptr || _windowBufferSize != size)
{ {
delete[] _windowBuffer; delete[] _windowBuffer;
_windowBufferSize = size; _windowBufferSize = size;
_windowBuffer = new Character[size]; _windowBuffer = new Character[size];
_bufferNeedsUpdate = true; _bufferNeedsUpdate = true;
} }
if (!_bufferNeedsUpdate) if (!_bufferNeedsUpdate)
return _windowBuffer; return _windowBuffer;
_screen->getImage(_windowBuffer,size,
currentLine(),endWindowLine());
// this window may look beyond the end of the screen, in which _screen->getImage(_windowBuffer,size,
// case there will be an unused area which needs to be filled currentLine(),endWindowLine());
// with blank characters
fillUnusedArea();
_bufferNeedsUpdate = false; // this window may look beyond the end of the screen, in which
return _windowBuffer; // case there will be an unused area which needs to be filled
// with blank characters
fillUnusedArea();
_bufferNeedsUpdate = false;
return _windowBuffer;
} }
void ScreenWindow::fillUnusedArea() void ScreenWindow::fillUnusedArea()
{ {
int screenEndLine = _screen->getHistLines() + _screen->getLines() - 1; int screenEndLine = _screen->getHistLines() + _screen->getLines() - 1;
int windowEndLine = currentLine() + windowLines() - 1; int windowEndLine = currentLine() + windowLines() - 1;
int unusedLines = windowEndLine - screenEndLine; int unusedLines = windowEndLine - screenEndLine;
int charsToFill = unusedLines * windowColumns(); int charsToFill = unusedLines * windowColumns();
Screen::fillWithDefaultChar(_windowBuffer + _windowBufferSize - charsToFill,charsToFill); Screen::fillWithDefaultChar(_windowBuffer + _windowBufferSize - charsToFill,charsToFill);
} }
// return the index of the line at the end of this window, or if this window // return the index of the line at the end of this window, or if this window
// goes beyond the end of the screen, the index of the line at the end // goes beyond the end of the screen, the index of the line at the end
// of the screen. // of the screen.
// //
@ -105,17 +103,17 @@ void ScreenWindow::fillUnusedArea()
// //
int ScreenWindow::endWindowLine() const int ScreenWindow::endWindowLine() const
{ {
return qMin(currentLine() + windowLines() - 1, return qMin(currentLine() + windowLines() - 1,
lineCount() - 1); lineCount() - 1);
} }
QVector<LineProperty> ScreenWindow::getLineProperties() QVector<LineProperty> ScreenWindow::getLineProperties()
{ {
QVector<LineProperty> result = _screen->getLineProperties(currentLine(),endWindowLine()); QVector<LineProperty> result = _screen->getLineProperties(currentLine(),endWindowLine());
if (result.count() != windowLines())
result.resize(windowLines());
return result; if (result.count() != windowLines())
result.resize(windowLines());
return result;
} }
QString ScreenWindow::selectedText( bool preserveLineBreaks ) const QString ScreenWindow::selectedText( bool preserveLineBreaks ) const
@ -136,8 +134,8 @@ void ScreenWindow::getSelectionEnd( int& column , int& line )
void ScreenWindow::setSelectionStart( int column , int line , bool columnMode ) void ScreenWindow::setSelectionStart( int column , int line , bool columnMode )
{ {
_screen->setSelectionStart( column , qMin(line + currentLine(),endWindowLine()) , columnMode); _screen->setSelectionStart( column , qMin(line + currentLine(),endWindowLine()) , columnMode);
_bufferNeedsUpdate = true; _bufferNeedsUpdate = true;
emit selectionChanged(); emit selectionChanged();
} }
@ -145,7 +143,7 @@ void ScreenWindow::setSelectionEnd( int column , int line )
{ {
_screen->setSelectionEnd( column , qMin(line + currentLine(),endWindowLine()) ); _screen->setSelectionEnd( column , qMin(line + currentLine(),endWindowLine()) );
_bufferNeedsUpdate = true; _bufferNeedsUpdate = true;
emit selectionChanged(); emit selectionChanged();
} }
@ -163,12 +161,12 @@ void ScreenWindow::clearSelection()
void ScreenWindow::setWindowLines(int lines) void ScreenWindow::setWindowLines(int lines)
{ {
Q_ASSERT(lines > 0); Q_ASSERT(lines > 0);
_windowLines = lines; _windowLines = lines;
} }
int ScreenWindow::windowLines() const int ScreenWindow::windowLines() const
{ {
return _windowLines; return _windowLines;
} }
int ScreenWindow::windowColumns() const int ScreenWindow::windowColumns() const
@ -189,11 +187,11 @@ int ScreenWindow::columnCount() const
QPoint ScreenWindow::cursorPosition() const QPoint ScreenWindow::cursorPosition() const
{ {
QPoint position; QPoint position;
position.setX( _screen->getCursorX() ); position.setX( _screen->getCursorX() );
position.setY( _screen->getCursorY() ); position.setY( _screen->getCursorY() );
return position; return position;
} }
int ScreenWindow::currentLine() const int ScreenWindow::currentLine() const
@ -209,7 +207,7 @@ void ScreenWindow::scrollBy( RelativeScrollMode mode , int amount )
} }
else if ( mode == ScrollPages ) else if ( mode == ScrollPages )
{ {
scrollTo( currentLine() + amount * ( windowLines() / 2 ) ); scrollTo( currentLine() + amount * ( windowLines() / 2 ) );
} }
} }
@ -220,8 +218,8 @@ bool ScreenWindow::atEndOfOutput() const
void ScreenWindow::scrollTo( int line ) void ScreenWindow::scrollTo( int line )
{ {
int maxCurrentLineNumber = lineCount() - windowLines(); int maxCurrentLineNumber = lineCount() - windowLines();
line = qBound(0,line,maxCurrentLineNumber); line = qBound(0,line,maxCurrentLineNumber);
const int delta = line - _currentLine; const int delta = line - _currentLine;
_currentLine = line; _currentLine = line;
@ -250,19 +248,19 @@ int ScreenWindow::scrollCount() const
return _scrollCount; return _scrollCount;
} }
void ScreenWindow::resetScrollCount() void ScreenWindow::resetScrollCount()
{ {
_scrollCount = 0; _scrollCount = 0;
} }
QRect ScreenWindow::scrollRegion() const QRect ScreenWindow::scrollRegion() const
{ {
bool equalToScreenSize = windowLines() == _screen->getLines(); bool equalToScreenSize = windowLines() == _screen->getLines();
if ( atEndOfOutput() && equalToScreenSize ) if ( atEndOfOutput() && equalToScreenSize )
return _screen->lastScrolledRegion(); return _screen->lastScrolledRegion();
else else
return QRect(0,0,windowColumns(),windowLines()); return {0,0,windowColumns(),windowLines()};
} }
void ScreenWindow::notifyOutputChanged() void ScreenWindow::notifyOutputChanged()
@ -270,18 +268,18 @@ void ScreenWindow::notifyOutputChanged()
// move window to the bottom of the screen and update scroll count // move window to the bottom of the screen and update scroll count
// if this window is currently tracking the bottom of the screen // if this window is currently tracking the bottom of the screen
if ( _trackOutput ) if ( _trackOutput )
{ {
_scrollCount -= _screen->scrolledLines(); _scrollCount -= _screen->scrolledLines();
_currentLine = qMax(0,_screen->getHistLines() - (windowLines()-_screen->getLines())); _currentLine = qMax(0,_screen->getHistLines() - (windowLines()-_screen->getLines()));
} }
else else
{ {
// if the history is not unlimited then it may // if the history is not unlimited then it may
// have run out of space and dropped the oldest // have run out of space and dropped the oldest
// lines of output - in this case the screen // lines of output - in this case the screen
// window's current line number will need to // window's current line number will need to
// be adjusted - otherwise the output will scroll // be adjusted - otherwise the output will scroll
_currentLine = qMax(0,_currentLine - _currentLine = qMax(0,_currentLine -
_screen->droppedLines()); _screen->droppedLines());
// ensure that the screen window's current position does // ensure that the screen window's current position does
@ -289,9 +287,56 @@ void ScreenWindow::notifyOutputChanged()
_currentLine = qMin( _currentLine , _screen->getHistLines() ); _currentLine = qMin( _currentLine , _screen->getHistLines() );
} }
_bufferNeedsUpdate = true; _bufferNeedsUpdate = true;
emit outputChanged(); emit outputChanged();
} }
//#include "moc_ScreenWindow.cpp" void ScreenWindow::handleCommandFromKeyboard(KeyboardTranslator::Command command)
{
// Keyboard-based navigation
bool update = false;
// EraseCommand is handled in Vt102Emulation
if ( command & KeyboardTranslator::ScrollPageUpCommand )
{
scrollBy( ScreenWindow::ScrollPages , -1 );
update = true;
}
if ( command & KeyboardTranslator::ScrollPageDownCommand )
{
scrollBy( ScreenWindow::ScrollPages , 1 );
update = true;
}
if ( command & KeyboardTranslator::ScrollLineUpCommand )
{
scrollBy( ScreenWindow::ScrollLines , -1 );
update = true;
}
if ( command & KeyboardTranslator::ScrollLineDownCommand )
{
scrollBy( ScreenWindow::ScrollLines , 1 );
update = true;
}
if ( command & KeyboardTranslator::ScrollDownToBottomCommand )
{
Q_EMIT scrollToEnd();
update = true;
}
if ( command & KeyboardTranslator::ScrollUpToTopCommand)
{
scrollTo(0);
update = true;
}
// TODO: KeyboardTranslator::ScrollLockCommand
// TODO: KeyboardTranslator::SendCommand
if ( update )
{
setTrackOutput( atEndOfOutput() );
Q_EMIT outputChanged();
}
}
//#include "ScreenWindow.moc"

108
qtermwidget/src/ScreenWindow.h → qtermwidget/lib/ScreenWindow.h
View File

@ -1,7 +1,5 @@
/* /*
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com> Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -23,12 +21,13 @@
#define SCREENWINDOW_H #define SCREENWINDOW_H
// Qt // Qt
#include <QtCore/QObject> #include <QObject>
#include <QtCore/QPoint> #include <QPoint>
#include <QtCore/QRect> #include <QRect>
// Konsole // Konsole
#include "Character.h" #include "Character.h"
#include "KeyboardTranslator.h"
namespace Konsole namespace Konsole
{ {
@ -36,13 +35,14 @@ namespace Konsole
class Screen; class Screen;
/** /**
* Provides a window onto a section of a terminal screen. * Provides a window onto a section of a terminal screen. A terminal widget can then render
* This window can then be rendered by a terminal display widget ( TerminalDisplay ). * the contents of the window and use the window to change the terminal screen's selection
* in response to mouse or keyboard input.
*
* A new ScreenWindow for a terminal session can be created by calling Emulation::createWindow()
* *
* To use the screen window, create a new ScreenWindow() instance and associated it with
* a terminal screen using setScreen().
* Use the scrollTo() method to scroll the window up and down on the screen. * Use the scrollTo() method to scroll the window up and down on the screen.
* Call the getImage() method to retrieve the character image which is currently visible in the window. * Use the getImage() method to retrieve the character image which is currently visible in the window.
* *
* setTrackOutput() controls whether the window moves to the bottom of the associated screen when new * setTrackOutput() controls whether the window moves to the bottom of the associated screen when new
* lines are added to it. * lines are added to it.
@ -56,7 +56,7 @@ class ScreenWindow : public QObject
Q_OBJECT Q_OBJECT
public: public:
/** /**
* Constructs a new screen window with the given parent. * Constructs a new screen window with the given parent.
* A screen must be specified by calling setScreen() before calling getImage() or getLineProperties(). * A screen must be specified by calling setScreen() before calling getImage() or getLineProperties().
* *
@ -65,19 +65,19 @@ public:
* to notify the window when the associated screen has changed and synchronize selection updates * to notify the window when the associated screen has changed and synchronize selection updates
* between all views on a session. * between all views on a session.
*/ */
ScreenWindow(QObject* parent = 0); ScreenWindow(QObject* parent = nullptr);
virtual ~ScreenWindow(); ~ScreenWindow() override;
/** Sets the screen which this window looks onto */ /** Sets the screen which this window looks onto */
void setScreen(Screen* screen); void setScreen(Screen* screen);
/** Returns the screen which this window looks onto */ /** Returns the screen which this window looks onto */
Screen* screen() const; Screen* screen() const;
/** /**
* Returns the image of characters which are currently visible through this window * Returns the image of characters which are currently visible through this window
* onto the screen. * onto the screen.
* *
* The buffer is managed by the ScreenWindow instance and does not need to be * The returned buffer is managed by the ScreenWindow instance and does not need to be
* deleted by the caller. * deleted by the caller.
*/ */
Character* getImage(); Character* getImage();
@ -90,14 +90,14 @@ public:
/** /**
* Returns the number of lines which the region of the window * Returns the number of lines which the region of the window
* specified by scrollRegion() has been scrolled by since the last call * specified by scrollRegion() has been scrolled by since the last call
* to resetScrollCount(). scrollRegion() is in most cases the * to resetScrollCount(). scrollRegion() is in most cases the
* whole window, but will be a smaller area in, for example, applications * whole window, but will be a smaller area in, for example, applications
* which provide split-screen facilities. * which provide split-screen facilities.
* *
* This is not guaranteed to be accurate, but allows views to optimise * This is not guaranteed to be accurate, but allows views to optimize
* rendering by reducing the amount of costly text rendering that * rendering by reducing the amount of costly text rendering that
* needs to be done when the output is scrolled. * needs to be done when the output is scrolled.
*/ */
int scrollCount() const; int scrollCount() const;
@ -107,16 +107,16 @@ public:
void resetScrollCount(); void resetScrollCount();
/** /**
* Returns the area of the window which was last scrolled, this is * Returns the area of the window which was last scrolled, this is
* usually the whole window area. * usually the whole window area.
* *
* Like scrollCount(), this is not guaranteed to be accurate, * Like scrollCount(), this is not guaranteed to be accurate,
* but allows views to optimise rendering. * but allows views to optimize rendering.
*/ */
QRect scrollRegion() const; QRect scrollRegion() const;
/** /**
* Sets the start of the selection to the given @p line and @p column within * Sets the start of the selection to the given @p line and @p column within
* the window. * the window.
*/ */
void setSelectionStart( int column , int line , bool columnMode ); void setSelectionStart( int column , int line , bool columnMode );
@ -124,7 +124,7 @@ public:
* Sets the end of the selection to the given @p line and @p column within * Sets the end of the selection to the given @p line and @p column within
* the window. * the window.
*/ */
void setSelectionEnd( int column , int line ); void setSelectionEnd( int column , int line );
/** /**
* Retrieves the start of the selection within the window. * Retrieves the start of the selection within the window.
*/ */
@ -137,18 +137,18 @@ public:
* Returns true if the character at @p line , @p column is part of the selection. * Returns true if the character at @p line , @p column is part of the selection.
*/ */
bool isSelected( int column , int line ); bool isSelected( int column , int line );
/** /**
* Clears the current selection * Clears the current selection
*/ */
void clearSelection(); void clearSelection();
/** Sets the number of lines in the window */ /** Sets the number of lines in the window */
void setWindowLines(int lines); void setWindowLines(int lines);
/** Returns the number of lines in the window */ /** Returns the number of lines in the window */
int windowLines() const; int windowLines() const;
/** Returns the number of columns in the window */ /** Returns the number of columns in the window */
int windowColumns() const; int windowColumns() const;
/** Returns the total number of lines in the screen */ /** Returns the total number of lines in the screen */
int lineCount() const; int lineCount() const;
/** Returns the total number of columns in the screen */ /** Returns the total number of columns in the screen */
@ -157,13 +157,13 @@ public:
/** Returns the index of the line which is currently at the top of this window */ /** Returns the index of the line which is currently at the top of this window */
int currentLine() const; int currentLine() const;
/** /**
* Returns the position of the cursor * Returns the position of the cursor
* within the window. * within the window.
*/ */
QPoint cursorPosition() const; QPoint cursorPosition() const;
/** /**
* Convenience method. Returns true if the window is currently at the bottom * Convenience method. Returns true if the window is currently at the bottom
* of the screen. * of the screen.
*/ */
@ -172,32 +172,38 @@ public:
/** Scrolls the window so that @p line is at the top of the window */ /** Scrolls the window so that @p line is at the top of the window */
void scrollTo( int line ); void scrollTo( int line );
/** Describes the units which scrollBy() moves the window by. */
enum RelativeScrollMode enum RelativeScrollMode
{ {
/** Scroll the window down by a given number of lines. */
ScrollLines, ScrollLines,
/**
* Scroll the window down by a given number of pages, where
* one page is windowLines() lines
*/
ScrollPages ScrollPages
}; };
/** /**
* Scrolls the window relative to its current position on the screen. * Scrolls the window relative to its current position on the screen.
* *
* @param mode Specifies whether @p amount refers to the number of lines or the number * @param mode Specifies whether @p amount refers to the number of lines or the number
* of pages to scroll. * of pages to scroll.
* @param amount The number of lines or pages ( depending on @p mode ) to scroll by. If * @param amount The number of lines or pages ( depending on @p mode ) to scroll by. If
* this number is positive, the view is scrolled down. If this number is negative, the view * this number is positive, the view is scrolled down. If this number is negative, the view
* is scrolled up. * is scrolled up.
*/ */
void scrollBy( RelativeScrollMode mode , int amount ); void scrollBy( RelativeScrollMode mode , int amount );
/** /**
* Specifies whether the window should automatically move to the bottom * Specifies whether the window should automatically move to the bottom
* of the screen when new output is added. * of the screen when new output is added.
* *
* If this is set to true, the window will be moved to the bottom of the associated screen ( see * If this is set to true, the window will be moved to the bottom of the associated screen ( see
* screen() ) when the notifyOutputChanged() method is called. * screen() ) when the notifyOutputChanged() method is called.
*/ */
void setTrackOutput(bool trackOutput); void setTrackOutput(bool trackOutput);
/** /**
* Returns whether the window automatically moves to the bottom of the screen as * Returns whether the window automatically moves to the bottom of the screen as
* new output is added. See setTrackOutput() * new output is added. See setTrackOutput()
*/ */
@ -211,43 +217,45 @@ public:
QString selectedText( bool preserveLineBreaks ) const; QString selectedText( bool preserveLineBreaks ) const;
public slots: public slots:
/** /**
* Notifies the window that the contents of the associated terminal screen have changed. * Notifies the window that the contents of the associated terminal screen have changed.
* This moves the window to the bottom of the screen if trackOutput() is true and causes * This moves the window to the bottom of the screen if trackOutput() is true and causes
* the outputChanged() signal to be emitted. * the outputChanged() signal to be emitted.
*/ */
void notifyOutputChanged(); void notifyOutputChanged();
void handleCommandFromKeyboard(KeyboardTranslator::Command command);
signals: signals:
/** /**
* Emitted when the contents of the associated terminal screen ( see screen() ) changes. * Emitted when the contents of the associated terminal screen (see screen()) changes.
*/ */
void outputChanged(); void outputChanged();
/** /**
* Emitted when the screen window is scrolled to a different position. * Emitted when the screen window is scrolled to a different position.
* *
* @param line The line which is now at the top of the window. * @param line The line which is now at the top of the window.
*/ */
void scrolled(int line); void scrolled(int line);
/** /** Emitted when the selection is changed. */
* Emitted when the selection is changed.
*/
void selectionChanged(); void selectionChanged();
void scrollToEnd();
private: private:
int endWindowLine() const; int endWindowLine() const;
void fillUnusedArea(); void fillUnusedArea();
Screen* _screen; // see setScreen() , screen() Screen* _screen; // see setScreen() , screen()
Character* _windowBuffer; Character* _windowBuffer;
int _windowBufferSize; int _windowBufferSize;
bool _bufferNeedsUpdate; bool _bufferNeedsUpdate;
int _windowLines; int _windowLines;
int _currentLine; // see scrollTo() , currentLine() int _currentLine; // see scrollTo() , currentLine()
bool _trackOutput; // see setTrackOutput() , trackOutput() bool _trackOutput; // see setTrackOutput() , trackOutput()
int _scrollCount; // count of lines which the window has been scrolled by since int _scrollCount; // count of lines which the window has been scrolled by since
// the last call to resetScrollCount() // the last call to resetScrollCount()
}; };

131
qtermwidget/lib/SearchBar.cpp 100644
View File

@ -0,0 +1,131 @@
/*
Copyright 2013 Christian Surlykke
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
#include <QMenu>
#include <QAction>
#if QT_VERSION > 0x060000
#include <QRegularExpression>
#else
#include <QRegExp>
#endif
#include <QDebug>
#include "SearchBar.h"
SearchBar::SearchBar(QWidget *parent) : QWidget(parent)
{
widget.setupUi(this);
setAutoFillBackground(true); // make it always opaque, especially inside translucent windows
connect(widget.closeButton, &QAbstractButton::clicked, this, &SearchBar::hide);
connect(widget.searchTextEdit, SIGNAL(textChanged(QString)), this, SIGNAL(searchCriteriaChanged()));
connect(widget.findPreviousButton, SIGNAL(clicked()), this, SIGNAL(findPrevious()));
connect(widget.findNextButton, SIGNAL(clicked()), this, SIGNAL(findNext()));
connect(this, SIGNAL(searchCriteriaChanged()), this, SLOT(clearBackgroundColor()));
QMenu *optionsMenu = new QMenu(widget.optionsButton);
widget.optionsButton->setMenu(optionsMenu);
m_matchCaseMenuEntry = optionsMenu->addAction(tr("Match case"));
m_matchCaseMenuEntry->setCheckable(true);
m_matchCaseMenuEntry->setChecked(true);
connect(m_matchCaseMenuEntry, SIGNAL(toggled(bool)), this, SIGNAL(searchCriteriaChanged()));
m_useRegularExpressionMenuEntry = optionsMenu->addAction(tr("Regular expression"));
m_useRegularExpressionMenuEntry->setCheckable(true);
connect(m_useRegularExpressionMenuEntry, SIGNAL(toggled(bool)), this, SIGNAL(searchCriteriaChanged()));
m_highlightMatchesMenuEntry = optionsMenu->addAction(tr("Highlight all matches"));
m_highlightMatchesMenuEntry->setCheckable(true);
m_highlightMatchesMenuEntry->setChecked(true);
connect(m_highlightMatchesMenuEntry, SIGNAL(toggled(bool)), this, SIGNAL(highlightMatchesChanged(bool)));
}
SearchBar::~SearchBar() {
}
QString SearchBar::searchText()
{
return widget.searchTextEdit->text();
}
bool SearchBar::useRegularExpression()
{
return m_useRegularExpressionMenuEntry->isChecked();
}
bool SearchBar::matchCase()
{
return m_matchCaseMenuEntry->isChecked();
}
bool SearchBar::highlightAllMatches()
{
return m_highlightMatchesMenuEntry->isChecked();
}
void SearchBar::show()
{
QWidget::show();
widget.searchTextEdit->setFocus();
widget.searchTextEdit->selectAll();
}
void SearchBar::hide()
{
QWidget::hide();
if (QWidget *p = parentWidget())
{
p->setFocus(Qt::OtherFocusReason); // give the focus to the parent widget on hiding
}
}
void SearchBar::noMatchFound()
{
QPalette palette;
palette.setColor(widget.searchTextEdit->backgroundRole(), QColor(255, 128, 128));
widget.searchTextEdit->setPalette(palette);
}
void SearchBar::keyReleaseEvent(QKeyEvent* keyEvent)
{
if (keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter)
{
if (keyEvent->modifiers() == Qt::ShiftModifier)
{
Q_EMIT findPrevious();
}
else
{
Q_EMIT findNext();
}
}
else if (keyEvent->key() == Qt::Key_Escape)
{
hide();
}
}
void SearchBar::clearBackgroundColor()
{
widget.searchTextEdit->setPalette(QWidget::window()->palette());
}

65
qtermwidget/lib/SearchBar.h 100644
View File

@ -0,0 +1,65 @@
/*
Copyright 2013 Christian Surlykke
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
#ifndef _SEARCHBAR_H
#define _SEARCHBAR_H
#include "ui_SearchBar.h"
#include "HistorySearch.h"
#if QT_VERSION < 0x060000
#include <QRegExp>
#else
#include <QRegularExpression>
#endif
class SearchBar : public QWidget {
Q_OBJECT
public:
SearchBar(QWidget* parent = nullptr);
~SearchBar() override;
virtual void show();
QString searchText();
bool useRegularExpression();
bool matchCase();
bool highlightAllMatches();
public slots:
void noMatchFound();
void hide();
signals:
void searchCriteriaChanged();
void highlightMatchesChanged(bool highlightMatches);
void findNext();
void findPrevious();
protected:
void keyReleaseEvent(QKeyEvent* keyEvent) override;
private slots:
void clearBackgroundColor();
private:
Ui::SearchBar widget;
QAction *m_matchCaseMenuEntry;
QAction *m_useRegularExpressionMenuEntry;
QAction *m_highlightMatchesMenuEntry;
};
#endif /* _SEARCHBAR_H */

80
qtermwidget/lib/SearchBar.ui 100644
View File

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SearchBar</class>
<widget class="QWidget" name="SearchBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>399</width>
<height>40</height>
</rect>
</property>
<property name="windowTitle">
<string>SearchBar</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="closeButton">
<property name="text">
<string>X</string>
</property>
<property name="icon">
<iconset theme="dialog-close">
<normaloff/>
</iconset>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="findLabel">
<property name="text">
<string>Find:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="searchTextEdit"/>
</item>
<item>
<widget class="QToolButton" name="findPreviousButton">
<property name="text">
<string>&lt;</string>
</property>
<property name="icon">
<iconset theme="go-previous">
<normaloff/>
</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="findNextButton">
<property name="text">
<string>&gt;</string>
</property>
<property name="icon">
<iconset theme="go-next">
<normaloff/>
</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="optionsButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset theme="preferences-system"/>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

1068
qtermwidget/lib/Session.cpp 100644
View File

File diff suppressed because it is too large Load Diff

649
qtermwidget/lib/Session.h 100644
View File

@ -0,0 +1,649 @@
/*
This file is part of Konsole, an X terminal.
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com>
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
#ifndef SESSION_H
#define SESSION_H
#include <QStringList>
#include <QWidget>
#include "Emulation.h"
#include "History.h"
class KProcess;
namespace Konsole {
class Emulation;
class Pty;
class TerminalDisplay;
//class ZModemDialog;
/**
* Represents a terminal session consisting of a pseudo-teletype and a terminal emulation.
* The pseudo-teletype (or PTY) handles I/O between the terminal process and Konsole.
* The terminal emulation ( Emulation and subclasses ) processes the output stream from the
* PTY and produces a character image which is then shown on views connected to the session.
*
* Each Session can be connected to one or more views by using the addView() method.
* The attached views can then display output from the program running in the terminal
* or send input to the program in the terminal in the form of keypresses and mouse
* activity.
*/
class Session : public QObject {
Q_OBJECT
public:
Q_PROPERTY(QString name READ nameTitle)
Q_PROPERTY(int processId READ processId)
Q_PROPERTY(QString keyBindings READ keyBindings WRITE setKeyBindings)
Q_PROPERTY(QSize size READ size WRITE setSize)
/**
* Constructs a new session.
*
* To start the terminal process, call the run() method,
* after specifying the program and arguments
* using setProgram() and setArguments()
*
* If no program or arguments are specified explicitly, the Session
* falls back to using the program specified in the SHELL environment
* variable.
*/
Session(QObject* parent = nullptr);
~Session() override;
/**
* Returns true if the session is currently running. This will be true
* after run() has been called successfully.
*/
bool isRunning() const;
/**
* Sets the profile associated with this session.
*
* @param profileKey A key which can be used to obtain the current
* profile settings from the SessionManager
*/
void setProfileKey(const QString & profileKey);
/**
* Returns the profile key associated with this session.
* This can be passed to the SessionManager to obtain the current
* profile settings.
*/
QString profileKey() const;
/**
* Adds a new view for this session.
*
* The viewing widget will display the output from the terminal and
* input from the viewing widget (key presses, mouse activity etc.)
* will be sent to the terminal.
*
* Views can be removed using removeView(). The session is automatically
* closed when the last view is removed.
*/
void addView(TerminalDisplay * widget);
/**
* Removes a view from this session. When the last view is removed,
* the session will be closed automatically.
*
* @p widget will no longer display output from or send input
* to the terminal
*/
void removeView(TerminalDisplay * widget);
/**
* Returns the views connected to this session
*/
QList<TerminalDisplay *> views() const;
/**
* Returns the terminal emulation instance being used to encode / decode
* characters to / from the process.
*/
Emulation * emulation() const;
/**
* Returns the environment of this session as a list of strings like
* VARIABLE=VALUE
*/
QStringList environment() const;
/**
* Sets the environment for this session.
* @p environment should be a list of strings like
* VARIABLE=VALUE
*/
void setEnvironment(const QStringList & environment);
/** Returns the unique ID for this session. */
int sessionId() const;
/**
* Return the session title set by the user (ie. the program running
* in the terminal), or an empty string if the user has not set a custom title
*/
QString userTitle() const;
/**
* This enum describes the contexts for which separate
* tab title formats may be specified.
*/
enum TabTitleContext {
/** Default tab title format */
LocalTabTitle,
/**
* Tab title format used session currently contains
* a connection to a remote computer (via SSH)
*/
RemoteTabTitle
};
/**
* Sets the format used by this session for tab titles.
*
* @param context The context whose format should be set.
* @param format The tab title format. This may be a mixture
* of plain text and dynamic elements denoted by a '%' character
* followed by a letter. (eg. %d for directory). The dynamic
* elements available depend on the @p context
*/
void setTabTitleFormat(TabTitleContext context , const QString & format);
/** Returns the format used by this session for tab titles. */
QString tabTitleFormat(TabTitleContext context) const;
/** Returns the arguments passed to the shell process when run() is called. */
QStringList arguments() const;
/** Returns the program name of the shell process started when run() is called. */
QString program() const;
/**
* Sets the command line arguments which the session's program will be passed when
* run() is called.
*/
void setArguments(const QStringList & arguments);
/** Sets the program to be executed when run() is called. */
void setProgram(const QString & program);
/** Returns the session's current working directory. */
QString initialWorkingDirectory() {
return _initialWorkingDir;
}
/**
* Sets the initial working directory for the session when it is run
* This has no effect once the session has been started.
*/
void setInitialWorkingDirectory( const QString & dir );
/**
* Sets the type of history store used by this session.
* Lines of output produced by the terminal are added
* to the history store. The type of history store
* used affects the number of lines which can be
* remembered before they are lost and the storage
* (in memory, on-disk etc.) used.
*/
void setHistoryType(const HistoryType & type);
/**
* Returns the type of history store used by this session.
*/
const HistoryType & historyType() const;
/**
* Clears the history store used by this session.
*/
void clearHistory();
/**
* Enables monitoring for activity in the session.
* This will cause notifySessionState() to be emitted
* with the NOTIFYACTIVITY state flag when output is
* received from the terminal.
*/
void setMonitorActivity(bool);
/** Returns true if monitoring for activity is enabled. */
bool isMonitorActivity() const;
/**
* Enables monitoring for silence in the session.
* This will cause notifySessionState() to be emitted
* with the NOTIFYSILENCE state flag when output is not
* received from the terminal for a certain period of
* time, specified with setMonitorSilenceSeconds()
*/
void setMonitorSilence(bool);
/**
* Returns true if monitoring for inactivity (silence)
* in the session is enabled.
*/
bool isMonitorSilence() const;
/** See setMonitorSilence() */
void setMonitorSilenceSeconds(int seconds);
/**
* Sets the key bindings used by this session. The bindings
* specify how input key sequences are translated into
* the character stream which is sent to the terminal.
*
* @param id The name of the key bindings to use. The
* names of available key bindings can be determined using the
* KeyboardTranslatorManager class.
*/
void setKeyBindings(const QString & id);
/** Returns the name of the key bindings used by this session. */
QString keyBindings() const;
/**
* This enum describes the available title roles.
*/
enum TitleRole {
/** The name of the session. */
NameRole,
/** The title of the session which is displayed in tabs etc. */
DisplayedTitleRole
};
/** Sets the session's title for the specified @p role to @p title. */
void setTitle(TitleRole role , const QString & title);
/** Returns the session's title for the specified @p role. */
QString title(TitleRole role) const;
/** Convenience method used to read the name property. Returns title(Session::NameRole). */
QString nameTitle() const {
return title(Session::NameRole);
}
/** Sets the name of the icon associated with this session. */
void setIconName(const QString & iconName);
/** Returns the name of the icon associated with this session. */
QString iconName() const;
/** Sets the text of the icon associated with this session. */
void setIconText(const QString & iconText);
/** Returns the text of the icon associated with this session. */
QString iconText() const;
/** Flag if the title/icon was changed by user/shell. */
bool isTitleChanged() const;
/** Specifies whether a utmp entry should be created for the pty used by this session. */
void setAddToUtmp(bool);
/** Sends the specified @p signal to the terminal process. */
bool sendSignal(int signal);
/**
* Specifies whether to close the session automatically when the terminal
* process terminates.
*/
void setAutoClose(bool b) {
_autoClose = b;
}
/**
* Sets whether flow control is enabled for this terminal
* session.
*/
void setFlowControlEnabled(bool enabled);
/** Returns whether flow control is enabled for this terminal session. */
bool flowControlEnabled() const;
/**
* Sends @p text to the current foreground terminal program.
*/
void sendText(const QString & text) const;
void sendKeyEvent(QKeyEvent* e) const;
/**
* Returns the process id of the terminal process.
* This is the id used by the system API to refer to the process.
*/
int processId() const;
/**
* Returns the process id of the terminal's foreground process.
* This is initially the same as processId() but can change
* as the user starts other programs inside the terminal.
*/
int foregroundProcessId() const;
/** Returns the terminal session's window size in lines and columns. */
QSize size();
/**
* Emits a request to resize the session to accommodate
* the specified window size.
*
* @param size The size in lines and columns to request.
*/
void setSize(const QSize & size);
/** Sets the text codec used by this session's terminal emulation. */
void setCodec(QTextCodec * codec) const;
/**
* Sets whether the session has a dark background or not. The session
* uses this information to set the COLORFGBG variable in the process's
* environment, which allows the programs running in the terminal to determine
* whether the background is light or dark and use appropriate colors by default.
*
* This has no effect once the session is running.
*/
void setDarkBackground(bool darkBackground);
/**
* Returns true if the session has a dark background.
* See setDarkBackground()
*/
bool hasDarkBackground() const;
/**
* Attempts to get the shell program to redraw the current display area.
* This can be used after clearing the screen, for example, to get the
* shell to redraw the prompt line.
*/
void refresh();
// void startZModem(const QString &rz, const QString &dir, const QStringList &list);
// void cancelZModem();
// bool isZModemBusy() { return _zmodemBusy; }
/**
* Returns a pty slave file descriptor.
* This can be used for display and control
* a remote terminal.
*/
int getPtySlaveFd() const;
public slots:
/**
* Starts the terminal session.
*
* This creates the terminal process and connects the teletype to it.
*/
void run();
/**
* Starts the terminal session for "as is" PTY
* (without the direction a data to internal terminal process).
* It can be used for control or display a remote/external terminal.
*/
void runEmptyPTY();
/**
* Closes the terminal session. This sends a hangup signal
* (SIGHUP) to the terminal process and causes the done(Session*)
* signal to be emitted.
*/
void close();
/**
* Changes the session title or other customizable aspects of the terminal
* emulation display. For a list of what may be changed see the
* Emulation::titleChanged() signal.
*/
void setUserTitle( int, const QString & caption );
signals:
/** Emitted when the terminal process starts. */
void started();
/**
* Emitted when the terminal process exits.
*/
void finished();
/**
* Emitted when output is received from the terminal process.
*/
void receivedData( const QString & text );
/** Emitted when the session's title has changed. */
void titleChanged();
/** Emitted when the session's profile has changed. */
void profileChanged(const QString & profile);
/**
* Emitted when the activity state of this session changes.
*
* @param state The new state of the session. This may be one
* of NOTIFYNORMAL, NOTIFYSILENCE or NOTIFYACTIVITY
*/
void stateChanged(int state);
/** Emitted when a bell event occurs in the session. */
void bellRequest( const QString & message );
/**
* Requests that the color the text for any tabs associated with
* this session should be changed;
*
* TODO: Document what the parameter does
*/
void changeTabTextColorRequest(int);
/**
* Requests that the background color of views on this session
* should be changed.
*/
void changeBackgroundColorRequest(const QColor &);
/** TODO: Document me. */
void openUrlRequest(const QString & url);
/** TODO: Document me. */
// void zmodemDetected();
/**
* Emitted when the terminal process requests a change
* in the size of the terminal window.
*
* @param size The requested window size in terms of lines and columns.
*/
void resizeRequest(const QSize & size);
/**
* Emitted when a profile change command is received from the terminal.
*
* @param text The text of the command. This is a string of the form
* "PropertyName=Value;PropertyName=Value ..."
*/
void profileChangeCommandReceived(const QString & text);
/**
* Emitted when the flow control state changes.
*
* @param enabled True if flow control is enabled or false otherwise.
*/
void flowControlEnabledChanged(bool enabled);
/**
* Broker for Emulation::cursorChanged() signal
*/
void cursorChanged(Emulation::KeyboardCursorShape cursorShape, bool blinkingCursorEnabled);
void silence();
void activity();
private slots:
void done(int);
// void fireZModemDetected();
void onReceiveBlock( const char * buffer, int len );
void monitorTimerDone();
void onViewSizeChange(int height, int width);
void onEmulationSizeChange(QSize);
void activityStateSet(int);
//automatically detach views from sessions when view is destroyed
void viewDestroyed(QObject * view);
// void zmodemReadStatus();
// void zmodemReadAndSendBlock();
// void zmodemRcvBlock(const char *data, int len);
// void zmodemFinished();
private:
void updateTerminalSize();
WId windowId() const;
int _uniqueIdentifier;
Pty *_shellProcess;
Emulation * _emulation;
QList<TerminalDisplay *> _views;
bool _monitorActivity;
bool _monitorSilence;
bool _notifiedActivity;
bool _masterMode;
bool _autoClose;
bool _wantedClose;
QTimer * _monitorTimer;
int _silenceSeconds;
QString _nameTitle;
QString _displayTitle;
QString _userTitle;
QString _localTabTitleFormat;
QString _remoteTabTitleFormat;
QString _iconName;
QString _iconText; // as set by: echo -en '\033]1;IconText\007
bool _isTitleChanged; ///< flag if the title/icon was changed by user
bool _addToUtmp;
bool _flowControl;
bool _fullScripting;
QString _program;
QStringList _arguments;
QStringList _environment;
int _sessionId;
QString _initialWorkingDir;
// ZModem
// bool _zmodemBusy;
// KProcess* _zmodemProc;
// ZModemDialog* _zmodemProgress;
// Color/Font Changes by ESC Sequences
QColor _modifiedBackground; // as set by: echo -en '\033]11;Color\007
QString _profileKey;
bool _hasDarkBackground;
static int lastSessionId;
int ptySlaveFd;
};
/**
* Provides a group of sessions which is divided into master and slave sessions.
* Activity in master sessions can be propagated to all sessions within the group.
* The type of activity which is propagated and method of propagation is controlled
* by the masterMode() flags.
*/
class SessionGroup : public QObject {
Q_OBJECT
public:
/** Constructs an empty session group. */
SessionGroup();
/** Destroys the session group and removes all connections between master and slave sessions. */
~SessionGroup() override;
/** Adds a session to the group. */
void addSession( Session * session );
/** Removes a session from the group. */
void removeSession( Session * session );
/** Returns the list of sessions currently in the group. */
QList<Session *> sessions() const;
/**
* Sets whether a particular session is a master within the group.
* Changes or activity in the group's master sessions may be propagated
* to all the sessions in the group, depending on the current masterMode()
*
* @param session The session whose master status should be changed.
* @param master True to make this session a master or false otherwise
*/
void setMasterStatus( Session * session , bool master );
/** Returns the master status of a session. See setMasterStatus() */
bool masterStatus( Session * session ) const;
/**
* This enum describes the options for propagating certain activity or
* changes in the group's master sessions to all sessions in the group.
*/
enum MasterMode {
/**
* Any input key presses in the master sessions are sent to all
* sessions in the group.
*/
CopyInputToAll = 1
};
/**
* Specifies which activity in the group's master sessions is propagated
* to all sessions in the group.
*
* @param mode A bitwise OR of MasterMode flags.
*/
void setMasterMode( int mode );
/**
* Returns a bitwise OR of the active MasterMode flags for this group.
* See setMasterMode()
*/
int masterMode() const;
private:
void connectPair(Session * master , Session * other) const;
void disconnectPair(Session * master , Session * other) const;
void connectAll(bool connect);
QList<Session *> masters() const;
// maps sessions to their master status
QHash<Session *,bool> _sessions;
int _masterMode;
};
}
#endif

169
qtermwidget/lib/ShellCommand.cpp 100644
View File

@ -0,0 +1,169 @@
/*
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
// Own
#include "ShellCommand.h"
//some versions of gcc(4.3) require explicit include
#include <cstdlib>
using namespace Konsole;
// expands environment variables in 'text'
// function copied from kdelibs/kio/kio/kurlcompletion.cpp
static bool expandEnv(QString & text);
ShellCommand::ShellCommand(const QString & fullCommand)
{
bool inQuotes = false;
QString builder;
for ( int i = 0 ; i < fullCommand.length() ; i++ ) {
QChar ch = fullCommand[i];
const bool isLastChar = ( i == fullCommand.length() - 1 );
const bool isQuote = ( ch == QLatin1Char('\'') || ch == QLatin1Char('\"') );
if ( !isLastChar && isQuote ) {
inQuotes = !inQuotes;
} else {
if ( (!ch.isSpace() || inQuotes) && !isQuote ) {
builder.append(ch);
}
if ( (ch.isSpace() && !inQuotes) || ( i == fullCommand.length()-1 ) ) {
_arguments << builder;
builder.clear();
}
}
}
}
ShellCommand::ShellCommand(const QString & command , const QStringList & arguments)
: _arguments(arguments)
{
if ( !_arguments.isEmpty() ) {
_arguments[0] = command;
}
}
QString ShellCommand::fullCommand() const
{
return _arguments.join(QLatin1Char(' '));
}
QString ShellCommand::command() const
{
if ( !_arguments.isEmpty() ) {
return _arguments[0];
} else {
return QString();
}
}
QStringList ShellCommand::arguments() const
{
return _arguments;
}
bool ShellCommand::isRootCommand() const
{
Q_ASSERT(0); // not implemented yet
return false;
}
bool ShellCommand::isAvailable() const
{
Q_ASSERT(0); // not implemented yet
return false;
}
QStringList ShellCommand::expand(const QStringList & items)
{
QStringList result;
for(const QString &item : items) {
result << expand(item);
}
return result;
}
QString ShellCommand::expand(const QString & text)
{
QString result = text;
expandEnv(result);
return result;
}
/*
* expandEnv
*
* Expand environment variables in text. Escaped '$' characters are ignored.
* Return true if any variables were expanded
*/
static bool expandEnv( QString & text )
{
// Find all environment variables beginning with '$'
//
int pos = 0;
bool expanded = false;
while ( (pos = text.indexOf(QLatin1Char('$'), pos)) != -1 ) {
// Skip escaped '$'
//
if ( pos > 0 && text.at(pos-1) == QLatin1Char('\\') ) {
pos++;
}
// Variable found => expand
//
else {
// Find the end of the variable = next '/' or ' '
//
int pos2 = text.indexOf( QLatin1Char(' '), pos+1 );
int pos_tmp = text.indexOf( QLatin1Char('/'), pos+1 );
if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) ) {
pos2 = pos_tmp;
}
if ( pos2 == -1 ) {
pos2 = text.length();
}
// Replace if the variable is terminated by '/' or ' '
// and defined
//
if ( pos2 >= 0 ) {
int len = pos2 - pos;
QString key = text.mid( pos+1, len-1);
QString value =
QString::fromLocal8Bit( qgetenv(key.toLocal8Bit().constData()) );
if ( !value.isEmpty() ) {
expanded = true;
text.replace( pos, len, value );
pos = pos + value.length();
} else {
pos = pos2;
}
}
}
}
return expanded;
}

32
qtermwidget/src/ShellCommand.h → qtermwidget/lib/ShellCommand.h
View File

@ -23,13 +23,12 @@
#define SHELLCOMMAND_H #define SHELLCOMMAND_H
// Qt // Qt
#include <QtCore/QStringList> #include <QStringList>
namespace Konsole namespace Konsole {
{
/** /**
* A class to parse and extract information about shell commands. * A class to parse and extract information about shell commands.
* *
* ShellCommand can be used to: * ShellCommand can be used to:
* *
@ -38,7 +37,7 @@ namespace Konsole
* into its component parts (eg. the command "/bin/sh" and the arguments * into its component parts (eg. the command "/bin/sh" and the arguments
* "-c","/path/to/my/script") * "-c","/path/to/my/script")
* </li> * </li>
* <li>Take a command and a list of arguments and combine them to * <li>Take a command and a list of arguments and combine them to
* form a complete command line. * form a complete command line.
* </li> * </li>
* <li>Determine whether the binary specified by a command exists in the * <li>Determine whether the binary specified by a command exists in the
@ -47,29 +46,28 @@ namespace Konsole
* <li>Determine whether a command-line specifies the execution of * <li>Determine whether a command-line specifies the execution of
* another command as the root user using su/sudo etc. * another command as the root user using su/sudo etc.
* </li> * </li>
* </ul> * </ul>
*/ */
class ShellCommand class ShellCommand {
{
public: public:
/** /**
* Constructs a ShellCommand from a command line. * Constructs a ShellCommand from a command line.
* *
* @param fullCommand The command line to parse. * @param fullCommand The command line to parse.
*/ */
ShellCommand(const QString& fullCommand); ShellCommand(const QString & fullCommand);
/** /**
* Constructs a ShellCommand with the specified @p command and @p arguments. * Constructs a ShellCommand with the specified @p command and @p arguments.
*/ */
ShellCommand(const QString& command , const QStringList& arguments); ShellCommand(const QString & command , const QStringList & arguments);
/** Returns the command. */ /** Returns the command. */
QString command() const; QString command() const;
/** Returns the arguments. */ /** Returns the arguments. */
QStringList arguments() const; QStringList arguments() const;
/** /**
* Returns the full command line. * Returns the full command line.
*/ */
QString fullCommand() const; QString fullCommand() const;
@ -79,13 +77,13 @@ public:
bool isAvailable() const; bool isAvailable() const;
/** Expands environment variables in @p text .*/ /** Expands environment variables in @p text .*/
static QString expand(const QString& text); static QString expand(const QString & text);
/** Expands environment variables in each string in @p list. */ /** Expands environment variables in each string in @p list. */
static QStringList expand(const QStringList& items); static QStringList expand(const QStringList & items);
private: private:
QStringList _arguments; QStringList _arguments;
}; };
} }

263
qtermwidget/lib/TerminalCharacterDecoder.cpp 100644
View File

@ -0,0 +1,263 @@
/*
This file is part of Konsole, an X terminal.
Copyright 2006-2008 by Robert Knight <robertknight@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program 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 Lesser General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
// Own
#include "TerminalCharacterDecoder.h"
// Qt
#include <QTextStream>
// KDE
//#include <kdebug.h>
// Konsole
#include "konsole_wcwidth.h"
#include <cwctype>
using namespace Konsole;
PlainTextDecoder::PlainTextDecoder()
: _output(nullptr)
, _includeTrailingWhitespace(true)
, _recordLinePositions(false)
{
}
void PlainTextDecoder::setTrailingWhitespace(bool enable)
{
_includeTrailingWhitespace = enable;
}
bool PlainTextDecoder::trailingWhitespace() const
{
return _includeTrailingWhitespace;
}
void PlainTextDecoder::begin(QTextStream* output)
{
_output = output;
if (!_linePositions.isEmpty())
_linePositions.clear();
}
void PlainTextDecoder::end()
{
_output = nullptr;
}
void PlainTextDecoder::setRecordLinePositions(bool record)
{
_recordLinePositions = record;
}
QList<int> PlainTextDecoder::linePositions() const
{
return _linePositions;
}
void PlainTextDecoder::decodeLine(const Character* const characters, int count, LineProperty /*properties*/
)
{
Q_ASSERT( _output );
if (_recordLinePositions && _output->string())
{
int pos = _output->string()->length();
_linePositions << pos;
}
// check the real length
for (int i = 0 ; i < count ; i++)
{
if (characters[i] == '\0')
{
count = i;
break;
}
}
//TODO should we ignore or respect the LINE_WRAPPED line property?
//note: we build up a QString and send it to the text stream rather writing into the text
//stream a character at a time because it is more efficient.
//(since QTextStream always deals with QStrings internally anyway)
std::wstring plainText;
plainText.reserve(count);
int outputCount = count;
// if inclusion of trailing whitespace is disabled then find the end of the
// line
if ( !_includeTrailingWhitespace )
{
for (int i = count-1 ; i >= 0 ; i--)
{
if ( characters[i].character != L' ' )
break;
else
outputCount--;
}
}
for (int i=0;i<outputCount;)
{
plainText.push_back( characters[i].character );
i += qMax(1,konsole_wcwidth(characters[i].character));
}
*_output << QString::fromStdWString(plainText);
}
HTMLDecoder::HTMLDecoder() :
_output(nullptr)
,_colorTable(base_color_table)
,_innerSpanOpen(false)
,_lastRendition(DEFAULT_RENDITION)
{
}
void HTMLDecoder::begin(QTextStream* output)
{
_output = output;
std::wstring text;
//open monospace span
openSpan(text,QLatin1String("font-family:monospace"));
*output << QString::fromStdWString(text);
}
void HTMLDecoder::end()
{
Q_ASSERT( _output );
std::wstring text;
closeSpan(text);
*_output << QString::fromStdWString(text);
_output = nullptr;
}
//TODO: Support for LineProperty (mainly double width , double height)
void HTMLDecoder::decodeLine(const Character* const characters, int count, LineProperty /*properties*/
)
{
Q_ASSERT( _output );
std::wstring text;
int spaceCount = 0;
for (int i=0;i<count;i++)
{
wchar_t ch(characters[i].character);
//check if appearance of character is different from previous char
if ( characters[i].rendition != _lastRendition ||
characters[i].foregroundColor != _lastForeColor ||
characters[i].backgroundColor != _lastBackColor )
{
if ( _innerSpanOpen )
closeSpan(text);
_lastRendition = characters[i].rendition;
_lastForeColor = characters[i].foregroundColor;
_lastBackColor = characters[i].backgroundColor;
//build up style string
QString style;
bool useBold;
ColorEntry::FontWeight weight = characters[i].fontWeight(_colorTable);
if (weight == ColorEntry::UseCurrentFormat)
useBold = _lastRendition & RE_BOLD;
else
useBold = weight == ColorEntry::Bold;
if (useBold)
style.append(QLatin1String("font-weight:bold;"));
if ( _lastRendition & RE_UNDERLINE )
style.append(QLatin1String("font-decoration:underline;"));
//colours - a colour table must have been defined first
if ( _colorTable )
{
style.append( QString::fromLatin1("color:%1;").arg(_lastForeColor.color(_colorTable).name() ) );
if (!characters[i].isTransparent(_colorTable))
{
style.append( QString::fromLatin1("background-color:%1;").arg(_lastBackColor.color(_colorTable).name() ) );
}
}
//open the span with the current style
openSpan(text,style);
_innerSpanOpen = true;
}
//handle whitespace
if (std::iswspace(ch))
spaceCount++;
else
spaceCount = 0;
//output current character
if (spaceCount < 2)
{
//escape HTML tag characters and just display others as they are
if ( ch == '<' )
text.append(L"&lt;");
else if (ch == '>')
text.append(L"&gt;");
else
text.push_back(ch);
}
else
{
text.append(L"&nbsp;"); //HTML truncates multiple spaces, so use a space marker instead
}
}
//close any remaining open inner spans
if ( _innerSpanOpen )
closeSpan(text);
//start new line
text.append(L"<br>");
*_output << QString::fromStdWString(text);
}
void HTMLDecoder::openSpan(std::wstring& text , const QString& style)
{
text.append( QString(QLatin1String("<span style=\"%1\">")).arg(style).toStdWString() );
}
void HTMLDecoder::closeSpan(std::wstring& text)
{
text.append(L"</span>");
}
void HTMLDecoder::setColorTable(const ColorEntry* table)
{
_colorTable = table;
}

107
qtermwidget/src/TerminalCharacterDecoder.h → qtermwidget/lib/TerminalCharacterDecoder.h
View File

@ -1,9 +1,7 @@
/* /*
This file is part of Konsole, an X terminal. This file is part of Konsole, an X terminal.
Copyright (C) 2006-7 by Robert Knight <robertknight@gmail.com> Copyright 2006-2008 by Robert Knight <robertknight@gmail.com>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by it under the terms of the GNU Lesser General Public License as published by
@ -26,6 +24,8 @@
#include "Character.h" #include "Character.h"
#include <QList>
class QTextStream; class QTextStream;
namespace Konsole namespace Konsole
@ -38,29 +38,29 @@ namespace Konsole
* and background colours and other appearance-related properties into text strings. * and background colours and other appearance-related properties into text strings.
* *
* Derived classes may produce either plain text with no other colour or appearance information, or * Derived classes may produce either plain text with no other colour or appearance information, or
* they may produce text which incorporates these additional properties. * they may produce text which incorporates these additional properties.
*/ */
class TerminalCharacterDecoder class TerminalCharacterDecoder
{ {
public: public:
virtual ~TerminalCharacterDecoder() {} virtual ~TerminalCharacterDecoder() {}
/** Begin decoding characters. The resulting text is appended to @p output. */ /** Begin decoding characters. The resulting text is appended to @p output. */
virtual void begin(QTextStream* output) = 0; virtual void begin(QTextStream* output) = 0;
/** End decoding. */ /** End decoding. */
virtual void end() = 0; virtual void end() = 0;
/** /**
* Converts a line of terminal characters with associated properties into a text string * Converts a line of terminal characters with associated properties into a text string
* and writes the string into an output QTextStream. * and writes the string into an output QTextStream.
* *
* @param characters An array of characters of length @p count. * @param characters An array of characters of length @p count.
* @param properties Additional properties which affect all characters in the line * @param count The number of characters
* @param output The output stream which receives the decoded text * @param properties Additional properties which affect all characters in the line
*/ */
virtual void decodeLine(const Character* const characters, virtual void decodeLine(const Character* const characters,
int count, int count,
LineProperty properties) = 0; LineProperty properties) = 0;
}; };
/** /**
@ -70,10 +70,10 @@ public:
class PlainTextDecoder : public TerminalCharacterDecoder class PlainTextDecoder : public TerminalCharacterDecoder
{ {
public: public:
PlainTextDecoder(); PlainTextDecoder();
/** /**
* Set whether trailing whitespace at the end of lines should be included * Set whether trailing whitespace at the end of lines should be included
* in the output. * in the output.
* Defaults to true. * Defaults to true.
*/ */
@ -83,18 +83,29 @@ public:
* in the output. * in the output.
*/ */
bool trailingWhitespace() const; bool trailingWhitespace() const;
/**
* Returns of character positions in the output stream
* at which new lines where added. Returns an empty if setTrackLinePositions() is false or if
* the output device is not a string.
*/
QList<int> linePositions() const;
/** Enables recording of character positions at which new lines are added. See linePositions() */
void setRecordLinePositions(bool record);
virtual void begin(QTextStream* output); void begin(QTextStream* output) override;
virtual void end(); void end() override;
void decodeLine(const Character* const characters,
int count,
LineProperty properties) override;
virtual void decodeLine(const Character* const characters,
int count,
LineProperty properties);
private: private:
QTextStream* _output; QTextStream* _output;
bool _includeTrailingWhitespace; bool _includeTrailingWhitespace;
bool _recordLinePositions;
QList<int> _linePositions;
}; };
/** /**
@ -103,34 +114,34 @@ private:
class HTMLDecoder : public TerminalCharacterDecoder class HTMLDecoder : public TerminalCharacterDecoder
{ {
public: public:
/** /**
* Constructs an HTML decoder using a default black-on-white color scheme. * Constructs an HTML decoder using a default black-on-white color scheme.
*/ */
HTMLDecoder(); HTMLDecoder();
/** /**
* Sets the colour table which the decoder uses to produce the HTML colour codes in its * Sets the colour table which the decoder uses to produce the HTML colour codes in its
* output * output
*/ */
void setColorTable( const ColorEntry* table ); void setColorTable( const ColorEntry* table );
virtual void decodeLine(const Character* const characters,
int count,
LineProperty properties);
virtual void begin(QTextStream* output); void decodeLine(const Character* const characters,
virtual void end(); int count,
LineProperty properties) override;
void begin(QTextStream* output) override;
void end() override;
private: private:
void openSpan(QString& text , const QString& style); void openSpan(std::wstring& text , const QString& style);
void closeSpan(QString& text); void closeSpan(std::wstring& text);
QTextStream* _output; QTextStream* _output;
const ColorEntry* _colorTable; const ColorEntry* _colorTable;
bool _innerSpanOpen; bool _innerSpanOpen;
quint8 _lastRendition; quint8 _lastRendition;
CharacterColor _lastForeColor; CharacterColor _lastForeColor;
CharacterColor _lastBackColor; CharacterColor _lastBackColor;
}; };

2249
qtermwidget/src/TerminalDisplay.cpp → qtermwidget/lib/TerminalDisplay.cpp
View File

File diff suppressed because it is too large Load Diff

512
qtermwidget/src/TerminalDisplay.h → qtermwidget/lib/TerminalDisplay.h
View File

@ -1,8 +1,6 @@
/* /*
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com> Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -24,14 +22,16 @@
#define TERMINALDISPLAY_H #define TERMINALDISPLAY_H
// Qt // Qt
#include <QtGui/QColor> #include <QColor>
#include <QtCore/QPointer> #include <QPointer>
#include <QtGui/QWidget> #include <QWidget>
// Konsole // Konsole
#include "Filter.h" #include "Filter.h"
#include "Character.h" #include "Character.h"
#include "ColorTables.h" #include "qtermwidget.h"
//#include "konsole_export.h"
#define KONSOLEPRIVATE_EXPORT
class QDrag; class QDrag;
class QDragEnterEvent; class QDragEnterEvent;
@ -39,12 +39,12 @@ class QDropEvent;
class QLabel; class QLabel;
class QTimer; class QTimer;
class QEvent; class QEvent;
class QFrame;
class QGridLayout; class QGridLayout;
class QKeyEvent; class QKeyEvent;
class QScrollBar; class QScrollBar;
class QShowEvent; class QShowEvent;
class QHideEvent; class QHideEvent;
class QTimerEvent;
class QWidget; class QWidget;
//class KMenu; //class KMenu;
@ -52,6 +52,24 @@ class QWidget;
namespace Konsole namespace Konsole
{ {
enum MotionAfterPasting
{
// No move screenwindow after pasting
NoMoveScreenWindow = 0,
// Move start of screenwindow after pasting
MoveStartScreenWindow = 1,
// Move end of screenwindow after pasting
MoveEndScreenWindow = 2
};
enum BackgroundMode {
None,
Stretch,
Zoom,
Fit,
Center
};
extern unsigned short vt100_graphics[32]; extern unsigned short vt100_graphics[32];
class ScreenWindow; class ScreenWindow;
@ -60,19 +78,19 @@ class ScreenWindow;
* A widget which displays output from a terminal emulation and sends input keypresses and mouse activity * A widget which displays output from a terminal emulation and sends input keypresses and mouse activity
* to the terminal. * to the terminal.
* *
* When the terminal emulation receives new output from the program running in the terminal, * When the terminal emulation receives new output from the program running in the terminal,
* it will update the display by calling updateImage(). * it will update the display by calling updateImage().
* *
* TODO More documentation * TODO More documentation
*/ */
class TerminalDisplay : public QWidget class KONSOLEPRIVATE_EXPORT TerminalDisplay : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
/** Constructs a new terminal display widget with the specified parent. */ /** Constructs a new terminal display widget with the specified parent. */
TerminalDisplay(QWidget *parent=0); TerminalDisplay(QWidget *parent=nullptr);
virtual ~TerminalDisplay(); ~TerminalDisplay() override;
/** Returns the terminal color palette used by the display. */ /** Returns the terminal color palette used by the display. */
const ColorEntry* colorTable() const; const ColorEntry* colorTable() const;
@ -92,25 +110,19 @@ public:
/** Sets the opacity of the terminal display. */ /** Sets the opacity of the terminal display. */
void setOpacity(qreal opacity); void setOpacity(qreal opacity);
/** /** Sets the background image of the terminal display. */
* This enum describes the location where the scroll bar is positioned in the display widget. void setBackgroundImage(const QString& backgroundImage);
*/
enum ScrollBarPosition /** Sets the background image mode of the terminal display. */
{ void setBackgroundMode(BackgroundMode mode);
/** Do not show the scroll bar. */
NoScrollBar=0, /**
/** Show the scroll bar on the left side of the display. */
ScrollBarLeft=1,
/** Show the scroll bar on the right side of the display. */
ScrollBarRight=2
};
/**
* Specifies whether the terminal display has a vertical scroll bar, and if so whether it * Specifies whether the terminal display has a vertical scroll bar, and if so whether it
* is shown on the left or right side of the display. * is shown on the left or right side of the display.
*/ */
void setScrollBarPosition(ScrollBarPosition position); void setScrollBarPosition(QTermWidget::ScrollBarPosition position);
/** /**
* Sets the current position and range of the display's scroll bar. * Sets the current position and range of the display's scroll bar.
* *
* @param cursor The position of the scroll bar's thumb. * @param cursor The position of the scroll bar's thumb.
@ -118,7 +130,12 @@ public:
*/ */
void setScroll(int cursor, int lines); void setScroll(int cursor, int lines);
/** /**
* Scroll to the bottom of the terminal (reset scrolling).
*/
void scrollToEnd();
/**
* Returns the display's filter chain. When the image for the display is updated, * Returns the display's filter chain. When the image for the display is updated,
* the text is passed through each filter in the chain. Each filter can define * the text is passed through each filter in the chain. Each filter can define
* hotspots which correspond to certain strings (such as URLs or particular words). * hotspots which correspond to certain strings (such as URLs or particular words).
@ -131,11 +148,11 @@ public:
*/ */
FilterChain* filterChain() const; FilterChain* filterChain() const;
/** /**
* Updates the filters in the display's filter chain. This will cause * Updates the filters in the display's filter chain. This will cause
* the hotspots to be updated to match the current image. * the hotspots to be updated to match the current image.
* *
* WARNING: This function can be expensive depending on the * WARNING: This function can be expensive depending on the
* image size and number of filters in the filterChain() * image size and number of filters in the filterChain()
* *
* TODO - This API does not really allow efficient usage. Revise it so * TODO - This API does not really allow efficient usage. Revise it so
@ -144,10 +161,10 @@ public:
* eg: * eg:
* - Area of interest may be known ( eg. mouse cursor hovering * - Area of interest may be known ( eg. mouse cursor hovering
* over an area ) * over an area )
*/ */
void processFilters(); void processFilters();
/** /**
* Returns a list of menu actions created by the filters for the content * Returns a list of menu actions created by the filters for the content
* at the given @p position. * at the given @p position.
*/ */
@ -158,67 +175,57 @@ public:
/** Specifies whether or not the cursor blinks. */ /** Specifies whether or not the cursor blinks. */
void setBlinkingCursor(bool blink); void setBlinkingCursor(bool blink);
/** Specifies whether or not text can blink. */
void setBlinkingTextEnabled(bool blink);
void setCtrlDrag(bool enable) { _ctrlDrag=enable; } void setCtrlDrag(bool enable) { _ctrlDrag=enable; }
bool ctrlDrag() { return _ctrlDrag; } bool ctrlDrag() { return _ctrlDrag; }
/** /**
* This enum describes the methods for selecting text when * This enum describes the methods for selecting text when
* the user triple-clicks within the display. * the user triple-clicks within the display.
*/ */
enum TripleClickMode enum TripleClickMode
{ {
/** Select the whole line underneath the cursor. */ /** Select the whole line underneath the cursor. */
SelectWholeLine, SelectWholeLine,
/** Select from the current cursor position to the end of the line. */ /** Select from the current cursor position to the end of the line. */
SelectForwardsFromCursor SelectForwardsFromCursor
}; };
/** Sets how the text is selected when the user triple clicks within the display. */ /** Sets how the text is selected when the user triple clicks within the display. */
void setTripleClickMode(TripleClickMode mode) { _tripleClickMode = mode; } void setTripleClickMode(TripleClickMode mode) { _tripleClickMode = mode; }
/** See setTripleClickSelectionMode() */ /** See setTripleClickSelectionMode() */
TripleClickMode tripleClickMode() { return _tripleClickMode; } TripleClickMode tripleClickMode() { return _tripleClickMode; }
void setLineSpacing(uint); void setLineSpacing(uint);
void setMargin(int);
int margin() const;
uint lineSpacing() const; uint lineSpacing() const;
void emitSelection(bool useXselection,bool appendReturn); void emitSelection(bool useXselection,bool appendReturn);
/** change and wrap text corresponding to paste mode **/
void bracketText(QString& text) const;
/** /**
* This enum describes the available shapes for the keyboard cursor. * Sets the shape of the keyboard cursor. This is the cursor drawn
* See setKeyboardCursorShape()
*/
enum KeyboardCursorShape
{
/** A rectangular block which covers the entire area of the cursor character. */
BlockCursor,
/**
* A single flat line which occupies the space at the bottom of the cursor
* character's area.
*/
UnderlineCursor,
/**
* An cursor shaped like the capital letter 'I', similar to the IBeam
* cursor used in Qt/KDE text editors.
*/
IBeamCursor
};
/**
* Sets the shape of the keyboard cursor. This is the cursor drawn
* at the position in the terminal where keyboard input will appear. * at the position in the terminal where keyboard input will appear.
* *
* In addition the terminal display widget also has a cursor for * In addition the terminal display widget also has a cursor for
* the mouse pointer, which can be set using the QWidget::setCursor() * the mouse pointer, which can be set using the QWidget::setCursor()
* method. * method.
* *
* Defaults to BlockCursor * Defaults to BlockCursor
*/ */
void setKeyboardCursorShape(KeyboardCursorShape shape); void setKeyboardCursorShape(QTermWidget::KeyboardCursorShape shape);
/** /**
* Returns the shape of the keyboard cursor. See setKeyboardCursorShape() * Returns the shape of the keyboard cursor. See setKeyboardCursorShape()
*/ */
KeyboardCursorShape keyboardCursorShape() const; QTermWidget::KeyboardCursorShape keyboardCursorShape() const;
/** /**
* Sets the color used to draw the keyboard cursor. * Sets the color used to draw the keyboard cursor.
* *
* The keyboard cursor defaults to using the foreground color of the character * The keyboard cursor defaults to using the foreground color of the character
* underneath it. * underneath it.
@ -232,10 +239,10 @@ public:
*/ */
void setKeyboardCursorColor(bool useForegroundColor , const QColor& color); void setKeyboardCursorColor(bool useForegroundColor , const QColor& color);
/** /**
* Returns the color of the keyboard cursor, or an invalid color if the keyboard * Returns the color of the keyboard cursor, or an invalid color if the keyboard
* cursor color is set to change according to the foreground color of the character * cursor color is set to change according to the foreground color of the character
* underneath it. * underneath it.
*/ */
QColor keyboardCursorColor() const; QColor keyboardCursorColor() const;
@ -260,19 +267,19 @@ public:
*/ */
int fontHeight() { return _fontHeight; } int fontHeight() { return _fontHeight; }
/** /**
* Returns the width of the characters in the display. * Returns the width of the characters in the display.
* This assumes the use of a fixed-width font. * This assumes the use of a fixed-width font.
*/ */
int fontWidth() { return _fontWidth; } int fontWidth() { return _fontWidth; }
void setSize(int cols, int lins); void setSize(int cols, int lins);
void setFixedSize(int cols, int lins); void setFixedSize(int cols, int lins);
// reimplemented // reimplemented
QSize sizeHint() const; QSize sizeHint() const override;
/** /**
* Sets which characters, in addition to letters and numbers, * Sets which characters, in addition to letters and numbers,
* are regarded as being part of a word for the purposes * are regarded as being part of a word for the purposes
* of selecting words in the display by double clicking on them. * of selecting words in the display by double clicking on them.
* *
@ -283,26 +290,26 @@ public:
* of a word ( in addition to letters and numbers ). * of a word ( in addition to letters and numbers ).
*/ */
void setWordCharacters(const QString& wc); void setWordCharacters(const QString& wc);
/** /**
* Returns the characters which are considered part of a word for the * Returns the characters which are considered part of a word for the
* purpose of selecting words in the display with the mouse. * purpose of selecting words in the display with the mouse.
* *
* @see setWordCharacters() * @see setWordCharacters()
*/ */
QString wordCharacters() { return _wordCharacters; } QString wordCharacters() { return _wordCharacters; }
/** /**
* Sets the type of effect used to alert the user when a 'bell' occurs in the * Sets the type of effect used to alert the user when a 'bell' occurs in the
* terminal session. * terminal session.
* *
* The terminal session can trigger the bell effect by calling bell() with * The terminal session can trigger the bell effect by calling bell() with
* the alert message. * the alert message.
*/ */
void setBellMode(int mode); void setBellMode(int mode);
/** /**
* Returns the type of effect used to alert the user when a 'bell' occurs in * Returns the type of effect used to alert the user when a 'bell' occurs in
* the terminal session. * the terminal session.
* *
* See setBellMode() * See setBellMode()
*/ */
int bellMode() { return _bellMode; } int bellMode() { return _bellMode; }
@ -313,23 +320,23 @@ public:
* session. * session.
*/ */
enum BellMode enum BellMode
{ {
/** A system beep. */ /** A system beep. */
SystemBeepBell=0, SystemBeepBell=0,
/** /**
* KDE notification. This may play a sound, show a passive popup * KDE notification. This may play a sound, show a passive popup
* or perform some other action depending on the user's settings. * or perform some other action depending on the user's settings.
*/ */
NotifyBell=1, NotifyBell=1,
/** A silent, visual bell (eg. inverting the display's colors briefly) */ /** A silent, visual bell (eg. inverting the display's colors briefly) */
VisualBell=2, VisualBell=2,
/** No bell effects */ /** No bell effects */
NoBell=3 NoBell=3
}; };
void setSelection(const QString &t); void setSelection(const QString &t);
/** /**
* Reimplemented. Has no effect. Use setVTFont() to change the font * Reimplemented. Has no effect. Use setVTFont() to change the font
* used to draw characters in the display. * used to draw characters in the display.
*/ */
@ -338,9 +345,9 @@ public:
/** Returns the font used to draw characters in the display */ /** Returns the font used to draw characters in the display */
QFont getVTFont() { return font(); } QFont getVTFont() { return font(); }
/** /**
* Sets the font used to draw the display. Has no effect if @p font * Sets the font used to draw the display. Has no effect if @p font
* is larger than the size of the display itself. * is larger than the size of the display itself.
*/ */
void setVTFont(const QFont& font); void setVTFont(const QFont& font);
@ -349,24 +356,40 @@ public:
* is enabled or not. Defaults to enabled. * is enabled or not. Defaults to enabled.
*/ */
static void setAntialias( bool antialias ) { _antialiasText = antialias; } static void setAntialias( bool antialias ) { _antialiasText = antialias; }
/** /**
* Returns true if anti-aliasing of text in the terminal is enabled. * Returns true if anti-aliasing of text in the terminal is enabled.
*/ */
static bool antialias() { return _antialiasText; } static bool antialias() { return _antialiasText; }
/** /**
* Sets whether or not the current height and width of the * Specify whether line chars should be drawn by ourselves or left to
* underlying font rendering libraries.
*/
void setDrawLineChars(bool drawLineChars) { _drawLineChars = drawLineChars; }
/**
* Specifies whether characters with intense colors should be rendered
* as bold. Defaults to true.
*/
void setBoldIntense(bool value) { _boldIntense = value; }
/**
* Returns true if characters with intense colors are rendered in bold.
*/
bool getBoldIntense() { return _boldIntense; }
/**
* Sets whether or not the current height and width of the
* terminal in lines and columns is displayed whilst the widget * terminal in lines and columns is displayed whilst the widget
* is being resized. * is being resized.
*/ */
void setTerminalSizeHint(bool on) { _terminalSizeHint=on; } void setTerminalSizeHint(bool on) { _terminalSizeHint=on; }
/** /**
* Returns whether or not the current height and width of * Returns whether or not the current height and width of
* the terminal in lines and columns is displayed whilst the widget * the terminal in lines and columns is displayed whilst the widget
* is being resized. * is being resized.
*/ */
bool terminalSizeHint() { return _terminalSizeHint; } bool terminalSizeHint() { return _terminalSizeHint; }
/** /**
* Sets whether the terminal size display is shown briefly * Sets whether the terminal size display is shown briefly
* after the widget is first shown. * after the widget is first shown.
* *
@ -374,7 +397,14 @@ public:
*/ */
void setTerminalSizeStartup(bool on) { _terminalSizeStartup=on; } void setTerminalSizeStartup(bool on) { _terminalSizeStartup=on; }
/**
* Sets the status of the BiDi rendering inside the terminal display.
* Defaults to disabled.
*/
void setBidiEnabled(bool set) { _bidiEnabled=set; } void setBidiEnabled(bool set) { _bidiEnabled=set; }
/**
* Returns the status of the BiDi rendering in this widget.
*/
bool isBidiEnabled() { return _bidiEnabled; } bool isBidiEnabled() { return _bidiEnabled; }
/** /**
@ -391,23 +421,40 @@ public:
static bool HAVE_TRANSPARENCY; static bool HAVE_TRANSPARENCY;
void setMotionAfterPasting(MotionAfterPasting action);
int motionAfterPasting();
void setConfirmMultilinePaste(bool confirmMultilinePaste);
void setTrimPastedTrailingNewlines(bool trimPastedTrailingNewlines);
// maps a point on the widget to the position ( ie. line and column )
// of the character at that point.
void getCharacterPosition(const QPointF& widgetPoint,int& line,int& column) const;
void disableBracketedPasteMode(bool disable) { _disabledBracketedPasteMode = disable; }
bool bracketedPasteModeIsDisabled() const { return _disabledBracketedPasteMode; }
public slots: public slots:
/** /**
* Causes the terminal display to fetch the latest character image from the associated * Causes the terminal display to fetch the latest character image from the associated
* terminal screen ( see setScreenWindow() ) and redraw the display. * terminal screen ( see setScreenWindow() ) and redraw the display.
*/ */
void updateImage(); void updateImage();
/** Essentially calls processFilters().
*/
void updateFilters();
/** /**
* Causes the terminal display to fetch the latest line status flags from the * Causes the terminal display to fetch the latest line status flags from the
* associated terminal screen ( see setScreenWindow() ). * associated terminal screen ( see setScreenWindow() ).
*/ */
void updateLineProperties(); void updateLineProperties();
/** Copies the selected text to the clipboard. */ /** Copies the selected text to the clipboard. */
void copyClipboard(); void copyClipboard();
/** /**
* Pastes the content of the clipboard into the * Pastes the content of the clipboard into the
* display. * display.
*/ */
void pasteClipboard(); void pasteClipboard();
@ -417,30 +464,36 @@ public slots:
*/ */
void pasteSelection(); void pasteSelection();
/** /**
* Changes whether the flow control warning box should be shown when the flow control * Changes whether the flow control warning box should be shown when the flow control
* stop key (Ctrl+S) are pressed. * stop key (Ctrl+S) are pressed.
*/ */
void setFlowControlWarningEnabled(bool enabled); void setFlowControlWarningEnabled(bool enabled);
/**
/** * Returns true if the flow control warning box is enabled.
* Causes the widget to display or hide a message informing the user that terminal * See outputSuspended() and setFlowControlWarningEnabled()
* output has been suspended (by using the flow control key combination Ctrl+S) */
* bool flowControlWarningEnabled() const
* @param suspended True if terminal output has been suspended and the warning message should { return _flowControlWarningEnabled; }
* be shown or false to indicate that terminal output has been resumed and that
* the warning message should disappear.
*/
void outputSuspended(bool suspended);
/** /**
* Sets whether the program whoose output is being displayed in the view * Causes the widget to display or hide a message informing the user that terminal
* output has been suspended (by using the flow control key combination Ctrl+S)
*
* @param suspended True if terminal output has been suspended and the warning message should
* be shown or false to indicate that terminal output has been resumed and that
* the warning message should disappear.
*/
void outputSuspended(bool suspended);
/**
* Sets whether the program whose output is being displayed in the view
* is interested in mouse events. * is interested in mouse events.
* *
* If this is set to true, mouse signals will be emitted by the view when the user clicks, drags * If this is set to true, mouse signals will be emitted by the view when the user clicks, drags
* or otherwise moves the mouse inside the view. * or otherwise moves the mouse inside the view.
* The user interaction needed to create selections will also change, and the user will be required * The user interaction needed to create selections will also change, and the user will be required
* to hold down the shift key to create a selection or perform other mouse activities inside the * to hold down the shift key to create a selection or perform other mouse activities inside the
* view area - since the program running in the terminal is being allowed to handle normal mouse * view area - since the program running in the terminal is being allowed to handle normal mouse
* events itself. * events itself.
* *
@ -448,32 +501,41 @@ public slots:
* or false otherwise. * or false otherwise.
*/ */
void setUsesMouse(bool usesMouse); void setUsesMouse(bool usesMouse);
/** See setUsesMouse() */ /** See setUsesMouse() */
bool usesMouse() const; bool usesMouse() const;
/** void setBracketedPasteMode(bool bracketedPasteMode);
bool bracketedPasteMode() const;
/**
* Shows a notification that a bell event has occurred in the terminal. * Shows a notification that a bell event has occurred in the terminal.
* TODO: More documentation here * TODO: More documentation here
*/ */
void bell(const QString& message); void bell(const QString& message);
/**
* Sets the background of the display to the specified color.
* @see setColorTable(), setForegroundColor()
*/
void setBackgroundColor(const QColor& color);
/**
* Sets the text of the display to the specified color.
* @see setColorTable(), setBackgroundColor()
*/
void setForegroundColor(const QColor& color);
void setColorTableColor(const int colorId, const QColor &color);
void selectionChanged();
signals: signals:
/** /**
* Emitted when the user presses a key whilst the terminal widget has focus. * Emitted when the user presses a key whilst the terminal widget has focus.
*/ */
void keyPressedSignal(QKeyEvent *e); void keyPressedSignal(QKeyEvent *e, bool fromPaste);
/** /**
* Emitted when the user presses the suspend or resume flow control key combinations
*
* @param suspend true if the user pressed Ctrl+S (the suspend output key combination) or
* false if the user pressed Ctrl+Q (the resume output key combination)
*/
void flowControlKeyPressed(bool suspend);
/**
* A mouse event occurred. * A mouse event occurred.
* @param button The mouse button (0 for left button, 1 for middle button, 2 for right button, 3 for release) * @param button The mouse button (0 for left button, 1 for middle button, 2 for right button, 3 for release)
* @param column The character column where the event occurred * @param column The character column where the event occurred
@ -484,41 +546,61 @@ signals:
void changedFontMetricSignal(int height, int width); void changedFontMetricSignal(int height, int width);
void changedContentSizeSignal(int height, int width); void changedContentSizeSignal(int height, int width);
/** /**
* Emitted when the user right clicks on the display, or right-clicks with the Shift * Emitted when the user right clicks on the display, or right-clicks with the Shift
* key held down if usesMouse() is true. * key held down if usesMouse() is true.
* *
* This can be used to display a context menu. * This can be used to display a context menu.
*/ */
void configureRequest( TerminalDisplay*, int state, const QPoint& position ); void configureRequest(const QPoint& position);
/**
* When a shortcut which is also a valid terminal key sequence is pressed while
* the terminal widget has focus, this signal is emitted to allow the host to decide
* whether the shortcut should be overridden.
* When the shortcut is overridden, the key sequence will be sent to the terminal emulation instead
* and the action associated with the shortcut will not be triggered.
*
* @p override is set to false by default and the shortcut will be triggered as normal.
*/
void overrideShortcutCheck(QKeyEvent* keyEvent,bool& override);
void isBusySelecting(bool); void isBusySelecting(bool);
void sendStringToEmu(const char*); void sendStringToEmu(const char*);
// qtermwidget signals
void copyAvailable(bool);
void termGetFocus();
void termLostFocus();
void notifyBell(const QString&);
void usesMouseChanged();
protected: protected:
virtual bool event( QEvent * ); bool event( QEvent * ) override;
virtual void paintEvent( QPaintEvent * ); void paintEvent( QPaintEvent * ) override;
virtual void showEvent(QShowEvent*); void showEvent(QShowEvent*) override;
virtual void hideEvent(QHideEvent*); void hideEvent(QHideEvent*) override;
virtual void resizeEvent(QResizeEvent*); void resizeEvent(QResizeEvent*) override;
virtual void fontChange(const QFont &font); virtual void fontChange(const QFont &font);
void focusInEvent(QFocusEvent* event) override;
virtual void keyPressEvent(QKeyEvent* event); void focusOutEvent(QFocusEvent* event) override;
virtual void mouseDoubleClickEvent(QMouseEvent* ev); void keyPressEvent(QKeyEvent* event) override;
virtual void mousePressEvent( QMouseEvent* ); void mouseDoubleClickEvent(QMouseEvent* ev) override;
virtual void mouseReleaseEvent( QMouseEvent* ); void mousePressEvent( QMouseEvent* ) override;
virtual void mouseMoveEvent( QMouseEvent* ); void mouseReleaseEvent( QMouseEvent* ) override;
void mouseMoveEvent( QMouseEvent* ) override;
virtual void extendSelection( const QPoint& pos ); virtual void extendSelection( const QPoint& pos );
virtual void wheelEvent( QWheelEvent* ); void wheelEvent( QWheelEvent* ) override;
bool focusNextPrevChild( bool next ) override;
virtual bool focusNextPrevChild( bool next );
// drag and drop // drag and drop
virtual void dragEnterEvent(QDragEnterEvent* event); void dragEnterEvent(QDragEnterEvent* event) override;
virtual void dropEvent(QDropEvent* event); void dropEvent(QDropEvent* event) override;
void doDrag(); void doDrag();
enum DragState { diNone, diPending, diDragging }; enum DragState { diNone, diPending, diDragging };
@ -528,22 +610,28 @@ protected:
QDrag *dragObject; QDrag *dragObject;
} dragInfo; } dragInfo;
virtual int charClass(quint16) const; // classifies the 'ch' into one of three categories
// and returns a character to indicate which category it is in
//
// - A space (returns ' ')
// - Part of a word (returns 'a')
// - Other characters (returns the input character)
QChar charClass(QChar ch) const;
void clearImage(); void clearImage();
void mouseTripleClickEvent(QMouseEvent* ev); void mouseTripleClickEvent(QMouseEvent* ev);
// reimplemented // reimplemented
virtual void inputMethodEvent ( QInputMethodEvent* event ); void inputMethodEvent ( QInputMethodEvent* event ) override;
virtual QVariant inputMethodQuery( Qt::InputMethodQuery query ) const; QVariant inputMethodQuery( Qt::InputMethodQuery query ) const override;
protected slots: protected slots:
void scrollBarPositionChanged(int value); void scrollBarPositionChanged(int value);
void blinkEvent(); void blinkEvent();
void blinkCursorEvent(); void blinkCursorEvent();
//Renables bell noises and visuals. Used to disable further bells for a short period of time //Renables bell noises and visuals. Used to disable further bells for a short period of time
//after emitting the first in a sequence of bell events. //after emitting the first in a sequence of bell events.
void enableBell(); void enableBell();
@ -557,42 +645,43 @@ private:
// -- Drawing helpers -- // -- Drawing helpers --
// determine the width of this text
int textWidth(int startColumn, int length, int line) const;
// determine the area that encloses this series of characters
QRect calculateTextArea(int topLeftX, int topLeftY, int startColumn, int line, int length);
// divides the part of the display specified by 'rect' into // divides the part of the display specified by 'rect' into
// fragments according to their colors and styles and calls // fragments according to their colors and styles and calls
// drawTextFragment() to draw the fragments // drawTextFragment() to draw the fragments
void drawContents(QPainter &paint, const QRect &rect); void drawContents(QPainter &paint, const QRect &rect);
// draws a section of text, all the text in this section // draws a section of text, all the text in this section
// has a common color and style // has a common color and style
void drawTextFragment(QPainter& painter, const QRect& rect, void drawTextFragment(QPainter& painter, const QRect& rect,
const QString& text, const Character* style); const std::wstring& text, const Character* style);
// draws the background for a text fragment // draws the background for a text fragment
// if useOpacitySetting is true then the color's alpha value will be set to // if useOpacitySetting is true then the color's alpha value will be set to
// the display's transparency (set with setOpacity()), otherwise the background // the display's transparency (set with setOpacity()), otherwise the background
// will be drawn fully opaque // will be drawn fully opaque
void drawBackground(QPainter& painter, const QRect& rect, const QColor& color, void drawBackground(QPainter& painter, const QRect& rect, const QColor& color,
bool useOpacitySetting); bool useOpacitySetting);
// draws the cursor character // draws the cursor character
void drawCursor(QPainter& painter, const QRect& rect , const QColor& foregroundColor, void drawCursor(QPainter& painter, const QRect& rect , const QColor& foregroundColor,
const QColor& backgroundColor , bool& invertColors); const QColor& backgroundColor , bool& invertColors);
// draws the characters or line graphics in a text fragment // draws the characters or line graphics in a text fragment
void drawCharacters(QPainter& painter, const QRect& rect, const QString& text, void drawCharacters(QPainter& painter, const QRect& rect, const std::wstring& text,
const Character* style, bool invertCharacterColor); const Character* style, bool invertCharacterColor);
// draws a string of line graphics // draws a string of line graphics
void drawLineCharString(QPainter& painter, int x, int y, void drawLineCharString(QPainter& painter, int x, int y,
const QString& str, const Character* attributes); const std::wstring& str, const Character* attributes) const;
// draws the preedit string for input methods // draws the preedit string for input methods
void drawInputMethodPreeditString(QPainter& painter , const QRect& rect); void drawInputMethodPreeditString(QPainter& painter , const QRect& rect);
// -- // --
// maps an area in the character image to an area on the widget // maps an area in the character image to an area on the widget
QRect imageToWidget(const QRect& imageArea) const; QRect imageToWidget(const QRect& imageArea) const;
// maps a point on the widget to the position ( ie. line and column )
// of the character at that point.
void getCharacterPosition(const QPoint& widgetPoint,int& line,int& column) const;
// the area where the preedit string for input methods will be draw // the area where the preedit string for input methods will be draw
QRect preeditRect() const; QRect preeditRect() const;
@ -600,30 +689,43 @@ private:
// current size in columns and lines // current size in columns and lines
void showResizeNotification(); void showResizeNotification();
// scrolls the image by a number of lines. // scrolls the image by a number of lines.
// 'lines' may be positive ( to scroll the image down ) // 'lines' may be positive ( to scroll the image down )
// or negative ( to scroll the image up ) // or negative ( to scroll the image up )
// 'region' is the part of the image to scroll - currently only // 'region' is the part of the image to scroll - currently only
// the top, bottom and height of 'region' are taken into account, // the top, bottom and height of 'region' are taken into account,
// the left and right are ignored. // the left and right are ignored.
void scrollImage(int lines , const QRect& region); void scrollImage(int lines , const QRect& region);
// shows the multiline prompt
bool multilineConfirmation(const QString& text);
void calcGeometry(); void calcGeometry();
void propagateSize(); void propagateSize();
void updateImageSize(); void updateImageSize();
void makeImage(); void makeImage();
void paintFilters(QPainter& painter); void paintFilters(QPainter& painter);
// returns a region covering all of the areas of the widget which contain void calDrawTextAdditionHeight(QPainter& painter);
// a hotspot
QRegion hotSpotRegion() const;
// returns the position of the cursor in columns and lines // returns a region covering all of the areas of the widget which contain
QPoint cursorPosition() const; // a hotspot
QRegion hotSpotRegion() const;
// returns the position of the cursor in columns and lines
QPoint cursorPosition() const;
// redraws the cursor
void updateCursor();
bool handleShortcutOverrideEvent(QKeyEvent* event);
bool isLineChar(wchar_t c) const;
bool isLineCharString(const std::wstring& string) const;
// the window onto the terminal screen which this display // the window onto the terminal screen which this display
// is currently showing. // is currently showing.
QPointer<ScreenWindow> _screenWindow; QPointer<ScreenWindow> _screenWindow;
bool _allowBell; bool _allowBell;
@ -634,13 +736,16 @@ private:
int _fontHeight; // height int _fontHeight; // height
int _fontWidth; // width int _fontWidth; // width
int _fontAscent; // ascend int _fontAscent; // ascend
bool _boldIntense; // Whether intense colors should be rendered with bold font
int _drawTextAdditionHeight; // additional height to prevent font trancation
bool _drawTextTestFlag; // indicate it is a testing or not
int _leftMargin; // offset int _leftMargin; // offset
int _topMargin; // offset int _topMargin; // offset
int _lines; // the number of lines that can be displayed in the widget int _lines; // the number of lines that can be displayed in the widget
int _columns; // the number of columns that can be displayed in the widget int _columns; // the number of columns that can be displayed in the widget
int _usedLines; // the number of lines that are actually being used, this will be less int _usedLines; // the number of lines that are actually being used, this will be less
// than 'lines' if the character image provided with setImage() is smaller // than 'lines' if the character image provided with setImage() is smaller
// than the maximum image size which can be displayed // than the maximum image size which can be displayed
@ -648,7 +753,7 @@ private:
int _usedColumns; // the number of columns that are actually being used, this will be less int _usedColumns; // the number of columns that are actually being used, this will be less
// than 'columns' if the character image provided with setImage() is smaller // than 'columns' if the character image provided with setImage() is smaller
// than the maximum image size which can be displayed // than the maximum image size which can be displayed
int _contentHeight; int _contentHeight;
int _contentWidth; int _contentWidth;
Character* _image; // [lines][columns] Character* _image; // [lines][columns]
@ -665,6 +770,8 @@ private:
bool _terminalSizeStartup; bool _terminalSizeStartup;
bool _bidiEnabled; bool _bidiEnabled;
bool _mouseMarks; bool _mouseMarks;
bool _bracketedPasteMode;
bool _disabledBracketedPasteMode;
QPoint _iPntSel; // initial selection point QPoint _iPntSel; // initial selection point
QPoint _pntSel; // current selection point QPoint _pntSel; // current selection point
@ -677,7 +784,7 @@ private:
QClipboard* _clipboard; QClipboard* _clipboard;
QScrollBar* _scrollBar; QScrollBar* _scrollBar;
ScrollBarPosition _scrollbarLocation; QTermWidget::ScrollBarPosition _scrollbarLocation;
QString _wordCharacters; QString _wordCharacters;
int _bellMode; int _bellMode;
@ -685,13 +792,14 @@ private:
bool _hasBlinker; // has characters to blink bool _hasBlinker; // has characters to blink
bool _cursorBlinking; // hide cursor in paintEvent bool _cursorBlinking; // hide cursor in paintEvent
bool _hasBlinkingCursor; // has blinking cursor enabled bool _hasBlinkingCursor; // has blinking cursor enabled
bool _allowBlinkingText; // allow text to blink
bool _ctrlDrag; // require Ctrl key for drag bool _ctrlDrag; // require Ctrl key for drag
TripleClickMode _tripleClickMode; TripleClickMode _tripleClickMode;
bool _isFixedSize; //Columns / lines are locked. bool _isFixedSize; //Columns / lines are locked.
QTimer* _blinkTimer; // active when hasBlinker QTimer* _blinkTimer; // active when hasBlinker
QTimer* _blinkCursorTimer; // active when hasBlinkingCursor QTimer* _blinkCursorTimer; // active when hasBlinkingCursor
// KMenu* _drop; //QMenu* _drop;
QString _dropText; QString _dropText;
int _dndFileCount; int _dndFileCount;
@ -702,35 +810,42 @@ private:
QLabel* _resizeWidget; QLabel* _resizeWidget;
QTimer* _resizeTimer; QTimer* _resizeTimer;
bool _flowControlWarningEnabled; bool _flowControlWarningEnabled;
//widgets related to the warning message that appears when the user presses Ctrl+S to suspend //widgets related to the warning message that appears when the user presses Ctrl+S to suspend
//terminal output - informing them what has happened and how to resume output //terminal output - informing them what has happened and how to resume output
QLabel* _outputSuspendedLabel; QLabel* _outputSuspendedLabel;
uint _lineSpacing; uint _lineSpacing;
bool _colorsInverted; // true during visual bell bool _colorsInverted; // true during visual bell
QSize _size; QSize _size;
QRgb _blendColor; qreal _opacity;
QPixmap _backgroundImage;
BackgroundMode _backgroundMode;
// list of filters currently applied to the display. used for links and // list of filters currently applied to the display. used for links and
// search highlight // search highlight
TerminalImageFilterChain* _filterChain; TerminalImageFilterChain* _filterChain;
QRect _mouseOverHotspotArea; QRegion _mouseOverHotspotArea;
KeyboardCursorShape _cursorShape; QTermWidget::KeyboardCursorShape _cursorShape;
// custom cursor color. if this is invalid then the foreground // custom cursor color. if this is invalid then the foreground
// color of the character under the cursor is used // color of the character under the cursor is used
QColor _cursorColor; QColor _cursorColor;
MotionAfterPasting mMotionAfterPasting;
bool _confirmMultilinePaste;
bool _trimPastedTrailingNewlines;
struct InputMethodData struct InputMethodData
{ {
QString preeditString; std::wstring preeditString;
QRect previousPreeditRect; QRect previousPreeditRect;
}; };
InputMethodData _inputMethodData; InputMethodData _inputMethodData;
@ -738,9 +853,12 @@ private:
static bool _antialiasText; // do we antialias or not static bool _antialiasText; // do we antialias or not
//the delay in milliseconds between redrawing blinking text //the delay in milliseconds between redrawing blinking text
static const int BLINK_DELAY = 500; static const int TEXT_BLINK_DELAY = 500;
static const int DEFAULT_LEFT_MARGIN = 1;
static const int DEFAULT_TOP_MARGIN = 1; int _leftBaseMargin;
int _topBaseMargin;
bool _drawLineChars;
public: public:
static void setTransparencyEnabled(bool enable) static void setTransparencyEnabled(bool enable)
@ -749,6 +867,20 @@ public:
} }
}; };
class AutoScrollHandler : public QObject
{
Q_OBJECT
public:
AutoScrollHandler(QWidget* parent);
protected:
void timerEvent(QTimerEvent* event) override;
bool eventFilter(QObject* watched,QEvent* event) override;
private:
QWidget* widget() const { return static_cast<QWidget*>(parent()); }
int _timerId;
};
} }
#endif // TERMINALDISPLAY_H #endif // TERMINALDISPLAY_H

1030
qtermwidget/src/Vt102Emulation.cpp → qtermwidget/lib/Vt102Emulation.cpp
View File

File diff suppressed because it is too large Load Diff

149
qtermwidget/src/Vt102Emulation.h → qtermwidget/lib/Vt102Emulation.h
View File

@ -1,10 +1,8 @@
/* /*
This file is part of Konsole, an X terminal. This file is part of Konsole, an X terminal.
Copyright (C) 2007 by Robert Knight <robertknight@gmail.com>
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
Rewritten for QT4 by e_k <e_k at users.sourceforge.net>, Copyright (C)2008 Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -26,35 +24,36 @@
#define VT102EMULATION_H #define VT102EMULATION_H
// Standard Library // Standard Library
#include <stdio.h> #include <cstdio>
// Qt // Qt
#include <QtGui/QKeyEvent> #include <QKeyEvent>
#include <QtCore/QHash> #include <QHash>
#include <QtCore/QTimer> #include <QTimer>
// Konsole // Konsole
#include "Emulation.h" #include "Emulation.h"
#include "Screen.h" #include "Screen.h"
#define MODE_AppScreen (MODES_SCREEN+0) #define MODE_AppScreen (MODES_SCREEN+0) // Mode #1
#define MODE_AppCuKeys (MODES_SCREEN+1) #define MODE_AppCuKeys (MODES_SCREEN+1) // Application cursor keys (DECCKM)
#define MODE_AppKeyPad (MODES_SCREEN+2) #define MODE_AppKeyPad (MODES_SCREEN+2) //
#define MODE_Mouse1000 (MODES_SCREEN+3) #define MODE_Mouse1000 (MODES_SCREEN+3) // Send mouse X,Y position on press and release
#define MODE_Mouse1001 (MODES_SCREEN+4) #define MODE_Mouse1001 (MODES_SCREEN+4) // Use Highlight mouse tracking
#define MODE_Mouse1002 (MODES_SCREEN+5) #define MODE_Mouse1002 (MODES_SCREEN+5) // Use cell motion mouse tracking
#define MODE_Mouse1003 (MODES_SCREEN+6) #define MODE_Mouse1003 (MODES_SCREEN+6) // Use all motion mouse tracking
#define MODE_Ansi (MODES_SCREEN+7) #define MODE_Mouse1005 (MODES_SCREEN+7) // Xterm-style extended coordinates
#define MODE_total (MODES_SCREEN+8) #define MODE_Mouse1006 (MODES_SCREEN+8) // 2nd Xterm-style extended coordinates
#define MODE_Mouse1015 (MODES_SCREEN+9) // Urxvt-style extended coordinates
#define MODE_Ansi (MODES_SCREEN+10) // Use US Ascii for character sets G0-G3 (DECANM)
#define MODE_132Columns (MODES_SCREEN+11) // 80 <-> 132 column mode switch (DECCOLM)
#define MODE_Allow132Columns (MODES_SCREEN+12) // Allow DECCOLM mode
#define MODE_BracketedPaste (MODES_SCREEN+13) // Xterm-style bracketed paste mode
#define MODE_total (MODES_SCREEN+14)
namespace Konsole namespace Konsole
{ {
struct DECpar
{
bool mode[MODE_total];
};
struct CharCodes struct CharCodes
{ {
// coding info // coding info
@ -69,56 +68,49 @@ struct CharCodes
/** /**
* Provides an xterm compatible terminal emulation based on the DEC VT102 terminal. * Provides an xterm compatible terminal emulation based on the DEC VT102 terminal.
* A full description of this terminal can be found at http://vt100.net/docs/vt102-ug/ * A full description of this terminal can be found at http://vt100.net/docs/vt102-ug/
* *
* In addition, various additional xterm escape sequences are supported to provide * In addition, various additional xterm escape sequences are supported to provide
* features such as mouse input handling. * features such as mouse input handling.
* See http://rtfm.etla.org/xterm/ctlseq.html for a description of xterm's escape * See http://rtfm.etla.org/xterm/ctlseq.html for a description of xterm's escape
* sequences. * sequences.
* *
*/ */
class Vt102Emulation : public Emulation class Vt102Emulation : public Emulation
{ {
Q_OBJECT Q_OBJECT
public: public:
/** Constructs a new emulation */ /** Constructs a new emulation */
Vt102Emulation(); Vt102Emulation();
~Vt102Emulation(); ~Vt102Emulation() override;
// reimplemented // reimplemented from Emulation
virtual void clearEntireScreen(); void clearEntireScreen() override;
virtual void reset(); void reset() override;
char eraseChar() const override;
// reimplemented
virtual char getErase() const; public slots:
// reimplemented from Emulation
public slots: void sendString(const char*,int length = -1) override;
void sendText(const QString& text) override;
void sendKeyEvent(QKeyEvent*, bool fromPaste) override;
void sendMouseEvent(int buttons, int column, int line, int eventType) override;
virtual void focusLost();
virtual void focusGained();
// reimplemented
virtual void sendString(const char*,int length = -1);
virtual void sendText(const QString& text);
virtual void sendKeyEvent(QKeyEvent*);
virtual void sendMouseEvent( int buttons, int column, int line , int eventType );
protected: protected:
// reimplemented // reimplemented from Emulation
virtual void setMode (int mode); void setMode(int mode) override;
virtual void resetMode (int mode); void resetMode(int mode) override;
void receiveChar(wchar_t cc) override;
// reimplemented
virtual void receiveChar(int cc);
private slots: private slots:
//causes changeTitle() to be emitted for each (int,QString) pair in pendingTitleUpdates //causes changeTitle() to be emitted for each (int,QString) pair in pendingTitleUpdates
//used to buffer multiple title updates //used to buffer multiple title updates
void updateTitle(); void updateTitle();
private: private:
unsigned short applyCharset(unsigned short c); wchar_t applyCharset(wchar_t c);
void setCharset(int n, int cs); void setCharset(int n, int cs);
void useCharset(int n); void useCharset(int n);
void setAndUseCharset(int n, int cs); void setAndUseCharset(int n, int cs);
@ -134,29 +126,35 @@ private:
bool getMode (int mode); bool getMode (int mode);
// saves the current boolean value of 'mode' // saves the current boolean value of 'mode'
void saveMode (int mode); void saveMode (int mode);
// restores the boolean value of 'mode' // restores the boolean value of 'mode'
void restoreMode(int mode); void restoreMode(int mode);
// resets all modes // resets all modes
// (except MODE_Allow132Columns)
void resetModes(); void resetModes();
void resetToken(); void resetTokenizer();
#define MAXPBUF 80 #define MAX_TOKEN_LENGTH 256 // Max length of tokens (e.g. window title)
void pushToToken(int cc); void addToCurrentToken(wchar_t cc);
int pbuf[MAXPBUF]; //FIXME: overflow? wchar_t tokenBuffer[MAX_TOKEN_LENGTH]; //FIXME: overflow?
int ppos; int tokenBufferPos;
#define MAXARGS 15 #define MAXARGS 15
void addDigit(int dig); void addDigit(int dig);
void addArgument(); void addArgument();
int argv[MAXARGS]; int argv[MAXARGS];
int argc; int argc;
void initTokenizer(); void initTokenizer();
int tbl[256]; int prevCC;
void scan_buffer_report(); //FIXME: rename // Set of flags for each of the ASCII characters which indicates
void ReportErrorToken(); //FIXME: rename // what category they fall into (printable character, control, digit etc.)
// for the purposes of decoding terminal output
int charClass[256];
void tau(int code, int p, int q); void reportDecodingError();
void XtermHack();
void processToken(int code, wchar_t p, int q);
void processWindowAttributeChange();
void requestWindowAttribute(int);
void reportTerminalType(); void reportTerminalType();
void reportSecondaryAttributes(); void reportSecondaryAttributes();
@ -174,17 +172,28 @@ private:
CharCodes _charset[2]; CharCodes _charset[2];
DECpar _currParm; class TerminalState
DECpar _saveParm; {
public:
// Initializes all modes to false
TerminalState()
{ memset(&mode,false,MODE_total * sizeof(bool)); }
//hash table and timer for buffering calls to the session instance bool mode[MODE_total];
};
TerminalState _currentModes;
TerminalState _savedModes;
//hash table and timer for buffering calls to the session instance
//to update the name of the session //to update the name of the session
//or window title. //or window title.
//these calls occur when certain escape sequences are seen in the //these calls occur when certain escape sequences are seen in the
//output from the terminal //output from the terminal
QHash<int,QString> _pendingTitleUpdates; QHash<int,QString> _pendingTitleUpdates;
QTimer* _titleUpdateTimer; QTimer* _titleUpdateTimer;
bool _reportFocusEvents;
}; };
} }

94
qtermwidget/lib/color-schemes/BlackOnLightYellow.colorscheme 100644
View File

@ -0,0 +1,94 @@
[Background]
Color=255,255,221
[BackgroundIntense]
Color=255,255,221
[BackgroundFaint]
Color=255,255,221
[Color0]
Color=0,0,0
[Color0Intense]
Color=104,104,104
[Color0Faint]
Color=192,192,192
[Color1]
Color=178,24,24
[Color1Intense]
Color=255,84,84
[Color1Faint]
Color=224,142,142
[Color2]
Color=24,178,24
[Color2Intense]
Color=84,255,84
[Color2Faint]
Color=142,224,142
[Color3]
Color=178,104,24
[Color3Intense]
Color=255,255,84
[Color3Faint]
Color=224,224,142
[Color4]
Color=24,24,178
[Color4Intense]
Color=84,84,255
[Color4Faint]
Color=142,142,224
[Color5]
Color=178,24,178
[Color5Intense]
Color=255,84,255
[Color5Faint]
Color=224,142,224
[Color6]
Color=24,178,178
[Color6Intense]
Color=84,255,255
[Color6Faint]
Color=142,224,224
[Color7]
Color=178,178,178
[Color7Intense]
Color=255,255,255
[Color7Faint]
Color=142,142,142
[Foreground]
Color=0,0,0
[ForegroundIntense]
Bold=true
Color=0,0,0
[ForegroundFaint]
Color=0,0,0
[General]
Description=Black on Light Yellow
Opacity=1

104
qtermwidget/lib/color-schemes/BlackOnRandomLight.colorscheme 100644
View File

@ -0,0 +1,104 @@
[Background]
Bold=false
Color=247,247,214
Transparency=true
MaxRandomHue=340
[BackgroundIntense]
Bold=false
Color=255,255,221
Transparency=true
[Color0]
Bold=false
Color=0,0,0
Transparency=false
[Color0Intense]
Bold=false
Color=104,104,104
Transparency=false
[Color1]
Bold=false
Color=178,24,24
Transparency=false
[Color1Intense]
Bold=false
Color=255,84,84
Transparency=false
[Color2]
Bold=false
Color=24,178,24
Transparency=false
[Color2Intense]
Bold=false
Color=84,255,84
Transparency=false
[Color3]
Bold=false
Color=178,104,24
Transparency=false
[Color3Intense]
Bold=false
Color=255,255,84
Transparency=false
[Color4]
Bold=false
Color=24,24,178
Transparency=false
[Color4Intense]
Bold=false
Color=84,84,255
Transparency=false
[Color5]
Bold=false
Color=178,24,178
Transparency=false
[Color5Intense]
Bold=false
Color=255,84,255
Transparency=false
[Color6]
Bold=false
Color=24,178,178
Transparency=false
[Color6Intense]
Bold=false
Color=84,255,255
Transparency=false
[Color7]
Bold=false
Color=178,178,178
Transparency=false
[Color7Intense]
Bold=false
Color=255,255,255
Transparency=false
[Foreground]
Bold=false
Color=0,0,0
Transparency=false
[ForegroundIntense]
Bold=true
Color=0,0,0
Transparency=false
[General]
Description=Black on Random Light
Opacity=1

94
qtermwidget/lib/color-schemes/BlackOnWhite.colorscheme 100644
View File

@ -0,0 +1,94 @@
[Background]
Color=255,255,255
[BackgroundIntense]
Color=255,255,255
[BackgroundFaint]
Color=255,255,255
[Color0]
Color=0,0,0
[Color0Intense]
Color=104,104,104
[Color0Faint]
Color=192,192,192
[Color1]
Color=178,24,24
[Color1Intense]
Color=255,84,84
[Color1Faint]
Color=224,142,142
[Color2]
Color=24,178,24
[Color2Intense]
Color=84,255,84
[Color2Faint]
Color=142,224,142
[Color3]
Color=178,104,24
[Color3Intense]
Color=255,255,84
[Color3Faint]
Color=224,224,142
[Color4]
Color=24,24,178
[Color4Intense]
Color=84,84,255
[Color4Faint]
Color=142,142,224
[Color5]
Color=178,24,178
[Color5Intense]
Color=255,84,255
[Color5Faint]
Color=224,142,224
[Color6]
Color=24,178,178
[Color6Intense]
Color=84,255,255
[Color6Faint]
Color=142,224,224
[Color7]
Color=178,178,178
[Color7Intense]
Color=255,255,255
[Color7Faint]
Color=142,142,142
[Foreground]
Color=0,0,0
[ForegroundIntense]
Bold=true
Color=0,0,0
[ForegroundFaint]
Color=0,0,0
[General]
Description=Black on White
Opacity=1

95
qtermwidget/lib/color-schemes/BreezeModified.colorscheme 100644
View File

@ -0,0 +1,95 @@
[Background]
Color=49,54,59
[BackgroundFaint]
Color=49,54,59
[BackgroundIntense]
Color=35,38,41
[Color0]
Color=7,54,66
[Color0Faint]
Color=32,43,54
[Color0Intense]
Color=255,85,0
[Color1]
Color=237,21,21
[Color1Faint]
Color=120,50,40
[Color1Intense]
Color=192,57,43
[Color2]
Color=17,209,22
[Color2Faint]
Color=23,162,98
[Color2Intense]
Color=28,220,154
[Color3]
Color=246,116,0
[Color3Faint]
Color=182,86,25
[Color3Intense]
Color=253,188,75
[Color4]
Color=29,153,243
[Color4Faint]
Color=27,102,143
[Color4Intense]
Color=61,174,233
[Color5]
Color=155,89,182
[Color5Faint]
Color=97,74,115
[Color5Intense]
Color=142,68,173
[Color6]
Color=26,188,156
[Color6Faint]
Color=24,108,96
[Color6Intense]
Color=22,160,133
[Color7]
Color=239,240,241
[Color7Faint]
Color=99,104,109
[Color7Intense]
Color=252,252,252
[Foreground]
Color=239,240,241
[ForegroundFaint]
Color=220,230,231
[ForegroundIntense]
Color=252,252,252
[General]
Description=BreezeModified
Opacity=0.95
Wallpaper=

103
qtermwidget/lib/color-schemes/DarkPastels.colorscheme 100644
View File

@ -0,0 +1,103 @@
[Background]
Bold=false
Color=44,44,44
Transparency=false
[BackgroundIntense]
Bold=true
Color=44,44,44
Transparency=false
[Color0]
Bold=false
Color=63,63,63
Transparency=false
[Color0Intense]
Bold=true
Color=112,144,128
Transparency=false
[Color1]
Bold=false
Color=112,80,80
Transparency=false
[Color1Intense]
Bold=true
Color=220,163,163
Transparency=false
[Color2]
Bold=false
Color=96,180,138
Transparency=false
[Color2Intense]
Bold=true
Color=114,213,163
Transparency=false
[Color3]
Bold=false
Color=223,175,143
Transparency=false
[Color3Intense]
Bold=true
Color=240,223,175
Transparency=false
[Color4]
Bold=false
Color=154,184,215
Transparency=false
[Color4Intense]
Bold=true
Color=148,191,243
Transparency=false
[Color5]
Bold=false
Color=220,140,195
Transparency=false
[Color5Intense]
Bold=true
Color=236,147,211
Transparency=false
[Color6]
Bold=false
Color=140,208,211
Transparency=false
[Color6Intense]
Bold=true
Color=147,224,227
Transparency=false
[Color7]
Bold=false
Color=220,220,204
Transparency=false
[Color7Intense]
Bold=true
Color=255,255,255
Transparency=false
[Foreground]
Bold=false
Color=220,220,204
Transparency=false
[ForegroundIntense]
Bold=true
Color=220,220,204
Transparency=false
[General]
Description=Dark Pastels
Opacity=1

104
qtermwidget/lib/color-schemes/GreenOnBlack.colorscheme 100644
View File

@ -0,0 +1,104 @@
[Background]
Bold=false
Color=0,0,0
Transparency=false
[BackgroundIntense]
Bold=false
Color=0,0,0
Transparency=false
[Color0]
Bold=false
Color=0,0,0
Transparency=false
[Color0Intense]
Bold=false
Color=104,104,104
Transparency=false
[Color1]
Bold=false
Color=250,75,75
Transparency=false
[Color1Intense]
Bold=false
Color=255,84,84
Transparency=false
[Color2]
Bold=false
Color=24,178,24
Transparency=false
[Color2Intense]
Bold=false
Color=84,255,84
Transparency=false
[Color3]
Bold=false
Color=178,104,24
Transparency=false
[Color3Intense]
Bold=false
Color=255,255,84
Transparency=false
[Color4]
Bold=false
Color=92,167,251
Transparency=false
[Color4Intense]
Bold=false
Color=84,84,255
Transparency=false
[Color5]
Bold=false
Color=225,30,225
Transparency=false
[Color5Intense]
Bold=false
Color=255,84,255
Transparency=false
[Color6]
Bold=false
Color=24,178,178
Transparency=false
[Color6Intense]
Bold=false
Color=84,255,255
Transparency=false
[Color7]
Bold=false
Color=178,178,178
Transparency=false
[Color7Intense]
Bold=false
Color=255,255,255
Transparency=false
[Foreground]
Bold=false
Color=24,240,24
Transparency=false
[ForegroundIntense]
Bold=true
Color=24,240,24
Transparency=false
[General]
Description=Green on Black
Opacity=1

100
qtermwidget/lib/color-schemes/Linux.colorscheme 100644
View File

@ -0,0 +1,100 @@
[Background]
Bold=false
Color=0,0,0
[BackgroundIntense]
Bold=false
Color=104,104,104
[Color0]
Bold=false
Color=0,0,0
[Color0Intense]
Bold=false
Color=104,104,104
[Color1]
Bold=false
Color=178,24,24
[Color1Intense]
Bold=false
Color=255,84,84
[Color2]
Bold=false
Color=24,178,24
[Color2Intense]
Bold=false
Color=84,255,84
[Color3]
Bold=false
Color=178,104,24
[Color3Intense]
Bold=false
Color=255,255,84
[Color4]
Bold=false
Color=24,24,178
[Color4Intense]
Bold=false
Color=84,84,255
[Color5]
Bold=false
Color=178,24,178
[Color5Intense]
Bold=false
Color=255,84,255
[Color6]
Bold=false
Color=24,178,178
[Color6Intense]
Bold=false
Color=84,255,255
[Color7]
Bold=false
Color=178,178,178
[Color7Intense]
Bold=false
Color=255,255,255
[Foreground]
Bold=false
Color=178,178,178
[ForegroundIntense]
Bold=false
Color=255,255,255
[General]
Description=Linux Colors

93
qtermwidget/lib/color-schemes/Solarized.colorscheme 100644
View File

@ -0,0 +1,93 @@
[Color0]
Color=7,54,66
[Color0Intense]
Color=0,43,54
[Color0Faint]
Color=6,48,59
[Color1]
Color=220,50,47
[Color1Intense]
Color=203,75,22
[Color1Faint]
Color=147,33,31
[Color2]
Color=133,153,0
[Color2Intense]
Color=88,110,117
[Color2Faint]
Color=94,106,0
[Color3]
Color=181,137,0
[Color3Intense]
Color=101,123,131
[Color3Faint]
Color=138,103,0
[Color4]
Color=38,139,210
[Color4Intense]
Color=131,148,150
[Color4Faint]
Color=20,77,115
[Color5]
Color=211,54,130
[Color5Intense]
Color=108,113,196
[Color5Faint]
Color=120,30,75
[Color6]
Color=42,161,152
[Color6Intense]
Color=147,161,161
[Color6Faint]
Color=24,94,88
[Color7]
Color=238,232,213
[Color7Intense]
Color=253,246,227
[Color7Faint]
Color=171,167,154
[Background]
Color=0,43,54
[BackgroundIntense]
Color=7,54,66
[BackgroundFaint]
Color=0,43,54
[Foreground]
Color=131,148,150
[ForegroundIntense]
Color=147,161,161
[ForegroundFaint]
Color=106,119,121
[General]
Description=Solarized
Opacity=1

93
qtermwidget/lib/color-schemes/SolarizedLight.colorscheme 100644
View File

@ -0,0 +1,93 @@
[Color0]
Color=7,54,66
[Color0Intense]
Color=0,43,54
[Color0Faint]
Color=8,65,80
[Color1]
Color=220,50,47
[Color1Intense]
Color=203,75,22
[Color1Faint]
Color=222,81,81
[Color2]
Color=133,153,0
[Color2Intense]
Color=88,110,117
[Color2Faint]
Color=153,168,39
[Color3]
Color=181,137,0
[Color3Intense]
Color=101,123,131
[Color3Faint]
Color=213,170,49
[Color4]
Color=38,139,210
[Color4Intense]
Color=131,148,150
[Color4Faint]
Color=80,173,226
[Color5]
Color=211,54,130
[Color5Intense]
Color=108,113,196
[Color5Faint]
Color=223,92,158
[Color6]
Color=42,161,152
[Color6Intense]
Color=147,161,161
[Color6Faint]
Color=78,211,200
[Color7]
Color=238,232,213
[Color7Intense]
Color=253,246,227
[Color7Faint]
Color=238,232,213
[Background]
Color=253,246,227
[BackgroundIntense]
Color=238,232,213
[BackgroundFaint]
Color=253,246,227
[Foreground]
Color=101,123,131
[ForegroundIntense]
Color=88,110,117
[ForegroundFaint]
Color=141,172,182
[General]
Description=Solarized Light
Opacity=1

71
qtermwidget/lib/color-schemes/Tango.colorscheme 100644
View File

@ -0,0 +1,71 @@
[General]
Description=Tango
[Background]
Color=0,0,0
[BackgroundIntense]
Color=104,104,104
[Foreground]
;Color=211,215,207
Color=255,255,255
[ForegroundIntense]
Color=255,255,255
; black
[Color0]
Color=0,0,0
[Color0Intense]
Color=85,87,83
; red
[Color1]
Color=204,0,0
[Color1Intense]
Color=239,41,41
; green
[Color2]
Color=78,154,6
[Color2Intense]
Color=138,226,52
; yellow
[Color3]
Color=196,160,0
[Color3Intense]
Color=252,233,79
; blue
[Color4]
Color=52,101,164
[Color4Intense]
Color=114,159,207
; magenta
[Color5]
Color=117,80,123
[Color5Intense]
Color=173,127,168
; aqua
[Color6]
Color=6,152,154
[Color6Intense]
Color=52,226,226
; grey
[Color7]
Color=211,215,207
[Color7Intense]
Color=238,238,236

67
qtermwidget/lib/color-schemes/Ubuntu.colorscheme 100644
View File

@ -0,0 +1,67 @@
[General]
Description=Ubuntu
Opacity=1
Wallpaper=
[Background]
Color=48,10,36
MaxRandomHue=0
MaxRandomSaturation=0
MaxRandomValue=0
[BackgroundIntense]
Color=48,10,36
[Color0]
Color=46,52,54
[Color0Intense]
Color=85,87,83
[Color1]
Color=204,0,0
[Color1Intense]
Color=239,41,41
[Color2]
Color=78,154,6
[Color2Intense]
Color=138,226,52
[Color3]
Color=196,160,0
[Color3Intense]
Color=252,233,79
[Color4]
Color=52,101,164
[Color4Intense]
Color=114,159,207
[Color5]
Color=117,80,123
[Color5Intense]
Color=173,127,168
[Color6]
Color=6,152,154
[Color6Intense]
Color=52,226,226
[Color7]
Color=211,215,207
[Color7Intense]
Color=238,238,236
[Foreground]
Color=238,238,236
[ForegroundIntense]
Color=238,238,236

94
qtermwidget/lib/color-schemes/WhiteOnBlack.colorscheme 100644
View File

@ -0,0 +1,94 @@
[Background]
Color=0,0,0
[BackgroundIntense]
Color=0,0,0
[BackgroundFaint]
Color=0,0,0
[Color0]
Color=0,0,0
[Color0Intense]
Color=104,104,104
[Color0Faint]
Color=24,24,24
[Color1]
Color=178,24,24
[Color1Intense]
Color=255,84,84
[Color1Faint]
Color=101,0,0
[Color2]
Color=24,178,24
[Color2Intense]
Color=84,255,84
[Color2Faint]
Color=0,101,0
[Color3]
Color=178,104,24
[Color3Intense]
Color=255,255,84
[Color3Faint]
Color=101,74,0
[Color4]
Color=24,24,178
[Color4Intense]
Color=84,84,255
[Color4Faint]
Color=0,0,101
[Color5]
Color=178,24,178
[Color5Intense]
Color=255,84,255
[Color5Faint]
Color=95,5,95
[Color6]
Color=24,178,178
[Color6Intense]
Color=84,255,255
[Color6Faint]
Color=24,178,178
[Color7]
Color=178,178,178
[Color7Intense]
Color=255,255,255
[Color7Faint]
Color=101,101,101
[Foreground]
Color=255,255,255
[ForegroundIntense]
Bold=true
Color=255,255,255
[ForegroundFaint]
Color=255,255,255
[General]
Description=White on Black
Opacity=1

42
qtermwidget/lib/color-schemes/historic/BlackOnLightColor.schema 100644
View File

@ -0,0 +1,42 @@
# example scheme for konsole
# the title is to appear in the menu.
title Black on Light Color
# foreground colors
# note that the default background color is flagged
# to become transparent when an image is present.
# slot transparent bold
# | | |
# V V--color--V V V
color 0 0 0 0 0 0 # regular foreground color (Black)
rcolor 1 30 255 1 0 # regular background color (Light Color)
color 2 0 0 0 0 0 # regular color 0 Black
color 3 178 24 24 0 0 # regular color 1 Red
color 4 24 178 24 0 0 # regular color 2 Green
color 5 178 104 24 0 0 # regular color 3 Yellow
color 6 24 24 178 0 0 # regular color 4 Blue
color 7 178 24 178 0 0 # regular color 5 Magenta
color 8 24 178 178 0 0 # regular color 6 Cyan
color 9 178 178 178 0 0 # regular color 7 White
# intensive colors
# instead of changing the colors, we've flagged the text to become bold
color 10 0 0 0 0 1 # intensive foreground color
color 11 255 255 221 1 0 # intensive background color
color 12 104 104 104 0 0 # intensive color 0
color 13 255 84 84 0 0 # intensive color 1
color 14 84 255 84 0 0 # intensive color 2
color 15 255 255 84 0 0 # intensive color 3
color 16 84 84 255 0 0 # intensive color 4
color 17 255 84 255 0 0 # intensive color 5
color 18 84 255 255 0 0 # intensive color 6
color 19 255 255 255 0 0 # intensive color 7

44
qtermwidget/lib/color-schemes/historic/DarkPicture.schema 100644
View File

@ -0,0 +1,44 @@
# example scheme for konsole
# the title is to appear in the menu.
title Marble
image tile Blkmarble.jpg
# foreground colors
# note that the default background color is flagged
# to become transparent when an image is present.
# slot transparent bold
# | | |
# V V--color--V V V
color 0 255 255 255 0 0 # regular foreground color (White)
color 1 0 0 0 1 0 # regular background color (Black)
color 2 0 0 0 0 0 # regular color 0 Black
color 3 178 24 24 0 0 # regular color 1 Red
color 4 24 178 24 0 0 # regular color 2 Green
color 5 178 104 24 0 0 # regular color 3 Yellow
color 6 24 24 178 0 0 # regular color 4 Blue
color 7 178 24 178 0 0 # regular color 5 Magenta
color 8 24 178 178 0 0 # regular color 6 Cyan
color 9 178 178 178 0 0 # regular color 7 White
# intensive colors
# instead of changing the colors, we've flagged the text to become bold
color 10 255 255 255 0 1 # intensive foreground color
color 11 0 0 0 1 0 # intensive background color
color 12 104 104 104 0 0 # intensive color 0
color 13 255 84 84 0 0 # intensive color 1
color 14 84 255 84 0 0 # intensive color 2
color 15 255 255 84 0 0 # intensive color 3
color 16 84 84 255 0 0 # intensive color 4
color 17 255 84 255 0 0 # intensive color 5
color 18 84 255 255 0 0 # intensive color 6
color 19 255 255 255 0 0 # intensive color 7

47
qtermwidget/lib/color-schemes/historic/Example.Schema 100644
View File

@ -0,0 +1,47 @@
# example scheme for konsole
# the title is to appear in the menu.
title Ugly 1
# add a wallpaper, if you like. Second word one of { tile,center,full }
image tile /opt/kde/share/wallpapers/dancy_pants.jpg
# foreground colors
# note that the default background color is flagged
# to become transparent when an image is present.
# slot transparent bold
# | | |
# V V--color--V V V
color 0 0 0 0 0 0 # regular foreground color (Black)
color 1 255 255 255 1 0 # regular background color (White)
color 2 0 0 0 0 0 # regular color 0 Black
color 3 255 0 0 0 0 # regular color 1 Red
color 4 0 255 0 0 0 # regular color 2 Green
color 5 255 255 0 0 0 # regular color 3 Yellow
color 6 0 0 255 0 0 # regular color 4 Blue
color 7 255 0 255 0 0 # regular color 5 Magenta
color 8 0 255 255 0 0 # regular color 6 Cyan
color 9 255 255 255 0 0 # regular color 7 White
# intensive colors
# instead of changing the colors, we've flagged the text to become bold
color 10 0 0 0 0 1 # intensive foreground color
color 11 255 255 255 1 1 # intensive background color
color 12 0 0 0 0 1 # intensive color 0
color 13 255 0 0 0 1 # intensive color 1
color 14 0 255 0 0 1 # intensive color 2
color 15 255 255 0 0 1 # intensive color 3
color 16 0 0 255 0 1 # intensive color 4
color 17 255 0 255 0 1 # intensive color 5
color 18 0 255 255 0 1 # intensive color 6
color 19 255 255 255 0 1 # intensive color 7

42
qtermwidget/lib/color-schemes/historic/GreenOnBlack.schema 100644
View File

@ -0,0 +1,42 @@
# example scheme for konsole
# the title is to appear in the menu.
title Green on Black
# foreground colors
# note that the default background color is flagged
# to become transparent when an image is present.
# slot transparent bold
# | | |
# V V--color--V V V
color 0 24 240 24 0 0 # regular foreground color (Green)
color 1 0 0 0 1 0 # regular background color (Black)
color 2 0 0 0 0 0 # regular color 0 Black
color 3 178 24 24 0 0 # regular color 1 Red
color 4 24 178 24 0 0 # regular color 2 Green
color 5 178 104 24 0 0 # regular color 3 Yellow
color 6 24 24 178 0 0 # regular color 4 Blue
color 7 178 24 178 0 0 # regular color 5 Magenta
color 8 24 178 178 0 0 # regular color 6 Cyan
color 9 178 178 178 0 0 # regular color 7 White
# intensive colors
# instead of changing the colors, we've flagged the text to become bold
color 10 24 240 24 0 1 # intensive foreground color
color 11 0 0 0 1 0 # intensive background color
color 12 104 104 104 0 0 # intensive color 0
color 13 255 84 84 0 0 # intensive color 1
color 14 84 255 84 0 0 # intensive color 2
color 15 255 255 84 0 0 # intensive color 3
color 16 84 84 255 0 0 # intensive color 4
color 17 255 84 255 0 0 # intensive color 5
color 18 84 255 255 0 0 # intensive color 6
color 19 255 255 255 0 0 # intensive color 7

49
qtermwidget/lib/color-schemes/historic/GreenTint.schema 100644
View File

@ -0,0 +1,49 @@
# linux color schema for konsole
title Green Tint
transparency 0.3 0 150 0
# FIXME
#
# The flaw in this schema is that "blick" comes out on the
# Linux console as intensive background, really.
# Since this is not used in clients you'll hardly notice
# it in practice.
# foreground colors
# note that the default background color is flagged
# to become transparent when an image is present.
# slot transparent bold
# | red grn blu | |
# V V--color--V V V
color 0 178 178 178 0 0 # regular foreground color (White)
color 1 0 0 0 1 0 # regular background color (Black)
color 2 0 0 0 0 0 # regular color 0 Black
color 3 178 24 24 0 0 # regular color 1 Red
color 4 24 178 24 0 0 # regular color 2 Green
color 5 178 104 24 0 0 # regular color 3 Yellow
color 6 24 24 178 0 0 # regular color 4 Blue
color 7 178 24 178 0 0 # regular color 5 Magenta
color 8 24 178 178 0 0 # regular color 6 Cyan
color 9 178 178 178 0 0 # regular color 7 White
# intensive colors
# instead of changing the colors, we've flagged the text to become bold
color 10 255 255 255 0 0 # intensive foreground color
color 11 104 104 104 1 0 # intensive background color
color 12 104 104 104 0 0 # intensive color 0
color 13 255 84 84 0 0 # intensive color 1
color 14 84 255 84 0 0 # intensive color 2
color 15 255 255 84 0 0 # intensive color 3
color 16 84 84 255 0 0 # intensive color 4
color 17 255 84 255 0 0 # intensive color 5
color 18 84 255 255 0 0 # intensive color 6
color 19 255 255 255 0 0 # intensive color 7

49
qtermwidget/lib/color-schemes/historic/GreenTint_MC.schema 100644
View File

@ -0,0 +1,49 @@
# linux color schema for konsole
title Green Tint with Transparent MC
transparency 0.3 0 150 0
# FIXME
#
# The flaw in this schema is that "blick" comes out on the
# Linux console as intensive background, really.
# Since this is not used in clients you'll hardly notice
# it in practice.
# foreground colors
# note that the default background color is flagged
# to become transparent when an image is present.
# slot transparent bold
# | red grn blu | |
# V V--color--V V V
color 0 178 178 178 0 0 # regular foreground color (White)
color 1 0 0 0 1 0 # regular background color (Black)
color 2 0 0 0 0 0 # regular color 0 Black
color 3 178 24 24 0 0 # regular color 1 Red
color 4 24 178 24 0 0 # regular color 2 Green
color 5 178 104 24 0 0 # regular color 3 Yellow
color 6 0 0 0 1 0 # regular color 4 Blue
color 7 178 24 178 0 0 # regular color 5 Magenta
color 8 24 178 178 0 0 # regular color 6 Cyan
color 9 178 178 178 0 0 # regular color 7 White
# intensive colors
# instead of changing the colors, we've flagged the text to become bold
color 10 255 255 255 0 0 # intensive foreground color
color 11 104 104 104 1 0 # intensive background color
color 12 104 104 104 0 0 # intensive color 0
color 13 255 84 84 0 0 # intensive color 1
color 14 84 255 84 0 0 # intensive color 2
color 15 255 255 84 0 0 # intensive color 3
color 16 84 84 255 0 0 # intensive color 4
color 17 255 84 255 0 0 # intensive color 5
color 18 84 255 255 0 0 # intensive color 6
color 19 255 255 255 0 0 # intensive color 7

44
qtermwidget/lib/color-schemes/historic/LightPicture.schema 100644
View File

@ -0,0 +1,44 @@
# example scheme for konsole
# the title is to appear in the menu.
title Paper
image tile Paper01.jpg
# foreground colors
# note that the default background color is flagged
# to become transparent when an image is present.
# slot transparent bold
# | | |
# V V--color--V V V
color 0 0 0 0 0 0 # regular foreground color (Black)
color 1 255 255 255 1 0 # regular background color (White)
color 2 0 0 0 0 0 # regular color 0 Black
color 3 178 24 24 0 0 # regular color 1 Red
color 4 24 178 24 0 0 # regular color 2 Green
color 5 178 104 24 0 0 # regular color 3 Yellow
color 6 24 24 178 0 0 # regular color 4 Blue
color 7 178 24 178 0 0 # regular color 5 Magenta
color 8 24 178 178 0 0 # regular color 6 Cyan
color 9 178 178 178 0 0 # regular color 7 White
# intensive colors
# instead of changing the colors, we've flagged the text to become bold
color 10 0 0 0 0 1 # intensive foreground color
color 11 255 255 255 1 0 # intensive background color
color 12 104 104 104 0 0 # intensive color 0
color 13 255 84 84 0 0 # intensive color 1
color 14 84 255 84 0 0 # intensive color 2
color 15 255 255 84 0 0 # intensive color 3
color 16 84 84 255 0 0 # intensive color 4
color 17 255 84 255 0 0 # intensive color 5
color 18 84 255 255 0 0 # intensive color 6
color 19 255 255 255 0 0 # intensive color 7

47
qtermwidget/lib/color-schemes/historic/Linux.schema 100644
View File

@ -0,0 +1,47 @@
# linux color schema for konsole
title Linux Colors
# FIXME
#
# The flaw in this schema is that "blick" comes out on the
# Linux console as intensive background, really.
# Since this is not used in clients you'll hardly notice
# it in practice.
# foreground colors
# note that the default background color is flagged
# to become transparent when an image is present.
# slot transparent bold
# | red grn blu | |
# V V--color--V V V
color 0 178 178 178 0 0 # regular foreground color (White)
color 1 0 0 0 1 0 # regular background color (Black)
color 2 0 0 0 0 0 # regular color 0 Black
color 3 178 24 24 0 0 # regular color 1 Red
color 4 24 178 24 0 0 # regular color 2 Green
color 5 178 104 24 0 0 # regular color 3 Yellow
color 6 24 24 178 0 0 # regular color 4 Blue
color 7 178 24 178 0 0 # regular color 5 Magenta
color 8 24 178 178 0 0 # regular color 6 Cyan
color 9 178 178 178 0 0 # regular color 7 White
# intensive colors
# instead of changing the colors, we've flagged the text to become bold
color 10 255 255 255 0 0 # intensive foreground color
color 11 104 104 104 1 0 # intensive background color
color 12 104 104 104 0 0 # intensive color 0
color 13 255 84 84 0 0 # intensive color 1
color 14 84 255 84 0 0 # intensive color 2
color 15 255 255 84 0 0 # intensive color 3
color 16 84 84 255 0 0 # intensive color 4
color 17 255 84 255 0 0 # intensive color 5
color 18 84 255 255 0 0 # intensive color 6
color 19 255 255 255 0 0 # intensive color 7

132
qtermwidget/lib/color-schemes/historic/README.Schema 100644
View File

@ -0,0 +1,132 @@
[README.Schema]
The schemata offered in the Options/Schema menu are
taken from from configurations files with a *.schema
pattern either located in $KDEDIR/share/apps/konsole
or ~/.kde/share/apps/konsole.
Schemata allow to configure the color set that konsole
uses, together with some more information on rendition
processing.
Syntax
File
:: { [Line] ['#' Comment] '\n' }
Line
:: "title" Title
:: "image" Usage PathToPictureFile
:: "transparency" Fade Red Green Blue
:: "color" Slot Red Green Blue Transparent Bold
:: "rcolor" Slot Saturation Value Transparent Bold
:: "sysfg" Slot Transparent Bold
:: "sysbg" Slot Transparent Bold
Meaning
- Title is the text to appear in the Option/Schema menu.
It should be unique among all other schemata therefore.
- The "image" clause allows to place an image on the
konsole's background.
- Usage can be either
- "tile" - the image is tilewise replicated.
- "center" - the image is centered.
- "full" - the image is stretched to fit the window size.
- The Path of the picture can both be relative
(to kde wallpapers) or absolute.
When a schema uses a background image (or transparency)
one has to make at least one color slot transparent to
achieve any visible effect. Please read below about the
"Transparent" field in color,sysbg,sysfg.
- The "transparency" clause picks and uses the background
of the desktop as if it where an image together with
a fade effect. This effect will fade the background
to the specified color.
The "Fade" is a real value between 0 and 1, indicating
the strength of the fade. A value of 0 will not change
the image, a value of 1 will make it the fade color
everywhere, and in between. This will make the "glas"
of the window be of the color given in the clause and
being more(1) or less(0) intransparent.
- The remaining clauses (color,sysbg,sysfg) are used
to setup konsoles rendition system.
To this end, konsole offers 20 color slots.
Slot Meaning
----- --------------------------
0 regular foreground color
1 regular background color
2-9 regular bgr color 0-7
10 intensive foreground color
11 intensive background color
12-19 intensive bgr color 0-7
The traditional meaning of the "bgr" color codes
has a bitwise interpretation of an additive three
primary color scheme inherited from early EGA
color terminals.
Color Bits Colors
----- ---- -------
0 000 Black
1 001 Red
2 010 Green
3 011 Yellow
4 100 Blue
5 101 Magenta
6 110 Cyan
7 111 White
One may or may not stick to this tradition.
Konsole allows to assign colors freely to slots.
The slots fall apart into two groups, regular
and intensive colors. The later are used when
BOLD rendition is used by the client.
Each of the groups have a default fore- and
background color and the said bgr colors.
Normal terminal processing will simply use
the default colors.
The color desired for a slot is indicated
in the Red Green Blue fields of the color
clause. Use the sysfg or the sysbg clause
to indicate the default fore and background
colors of the desktop.
To specify randomized color for a slot use
the clause rcolor. The two parameters to it
being Saturation - the amount of colour,
and Value, the darkness of the colour.
To use transparency/images and to simulate
the behavior of the xterm, one can supply
two additional tags to each slot:
- Transparent (0/1) meaning to show the
background picture, if any.
- Bold (0/1) to render characters bold.
If you know about the escape codes, you might have
noticed that intensive and bold rendition are sort
of confused. This is inherited by the xterm which
konsole is simulating.
One can use the colortest.sh script supplied
with the konsole source distribution to test
a schema.
The schema installed with konsole are more or
less demonstrations and not really beauty,
beside the Linux.schema, perhaps, which is
made after the VGA colors.

44
qtermwidget/lib/color-schemes/historic/README.default.Schema 100644
View File

@ -0,0 +1,44 @@
# default scheme for konsole (only here for documentation purposes)
# the title is to appear in the menu.
title Konsole Defaults
# image tile /opt/kde/share/wallpapers/gray2.jpg
# foreground colors
# note that the default background color is flagged
# to become transparent when an image is present.
# slot transparent bold
# | | |
# V V--color--V V V
color 0 0 0 0 0 0 # regular foreground color (Black)
color 1 255 255 255 1 0 # regular background color (White)
color 2 0 0 0 0 0 # regular color 0 Black
color 3 178 24 24 0 0 # regular color 1 Red
color 4 24 178 24 0 0 # regular color 2 Green
color 5 178 104 24 0 0 # regular color 3 Yellow
color 6 24 24 178 0 0 # regular color 4 Blue
color 7 178 24 178 0 0 # regular color 5 Magenta
color 8 24 178 178 0 0 # regular color 6 Cyan
color 9 178 178 178 0 0 # regular color 7 White
# intensive colors
# instead of changing the colors, we've flagged the text to become bold
color 10 0 0 0 0 1 # intensive foreground color
color 11 255 255 255 1 0 # intensive background color
color 12 104 104 104 0 0 # intensive color 0
color 13 255 84 84 0 0 # intensive color 1
color 14 84 255 84 0 0 # intensive color 2
color 15 255 255 84 0 0 # intensive color 3
color 16 84 84 255 0 0 # intensive color 4
color 17 255 84 255 0 0 # intensive color 5
color 18 84 255 255 0 0 # intensive color 6
color 19 255 255 255 0 0 # intensive color 7

Some files were not shown because too many files have changed in this diff Show More