feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Terminal: Add support for Cursor shape and blink

Browse Source 
Change-Id: I7f71578a714d375bcd4ef8ae431f4127cbc57a55
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marcus Tillmanns
2023-03-05 23:55:37 +01:00
parent 2ac2c5c07d
commit f95f815e98
13 changed files with 122 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/terminal/terminalsurface.cpp
View File

@@ -28,6 +28,9 @@ struct TerminalSurfacePrivate
, m_vtermScreen(vterm_obtain_screen(m_vterm.get()))
, m_scrollback(std::make_unique<Internal::Scrollback>(5000))
, q(surface)
{}
void init()
{
vterm_set_utf8(m_vterm.get(), true);
@@ -193,15 +196,24 @@ struct TerminalSurfacePrivate
int setTerminalProperties(VTermProp prop, VTermValue *val)
{
switch (prop) {
case VTERM_PROP_CURSORVISIBLE:
case VTERM_PROP_CURSORVISIBLE: {
Cursor old = q->cursor();
m_cursor.visible = val->boolean;
q->cursorChanged(old, q->cursor());
break;
case VTERM_PROP_CURSORBLINK:
qCDebug(log) << "Ignoring VTERM_PROP_CURSORBLINK" << val->boolean;
}
case VTERM_PROP_CURSORBLINK: {
Cursor old = q->cursor();
m_cursor.blink = val->boolean;
emit q->cursorChanged(old, q->cursor());
break;
case VTERM_PROP_CURSORSHAPE:
qCDebug(log) << "Ignoring VTERM_PROP_CURSORSHAPE" << val->number;
}
case VTERM_PROP_CURSORSHAPE: {
Cursor old = q->cursor();
m_cursor.shape = (Cursor::Shape) val->number;
emit q->cursorChanged(old, q->cursor());
break;
}
case VTERM_PROP_ICONNAME:
//emit iconTextChanged(val->string);
break;
@@ -227,7 +239,8 @@ struct TerminalSurfacePrivate
{
Q_UNUSED(oldpos);
Cursor oldCursor = q->cursor();
m_cursor = {{pos.col, pos.row}, visible > 0};
m_cursor.position = {pos.col, pos.row};
m_cursor.visible = visible > 0;
q->cursorChanged(oldCursor, q->cursor());
return 1;
}
@@ -272,7 +285,9 @@ struct TerminalSurfacePrivate
TerminalSurface::TerminalSurface(QSize initialGridSize)
: d(std::make_unique<TerminalSurfacePrivate>(this, initialGridSize))
{}
{
d->init();
}
TerminalSurface::~TerminalSurface() = default;
@@ -310,7 +325,8 @@ std::u32string::value_type TerminalSurface::fetchCharAt(int x, int y) const
TerminalCell TerminalSurface::fetchCell(int x, int y) const
{
static TerminalCell emptyCell{1, {}, {}};
static TerminalCell
emptyCell{1, {}, {}, false, {}, std::nullopt, QTextCharFormat::NoUnderline, false};
QTC_ASSERT(y >= 0, return emptyCell);
QTC_ASSERT(y < d->liveSize().height() + d->m_scrollback->size(), return emptyCell);