superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qt: phase 2.1 — promote MainWindow methods for ActionDispatcher 

Phase 2 retires the friend-class coupling between MainWindow and the
runtime callbacks. Phase 2.1 promotes the 11 MainWindow methods +
configString/configBool that ActionDispatcher handlers need, plus
adds three small accessors for performable-action gating
(tabCount, defaultWindowSize, setDefaultWindowSize). The
`friend class GhosttyApp;` declaration is also deleted —
removeSurface and confirmCloseSurfaces are public now, so
GhosttyApp::onCloseSurface can call them through the public API.

Promoted from private to public:
  closeTabsByMode, gotoTab, gotoSplit, resizeSplit, equalizeSplits,
  moveTab, ringBell, setTabTitleOverride, copyTitleToClipboard,
  toggleCommandPalette, toggleSplitZoom, configString, configBool,
  confirmCloseSurfaces

New public accessors:
  tabCount() — used by GOTO_TAB / MOVE_TAB performable checks
  defaultWindowSize() / setDefaultWindowSize() — used by INITIAL_SIZE
  and RESET_WINDOW_SIZE

These are libghostty-driven mutations, not user-facing API. The new
"libghostty-driven mutations" section in the public block documents
that distinction. Phase 2.2-2.9 move the dispatcher switch body into
qt/src/actions/<Domain>Actions.cpp files that call them.

removeSurface was already public — the duplicate the first attempt
added has been dropped.

Build verified: docker build --target qt clean, zero warnings.

Co-Authored-By: claude-flow <ruv@ruv.net>
pull/12846/head
ntomsic 2026-05-23 13:09:34 -05:00
parent 32dcaf9200
commit 615acb5403
2 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qt/src/MainWindow.cpp
View File

