- Added precise fractional mouse wheel delta handling with per-step command emission. - Introduced scroll accumulators (`wheel_accum_y_`, `wheel_accum_x_`) for high-resolution trackpad input. - Replaced hardcoded ESC delay with configurable `kEscDelayMs` constant in `TerminalFrontend`. - Enabled mouse position reporting and reduced CPU usage during idle with optimized `timeout()` setting.
123 lines
3.0 KiB
C++
123 lines
3.0 KiB
C++
#include <ncurses.h>
|
|
#include <termios.h>
|
|
#include <unistd.h>
|
|
|
|
#include "TerminalFrontend.h"
|
|
#include "Command.h"
|
|
#include "Editor.h"
|
|
|
|
|
|
bool
|
|
TerminalFrontend::Init(Editor &ed)
|
|
{
|
|
// Ensure Control keys reach the app: disable XON/XOFF and dsusp/susp bindings (e.g., ^S/^Q, ^Y on macOS)
|
|
{
|
|
struct termios tio{};
|
|
if (tcgetattr(STDIN_FILENO, &tio) == 0) {
|
|
// Save original to restore on shutdown
|
|
orig_tio_ = tio;
|
|
have_orig_tio_ = true;
|
|
// Disable software flow control so C-s/C-q work
|
|
tio.c_iflag &= static_cast<unsigned long>(~IXON);
|
|
#ifdef IXOFF
|
|
tio.c_iflag &= static_cast<unsigned long>(~IXOFF);
|
|
#endif
|
|
// Disable dsusp/susp characters so C-y (VDSUSP on macOS) and C-z don't signal-stop the app
|
|
#ifdef _POSIX_VDISABLE
|
|
#ifdef VSUSP
|
|
tio.c_cc[VSUSP] = _POSIX_VDISABLE;
|
|
#endif
|
|
#ifdef VDSUSP
|
|
tio.c_cc[VDSUSP] = _POSIX_VDISABLE;
|
|
#endif
|
|
#endif
|
|
(void) tcsetattr(STDIN_FILENO, TCSANOW, &tio);
|
|
}
|
|
}
|
|
initscr();
|
|
cbreak();
|
|
noecho();
|
|
keypad(stdscr, TRUE);
|
|
// Enable 8-bit meta key sequences (Alt/ESC-prefix handling in terminals)
|
|
meta(stdscr, TRUE);
|
|
// Make ESC key sequences resolve quickly so ESC+<key> works as meta
|
|
#ifdef set_escdelay
|
|
set_escdelay(TerminalFrontend::kEscDelayMs);
|
|
#endif
|
|
// Make getch() block briefly instead of busy-looping; reduces CPU when idle
|
|
// Equivalent to nodelay(FALSE) with a small timeout.
|
|
timeout(16); // ~16ms (about 60Hz)
|
|
curs_set(1);
|
|
// Enable mouse support if available
|
|
mouseinterval(0);
|
|
mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, nullptr);
|
|
|
|
int r = 0, c = 0;
|
|
getmaxyx(stdscr, r, c);
|
|
prev_r_ = r;
|
|
prev_c_ = c;
|
|
ed.SetDimensions(static_cast<std::size_t>(r), static_cast<std::size_t>(c));
|
|
// Attach editor to input handler for editor-owned features (e.g., universal argument)
|
|
input_.Attach(&ed);
|
|
|
|
// Ignore SIGINT (Ctrl-C) so it doesn't terminate the TUI.
|
|
// We'll restore the previous handler on Shutdown().
|
|
{
|
|
struct sigaction sa{};
|
|
sa.sa_handler = SIG_IGN;
|
|
sigemptyset(&sa.sa_mask);
|
|
sa.sa_flags = 0;
|
|
struct sigaction old{};
|
|
if (sigaction(SIGINT, &sa, &old) == 0) {
|
|
old_sigint_ = old;
|
|
have_old_sigint_ = true;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
|
|
void
|
|
TerminalFrontend::Step(Editor &ed, bool &running)
|
|
{
|
|
// Handle resize and keep editor dimensions synced
|
|
int r, c;
|
|
getmaxyx(stdscr, r, c);
|
|
if (r != prev_r_ || c != prev_c_) {
|
|
resizeterm(r, c);
|
|
clear();
|
|
prev_r_ = r;
|
|
prev_c_ = c;
|
|
}
|
|
ed.SetDimensions(static_cast<std::size_t>(r), static_cast<std::size_t>(c));
|
|
|
|
MappedInput mi;
|
|
if (input_.Poll(mi)) {
|
|
if (mi.hasCommand) {
|
|
Execute(ed, mi.id, mi.arg, mi.count);
|
|
}
|
|
}
|
|
|
|
if (ed.QuitRequested()) {
|
|
running = false;
|
|
}
|
|
|
|
renderer_.Draw(ed);
|
|
}
|
|
|
|
|
|
void
|
|
TerminalFrontend::Shutdown()
|
|
{
|
|
// Restore original terminal settings if we changed them
|
|
if (have_orig_tio_) {
|
|
(void) tcsetattr(STDIN_FILENO, TCSANOW, &orig_tio_);
|
|
have_orig_tio_ = false;
|
|
}
|
|
// Restore previous SIGINT handler
|
|
if (have_old_sigint_) {
|
|
(void) sigaction(SIGINT, &old_sigint_, nullptr);
|
|
have_old_sigint_ = false;
|
|
}
|
|
endwin();
|
|
} |