Skip to content

feat(qt): 接入 DECCKM/DECTCEM (#28) #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JavaZeroo merged 2 commits into from
Oct 30, 2026
Merged

feat(qt): 接入 DECCKM/DECTCEM (#28) #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e7044c
feat(qt): honour DECCKM and DECTCEM in the product entry refs #28
JavaZeroo Oct 30, 2026
ab0352f
feat(shell): hide the cursor when DECTCEM clears it refs #28
JavaZeroo Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions experiments/shell/shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,11 +829,13 @@ class ShellWindow {
}
#endif
#ifdef TERMFORGE_CANDIDATE_CORE
// The candidate terminal does not expose DECCKM yet; keep the previous CSI
// encoding instead of guessing at its mode state.
// The candidate terminal does not expose these modes yet; keep the previous
// CSI encoding and always draw the cursor instead of guessing its state.
bool application_cursor_keys() const { return false; }
bool cursor_visible() const { return true; }
#else
bool application_cursor_keys() const { return parser_.application_cursor_keys(); }
bool cursor_visible() const { return parser_.cursor_visible(); }
#endif
void tick() {
const auto began = Clock::now(); ++result_.ticks;
Expand Down Expand Up @@ -1032,7 +1034,7 @@ class ShellWindow {
const int last = (std::min)(self->snapshot_->rows(),
(std::max)(self->dirty_last_, (int(paint.rcPaint.bottom)+cell_height-1)/cell_height));
FillRect(dc, &paint.rcPaint, static_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)));
self->renderer_->draw(*self->surface_, *self->snapshot_, first, last);
self->renderer_->draw(*self->surface_, *self->snapshot_, first, last, self->cursor_visible());
if (self->mode_ == "resize" || self->mode_ == "resize-close") {
Bitmap expected(self->surface_->width, self->surface_->height);
self->renderer_->draw(expected, *self->snapshot_, 0, self->snapshot_->rows());
Expand Down Expand Up @@ -1390,14 +1392,14 @@ class ShellWindow {
// including hidden tabs whose WM_PAINT may not be dispatched.
if (surface_->width != renderer_->x(snapshot_->columns()) ||
surface_->height != renderer_->y(snapshot_->rows())) return false;
renderer_->draw(*surface_, *snapshot_, dirty_first_, dirty_last_);
renderer_->draw(*surface_, *snapshot_, dirty_first_, dirty_last_, cursor_visible());
dirty_first_=snapshot_->rows(); dirty_last_=0;
Bitmap expected(surface_->width,surface_->height);
renderer_->draw(expected,*snapshot_,0,snapshot_->rows());
renderer_->draw(expected,*snapshot_,0,snapshot_->rows(),cursor_visible());
return surface_->equals(expected);
}
void render_to(HDC dc, int x, int y) {
renderer_->draw(*surface_, *snapshot_, 0, snapshot_->rows());
renderer_->draw(*surface_, *snapshot_, 0, snapshot_->rows(), cursor_visible());
require(BitBlt(dc,x,y,surface_->width,surface_->height,surface_->dc,0,0,SRCCOPY) != FALSE, "workspace terminal capture failed");
}
Result run() {
Expand Down
2 changes: 2 additions & 0 deletions src/qt/terminal_session.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@ class SessionModel final : public QObject {
started_ && accepting && requested_revision_ != transport_revision_, session_ ? session_->pid : 0};
}
const Screen& screen() const { return parser_.screen; }
bool cursor_visible() const { return parser_.cursor_visible(); }
bool application_cursor_keys() const { return parser_.application_cursor_keys(); }
bool running() const { return started_ && !finished_ && !close_requested_.load(std::memory_order_acquire); }
bool finished() const { return finished_; }
bool natural_exit() const { return finished_ && natural_exit_; }
Expand Down
10 changes: 5 additions & 5 deletions src/qt/terminal_widget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ class TerminalWidget final : public QWidget {
case Qt::Key_Return: case Qt::Key_Enter: bytes = "\r"; break;
case Qt::Key_Backspace: bytes = std::string(1, '\x7f'); break;
case Qt::Key_Tab: bytes = "\t"; break;
case Qt::Key_Up: bytes = "\x1b[A"; break;
case Qt::Key_Down: bytes = "\x1b[B"; break;
case Qt::Key_Right: bytes = "\x1b[C"; break;
case Qt::Key_Left: bytes = "\x1b[D"; break;
case Qt::Key_Up: bytes = model_.application_cursor_keys() ? "\x1bOA" : "\x1b[A"; break;
case Qt::Key_Down: bytes = model_.application_cursor_keys() ? "\x1bOB" : "\x1b[B"; break;
case Qt::Key_Right: bytes = model_.application_cursor_keys() ? "\x1bOC" : "\x1b[C"; break;
case Qt::Key_Left: bytes = model_.application_cursor_keys() ? "\x1bOD" : "\x1b[D"; break;
default:
if (event->text().isEmpty()) { QWidget::keyPressEvent(event); return; }
character_text = true;
Expand Down Expand Up @@ -216,7 +216,7 @@ class TerminalWidget final : public QWidget {
painter.restore();
}
}
if (model_.running()) {
if (model_.running() && model_.cursor_visible()) {
painter.fillRect(QRect(margin + screen.column * cell_width_, margin + (screen.row + 1) * cell_height_ - 2,
cell_width_, 2), colour(-1, true));
}
Expand Down
Loading