@ -1153,6 +1153,8 @@ int MainWindow::tabIndexForSurface(GhosttySurface *surface) const {
return -1;
}
int MainWindow::tabCount() const { return m_tabs->count(); }
QList<GhosttySurface *> MainWindow::surfacesInTab(int index) const {
QWidget *page = m_tabs->widget(index);
if (!page) return {};

85
qt/src/MainWindow.h
View File

@ -132,6 +132,42 @@ public:
// away entirely in phase 2.9.
static bool onAction(ghostty_app_t, ghostty_target_s, ghostty_action_s);
// ---- libghostty-driven mutations -------------------------------
//
// These are called from actions::dispatch (or the per-domain
// handlers in qt/src/actions/) in response to libghostty actions.
// They are not part of the user-facing keybind/menu API; they need
// public visibility only so the dispatcher can route to them
// without befriending its handler classes.
void closeTabsByMode(GhosttySurface *src,
ghostty_action_close_tab_mode_e mode);
void gotoTab(ghostty_action_goto_tab_e tab);
void gotoSplit(GhosttySurface *from, ghostty_action_goto_split_e dir);
void resizeSplit(GhosttySurface *from, ghostty_action_resize_split_s rs);
void equalizeSplits(GhosttySurface *from);
void moveTab(int amount);
void ringBell(GhosttySurface *surface);
void setTabTitleOverride(GhosttySurface *surface, const QString &title);
void copyTitleToClipboard(GhosttySurface *src);
void toggleCommandPalette(GhosttySurface *surface);
void toggleSplitZoom(GhosttySurface *surface);
// (removeSurface is already public, declared near newTab/splitSurface)
bool confirmCloseSurfaces(const QList<GhosttySurface *> &surfaces);
// ---- libghostty-driven gating accessors ------------------------
// Tab count, used by GOTO_TAB / MOVE_TAB performable checks.
int tabCount() const;
// Default size cached on INITIAL_SIZE for RESET_WINDOW_SIZE.
QSize defaultWindowSize() const { return m_defaultWindowSize; }
void setDefaultWindowSize(QSize s) { m_defaultWindowSize = s; }
// Typed wrappers over ghostty_config_get. configString also serves
// enum keys — libghostty returns an enum as its tag name string.
// Public so handler files can read config without friending.
QString configString(const char *key) const;
bool configBool(const char *key, bool fallback) const;
protected:
bool event(QEvent *) override;
void showEvent(QShowEvent *) override;
@ -146,21 +182,10 @@ private slots:
void onCurrentChanged(int index);
private:
// GhosttyApp::onCloseSurface needs to call confirmCloseSurfaces /
// removeSurface (both private) on the target window from a deferred
// queued slot. Phase 2's ActionDispatcher refactor will replace
// this with public predicates on the per-window API.
friend class GhosttyApp;
// Create the first tab once the device pixel ratio has settled.
void createFirstTab();
// The frame-timer body lives on GhosttyApp::frame (process-wide).
void closeTab(int index);
// Honor close-tab-mode (THIS / OTHER / RIGHT) from libghostty.
void closeTabsByMode(GhosttySurface *src,
ghostty_action_close_tab_mode_e mode);
// Right-click context menu over a tab (Close / Close Others /
// Close Tabs to the Right / Rename), wired from
// TabWidget::tabContextMenuRequested.
@ -173,15 +198,6 @@ private:
int tabIndexForSurface(GhosttySurface *surface) const;
QList<GhosttySurface *> surfacesInTab(int index) const;
// Keybind-driven navigation between tabs and split panes.
void gotoTab(ghostty_action_goto_tab_e tab);
void gotoSplit(GhosttySurface *from, ghostty_action_goto_split_e dir);
void resizeSplit(GhosttySurface *from, ghostty_action_resize_split_s rs);
void equalizeSplits(GhosttySurface *from);
void moveTab(int amount); // reorder the current tab by `amount`
// Ring the terminal bell, honoring the `bell-features` config.
void ringBell(GhosttySurface *surface);
void playBellAudio();
// Bell `title` feature: prefix a tab's title while any surface in it
@ -192,11 +208,6 @@ private:
// title and manual override, plus any bell mark. Tab data holds a
// {base, override} QStringList.
void updateTabText(int tab);
// Set/clear a tab's manual title override (empty string clears it);
// while set, SET_TITLE no longer changes the tab text.
void setTabTitleOverride(GhosttySurface *surface, const QString &title);
// Copy the current tab's effective title to the clipboard.
void copyTitleToClipboard(GhosttySurface *src);
// Rebuild the config from disk and push it to libghostty.
void reloadConfig();
@ -210,11 +221,6 @@ private:
// reload and on the CONFIG_CHANGE notification).
static void refreshChrome();
// Typed wrappers over ghostty_config_get. configString also serves
// enum keys — libghostty returns an enum as its tag name string.
QString configString(const char *key) const;
bool configBool(const char *key, bool fallback) const;
// Apply config-driven window settings that may change on reload: the
// tab-bar visibility policy and the light/dark colour scheme.
void applyWindowConfig();
@ -227,14 +233,6 @@ private:
// edge, per the `quick-terminal-*` config. Quick-terminal only.
void setupLayerShell();
// Show/hide the command palette (TOGGLE_COMMAND_PALETTE), scoped to
// `surface` for executing the chosen command.
void toggleCommandPalette(GhosttySurface *surface);
// Prompt (per `confirm-close-surface`) before closing `surfaces`.
// Returns true if the close may proceed.
bool confirmCloseSurfaces(const QList<GhosttySurface *> &surfaces);
// Close every window, optionally quitting the process. Prompts once
// via ghostty_app_needs_confirm_quit. `thenQuit=true` is the QUIT
// action's behavior (close everything and end the process);
@ -243,17 +241,6 @@ private:
// matching macOS where close-all and quit are distinct.
static void closeAllWindows(bool thenQuit);
// The quit-after-last-window-closed timer lives on
// GhosttyApp::handleQuitTimer.
// Toggle a split pane filling its tab. Re-parents the surface out of
// / back into the splitter tree.
void toggleSplitZoom(GhosttySurface *surface);
// onAction is public above (forwarder for ActionDispatcher during
// phase 2.0; deleted in phase 2.9). surfaceAlive moved to
// GhosttyApp::surfaceAlive.
TabWidget *m_tabs = nullptr;
QList<GhosttySurface *> m_surfaces; // every live surface in this window
bool m_firstTabPending = true; // first tab is created on show()