mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
## What changed - Group preferences into Appearance, Notifications, Input, Sessions, and Text selection tabs, with search and links to existing theme, status line, terminal title, and keyboard editors. - Persist preference changes to the selected local configuration file, apply supported changes immediately, and show save errors, configuration overrides, and restart requirements in the panel. - Add a delayed notification test and controls for notification timing while preserving custom event filters. - Add `tui.copy_on_select_clear_selection`, disabled by default, to clear transcript selection highlights only after confirmed automatic clipboard delivery. - Keep local configuration editors usable while disconnected and prevent held activation keys or buffered input from triggering actions across editor and reconnect transitions. ## Testing Add regression tests and rendering snapshots for panel navigation, search, dependency states, editor handoffs, offline persistence, notification timers, custom filter preservation, and confirmed-copy deselection. GitOrigin-RevId: a16d218046060fcb6e61705a803fcd9297266e6e
72 lines
2.3 KiB
Rust
72 lines
2.3 KiB
Rust
//! Suppress a key held across a view transition from activating the child view.
|
|
//!
|
|
//! Terminals with enhanced keyboard reporting distinguish a held `Repeat` from a fresh `Press`.
|
|
//! Press-only terminals use a bounded window that extends while repeat events continue to arrive.
|
|
|
|
use crate::key_hint::KeyBinding;
|
|
use crossterm::event::KeyEventKind;
|
|
use std::time::Duration;
|
|
use std::time::Instant;
|
|
|
|
const INITIAL_GUARD: Duration = Duration::from_secs(/*secs*/ 1);
|
|
const LEGACY_REPEAT_GUARD: Duration = Duration::from_secs(/*secs*/ 1);
|
|
|
|
#[derive(Clone, Copy)]
|
|
pub(crate) struct ActivationKeyGuard {
|
|
key: KeyBinding,
|
|
block_until: Instant,
|
|
key_releases_reported: bool,
|
|
active: bool,
|
|
}
|
|
|
|
impl ActivationKeyGuard {
|
|
pub(crate) fn new_at(key: KeyBinding, now: Instant, key_releases_reported: bool) -> Self {
|
|
Self {
|
|
key,
|
|
block_until: now.checked_add(INITIAL_GUARD).unwrap_or(now),
|
|
key_releases_reported,
|
|
active: true,
|
|
}
|
|
}
|
|
|
|
pub(crate) fn consume(&mut self, key: KeyBinding, kind: KeyEventKind) -> bool {
|
|
self.consume_at(key, kind, Instant::now())
|
|
}
|
|
|
|
fn consume_at(&mut self, key: KeyBinding, kind: KeyEventKind, now: Instant) -> bool {
|
|
if !self.active {
|
|
return false;
|
|
}
|
|
|
|
if self.key.is_same_physical_key(key) {
|
|
if kind == KeyEventKind::Release {
|
|
self.active = false;
|
|
return true;
|
|
}
|
|
// Enhanced keyboard reporting labels a held key as Repeat, so a new Press is fresh.
|
|
if self.key_releases_reported && kind == KeyEventKind::Press {
|
|
self.active = false;
|
|
return false;
|
|
}
|
|
if kind == KeyEventKind::Repeat || now <= self.block_until {
|
|
let repeat_until = now.checked_add(LEGACY_REPEAT_GUARD).unwrap_or(now);
|
|
self.block_until = self.block_until.max(repeat_until);
|
|
return true;
|
|
}
|
|
self.active = false;
|
|
} else if matches!(kind, KeyEventKind::Press | KeyEventKind::Repeat) {
|
|
self.active = false;
|
|
}
|
|
|
|
false
|
|
}
|
|
|
|
pub(crate) fn is_active(self) -> bool {
|
|
self.active
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "activation_key_guard_tests.rs"]
|
|
mod tests;
|