Skip to content

Feature/global shortcuts #22

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

Open
KonstantinMerkel wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Feature/global shortcuts #22

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
6a9f345
feat: phase 1 - create keyboard shortcuts tab
KonstantinMerkel Jun 11, 2026
b00fe32
feat: phase 2 - integrate native shortcuts and refine UI
KonstantinMerkel Jun 11, 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
304 changes: 250 additions & 54 deletions prefs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,30 @@ const ShortcutRowMixin = {

const ShortcutRow = GObject.registerClass(
class ShortcutRow extends Adw.ActionRow {
_init(settings, keyName, title) {
_init(settings, keyName, title, origin = '') {
super._init({ title });
this.settings = settings;
this.keyName = keyName;
this._onChangeCallback = null;

if (origin === 'System') {
const badgeBox = new Gtk.Box({ orientation: 0, spacing: 4, valign: 3 }); // 0: HORIZONTAL, 3: CENTER
const icon = new Gtk.Image({ icon_name: 'preferences-system-symbolic' });
icon.add_css_class('dim-label');
const lbl = new Gtk.Label({ label: origin, css_classes: ['dim-label', 'caption'] });
badgeBox.append(icon);
badgeBox.append(lbl);
badgeBox.margin_end = 12;
this.add_suffix(badgeBox);
}

this.warningIcon = new Gtk.Image({
icon_name: 'dialog-warning-symbolic',
valign: Gtk.Align.CENTER,
visible: false
});
this.warningIcon.add_css_class('warning');
this.add_suffix(this.warningIcon);

this.shortcutLabel = new Gtk.ShortcutLabel({
disabled_text: 'Disabled',
Expand All @@ -92,9 +112,19 @@ class ShortcutRow extends Adw.ActionRow {

this.settings.connect(`changed::${this.keyName}`, () => {
this.shortcutLabel.accelerator = this._getAccelerator();
if (this._onChangeCallback) this._onChangeCallback();
});
}

setWarning(isWarning, tooltip = '') {
this.warningIcon.visible = isWarning;
this.warningIcon.tooltip_text = tooltip;
}

setOnChange(cb) {
this._onChangeCallback = cb;
}

_getAccelerator() {
const strv = this.settings.get_strv(this.keyName);
return strv.length > 0 ? strv[0] : '';
Expand All @@ -108,6 +138,7 @@ export default class WorkflowTilingPreferences extends ExtensionPreferences {
const settings = this.getSettings();

const page = new Adw.PreferencesPage({ title: 'General', icon_name: 'preferences-system-symbolic' });
const shortcutsPage = new Adw.PreferencesPage({ title: 'Keyboard Shortcuts', icon_name: 'input-keyboard-symbolic' });

// --- Gaps Group ---
const gapsGroup = new Adw.PreferencesGroup({ title: 'Gaps' });
Expand All @@ -131,10 +162,102 @@ export default class WorkflowTilingPreferences extends ExtensionPreferences {

page.add(gapsGroup);

// --- Core Keybindings Group ---
const keysGroup = new Adw.PreferencesGroup({ title: 'Keybindings' });
const wmSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.keybindings' });
const allRows = [];
const updateConflicts = () => {
const accelMap = {};
const addAccel = (accel, source) => {
if (!accel) return;
if (!accelMap[accel]) accelMap[accel] = [];
accelMap[accel].push(source);
};

for (const row of allRows) {
if (!row.visible && row.keyName && row.keyName.startsWith('custom-')) {
continue;
}
const accel = row._getAccelerator();
if (accel === 'disabled') continue;
addAccel(accel, row);
}

const focusMode = settings.get_string('focus-window-mode');
if (focusMode === 'default') {
['focus-window-left', 'focus-window-right', 'focus-window-up', 'focus-window-down'].forEach(k => {
const val = settings.get_strv(k);
if (val.length > 0) addAccel(val[0], 'focus-default');
});
}

const swapMode = settings.get_string('keybindings-mode');
if (swapMode === 'default') {
['move-window-left', 'move-window-right', 'move-window-up', 'move-window-down'].forEach(k => {
const val = settings.get_strv(k);
if (val.length > 0) addAccel(val[0], 'swap-default');
});
}

for (const row of allRows) {
if (!row.visible) {
row.setWarning(false);
continue;
}
const accel = row._getAccelerator();
if (accel && accel !== 'disabled' && accelMap[accel] && accelMap[accel].length > 1) {
row.setWarning(true, 'Shortcut conflicts with another active shortcut');
} else {
row.setWarning(false);
}
}
};

const createRow = (st, id, label, origin = '') => {
const row = new ShortcutRow(st, id, label, origin);
row.setOnChange(updateConflicts);
allRows.push(row);
return row;
};

// --- Focus & Position Group ---
const focusPositionGroup = new Adw.PreferencesGroup({ title: 'Window Focus & Position' });

const focusModeRow = new Adw.ComboRow({
title: 'Focus Mode',
subtitle: '',
model: Gtk.StringList.new(['Default', 'Custom', 'Disabled'])
});
const focusMode = settings.get_string('focus-window-mode');
focusModeRow.selected = focusMode === 'custom' ? 1 : (focusMode === 'disabled' ? 2 : 0);
focusModeRow.connect('notify::selected', () => {
let mode = 'default';
if (focusModeRow.selected === 1) mode = 'custom';
if (focusModeRow.selected === 2) mode = 'disabled';
settings.set_string('focus-window-mode', mode);
});
focusPositionGroup.add(focusModeRow);

const focusRows = [
{ id: 'custom-focus-window-left', label: ' ↳ Focus Window Left' },
{ id: 'custom-focus-window-right', label: ' ↳ Focus Window Right' },
{ id: 'custom-focus-window-up', label: ' ↳ Focus Window Up' },
{ id: 'custom-focus-window-down', label: ' ↳ Focus Window Down' }
].map(s => {
const row = createRow(settings, s.id, s.label);
focusPositionGroup.add(row);
return row;
});

const updateFocusVisibility = () => {
const mode = settings.get_string('focus-window-mode');
focusModeRow.subtitle = mode === 'default' ? 'Default: <Ctrl> + <Shift> + <Vim (h,j,k,l)>' : '';
const showCustom = mode === 'custom';
focusRows.forEach(r => r.visible = showCustom);
};
settings.connect('changed::focus-window-mode', () => { updateFocusVisibility(); updateConflicts(); });
updateFocusVisibility();

const modeRow = new Adw.ComboRow({
title: 'Mode',
title: 'Swap Mode',
subtitle: '',
model: Gtk.StringList.new(['Default', 'Custom', 'Disabled'])
});
Expand All @@ -146,16 +269,16 @@ export default class WorkflowTilingPreferences extends ExtensionPreferences {
if (modeRow.selected === 2) mode = 'disabled';
settings.set_string('keybindings-mode', mode);
});
keysGroup.add(modeRow);
focusPositionGroup.add(modeRow);

const moveRows = [
{ id: 'custom-move-window-left', label: ' ↳ Move Window Left' },
{ id: 'custom-move-window-right', label: ' ↳ Move Window Right' },
{ id: 'custom-move-window-up', label: ' ↳ Move Window Up' },
{ id: 'custom-move-window-down', label: ' ↳ Move Window Down' }
{ id: 'custom-move-window-left', label: ' ↳ Swap Window Left' },
{ id: 'custom-move-window-right', label: ' ↳ Swap Window Right' },
{ id: 'custom-move-window-up', label: ' ↳ Swap Window Up' },
{ id: 'custom-move-window-down', label: ' ↳ Swap Window Down' }
].map(s => {
const row = new ShortcutRow(settings, s.id, s.label);
keysGroup.add(row);
const row = createRow(settings, s.id, s.label);
focusPositionGroup.add(row);
return row;
});

Expand All @@ -165,56 +288,127 @@ export default class WorkflowTilingPreferences extends ExtensionPreferences {
const showCustom = mode === 'custom';
moveRows.forEach(r => r.visible = showCustom);
};
settings.connect('changed::keybindings-mode', updateVisibility);
settings.connect('changed::keybindings-mode', () => { updateVisibility(); updateConflicts(); });
updateVisibility();

page.add(keysGroup);
shortcutsPage.add(new Adw.PreferencesGroup());
shortcutsPage.add(focusPositionGroup);

// --- Focus Window Group ---
const focusGroup = new Adw.PreferencesGroup({ title: 'Focus Keybindings' });
// --- Window State ---
const stateGroup = new Adw.PreferencesGroup({ title: 'Window State' });
[
{ id: 'close', label: 'Close Window', origin: 'System', st: wmSettings },
{ id: 'minimize', label: 'Minimize Window', origin: 'System', st: wmSettings },
{ id: 'maximize', label: 'Maximize Window', origin: 'System', st: wmSettings },
{ id: 'unmaximize', label: 'Unmaximize Window', origin: 'System', st: wmSettings },
{ id: 'toggle-fullscreen', label: 'Toggle Fullscreen', origin: 'System', st: wmSettings }
].forEach(s => stateGroup.add(createRow(s.st, s.id, s.label, s.origin)));
shortcutsPage.add(stateGroup);

// --- Workspace Operations ---
const wsOpsGroup = new Adw.PreferencesGroup({ title: 'Workspace Operations' });
wsOpsGroup.add(createRow(settings, 'shortcut-close-workspace', 'Close Workspace Windows'));
wsOpsGroup.add(createRow(settings, 'shortcut-unminimize-workspace', 'Unminimize Workspace'));
shortcutsPage.add(wsOpsGroup);

// --- Workspace Switching ---
const wsSwitchGroup = new Adw.PreferencesGroup({ title: 'Workspace Switching' });
wsSwitchGroup.add(createRow(wmSettings, 'switch-to-workspace-left', 'Switch to Workspace Left', 'System'));
wsSwitchGroup.add(createRow(wmSettings, 'switch-to-workspace-right', 'Switch to Workspace Right', 'System'));

const focusModeRow = new Adw.ComboRow({
title: 'Mode',
const wsSwitchModeRow = new Adw.ComboRow({
title: 'Numbered Workspaces',
subtitle: '',
model: Gtk.StringList.new(['Default', 'Custom', 'Disabled'])
model: Gtk.StringList.new(['System Default', 'Edit', 'Disabled'])
});
const focusMode = settings.get_string('focus-window-mode');
focusModeRow.selected = focusMode === 'custom' ? 1 : (focusMode === 'disabled' ? 2 : 0);
focusModeRow.connect('notify::selected', () => {
const wsSwitchModeStr = settings.get_string('workspace-switch-mode');
wsSwitchModeRow.selected = wsSwitchModeStr === 'custom' ? 1 : (wsSwitchModeStr === 'disabled' ? 2 : 0);

const wsSwitchKeys = [];
for (let i = 1; i <= 4; i++) wsSwitchKeys.push(`switch-to-workspace-${i}`);

wsSwitchModeRow.connect('notify::selected', () => {
let mode = 'default';
if (focusModeRow.selected === 1) mode = 'custom';
if (focusModeRow.selected === 2) mode = 'disabled';
settings.set_string('focus-window-mode', mode);
if (wsSwitchModeRow.selected === 1) mode = 'custom';
if (wsSwitchModeRow.selected === 2) mode = 'disabled';
settings.set_string('workspace-switch-mode', mode);

if (mode === 'default') {
wsSwitchKeys.forEach(k => wmSettings.reset(k));
} else if (mode === 'disabled') {
wsSwitchKeys.forEach(k => wmSettings.set_strv(k, ['disabled']));
}
});
focusGroup.add(focusModeRow);
wsSwitchGroup.add(wsSwitchModeRow);

const focusRows = [
{ id: 'custom-focus-window-left', label: ' ↳ Focus Window Left' },
{ id: 'custom-focus-window-right', label: ' ↳ Focus Window Right' },
{ id: 'custom-focus-window-up', label: ' ↳ Focus Window Up' },
{ id: 'custom-focus-window-down', label: ' ↳ Focus Window Down' }
].map(s => {
const row = new ShortcutRow(settings, s.id, s.label);
focusGroup.add(row);
return row;
});
const wsSwitchRows = [];
for (let i = 1; i <= 4; i++) {
wsSwitchRows.push(createRow(wmSettings, `switch-to-workspace-${i}`, ` ↳ Switch to Workspace ${i}`, 'System'));
}
wsSwitchRows.forEach(r => wsSwitchGroup.add(r));
shortcutsPage.add(wsSwitchGroup);

const updateFocusVisibility = () => {
const mode = settings.get_string('focus-window-mode');
focusModeRow.subtitle = mode === 'default' ? 'Default: <Ctrl> + <Shift> + <Vim (h,j,k,l)>' : '';
const updateWsSwitchVisibility = () => {
const mode = settings.get_string('workspace-switch-mode');
wsSwitchModeRow.subtitle = mode === 'default' ? 'System default keybindings' : '';
const showCustom = mode === 'custom';
focusRows.forEach(r => r.visible = showCustom);
wsSwitchRows.forEach(r => r.visible = showCustom);
updateConflicts();
};
settings.connect('changed::focus-window-mode', updateFocusVisibility);
updateFocusVisibility();
settings.connect('changed::workspace-switch-mode', updateWsSwitchVisibility);
updateWsSwitchVisibility();

page.add(focusGroup);
// --- Moving to Workspace ---
const wsMoveGroup = new Adw.PreferencesGroup({ title: 'Moving to Workspace' });
wsMoveGroup.add(createRow(wmSettings, 'move-to-workspace-left', 'Move Window to Workspace Left', 'System'));
wsMoveGroup.add(createRow(wmSettings, 'move-to-workspace-right', 'Move Window to Workspace Right', 'System'));

// --- Additional Batch Shortcuts Group ---
const batchKeysGroup = new Adw.PreferencesGroup({ title: 'Batch Operations' });
const wsMoveModeRow = new Adw.ComboRow({
title: 'Numbered Workspaces',
subtitle: '',
model: Gtk.StringList.new(['System Default', 'Edit', 'Disabled'])
});
const wsMoveModeStr = settings.get_string('workspace-move-mode');
wsMoveModeRow.selected = wsMoveModeStr === 'custom' ? 1 : (wsMoveModeStr === 'disabled' ? 2 : 0);

const closeMonitorRow = new ShortcutRow(settings, 'shortcut-close-monitor', 'Close Monitor Windows');
batchKeysGroup.add(closeMonitorRow);
const wsMoveKeys = [];
for (let i = 1; i <= 4; i++) wsMoveKeys.push(`move-to-workspace-${i}`);

wsMoveModeRow.connect('notify::selected', () => {
let mode = 'default';
if (wsMoveModeRow.selected === 1) mode = 'custom';
if (wsMoveModeRow.selected === 2) mode = 'disabled';
settings.set_string('workspace-move-mode', mode);

if (mode === 'default') {
wsMoveKeys.forEach(k => wmSettings.reset(k));
} else if (mode === 'disabled') {
wsMoveKeys.forEach(k => wmSettings.set_strv(k, ['disabled']));
}
});
wsMoveGroup.add(wsMoveModeRow);

const wsMoveRows = [];
for (let i = 1; i <= 4; i++) {
wsMoveRows.push(createRow(wmSettings, `move-to-workspace-${i}`, ` ↳ Move Window to Workspace ${i}`, 'System'));
}
wsMoveRows.forEach(r => wsMoveGroup.add(r));
shortcutsPage.add(wsMoveGroup);

const updateWsMoveVisibility = () => {
const mode = settings.get_string('workspace-move-mode');
wsMoveModeRow.subtitle = mode === 'default' ? 'System default keybindings' : '';
const showCustom = mode === 'custom';
wsMoveRows.forEach(r => r.visible = showCustom);
updateConflicts();
};
settings.connect('changed::workspace-move-mode', updateWsMoveVisibility);
updateWsMoveVisibility();

// --- Monitor Actions ---
const monitorGroup = new Adw.PreferencesGroup({ title: 'Monitor Actions' });
const closeMonitorRow = createRow(settings, 'shortcut-close-monitor', 'Close Monitor Windows');
monitorGroup.add(closeMonitorRow);

const closeMinRow = new Adw.SwitchRow({ title: ' ↳ Include Minimized', subtitle: ' Also close minimized windows on monitor' });
settings.bind('close-monitor-include-minimized', closeMinRow, 'active', Gio.SettingsBindFlags.DEFAULT);
Expand All @@ -224,19 +418,21 @@ export default class WorkflowTilingPreferences extends ExtensionPreferences {
};
settings.connect('changed::shortcut-close-monitor', updateCloseMinRowVisibility);
updateCloseMinRowVisibility();
batchKeysGroup.add(closeMinRow);
monitorGroup.add(closeMinRow);

[
{ id: 'shortcut-close-workspace', label: 'Close Workspace Windows' },
{ id: 'shortcut-switch-monitor', label: 'Switch Monitors' },
{ id: 'shortcut-port-monitor-left', label: 'Port Monitor to Left Workspace' },
{ id: 'shortcut-port-monitor-right', label: 'Port Monitor to Right Workspace' },
{ id: 'shortcut-unminimize-workspace', label: 'Unminimize Workspace' }
].forEach(s => batchKeysGroup.add(new ShortcutRow(settings, s.id, s.label)));
{ id: 'shortcut-switch-monitor', label: 'Switch Monitors', origin: '', st: settings },
{ id: 'shortcut-port-monitor-left', label: 'Port Monitor to Left Workspace', origin: '', st: settings },
{ id: 'shortcut-port-monitor-right', label: 'Port Monitor to Right Workspace', origin: '', st: settings }
].forEach(s => monitorGroup.add(createRow(s.st, s.id, s.label, s.origin)));

page.add(batchKeysGroup);
shortcutsPage.add(monitorGroup);

// Initial conflicts check
updateConflicts();

window.add(page);
window.add(shortcutsPage);

// --- Custom Layouts (JSON debug) Page ---
const layoutPage = new LayoutEditorPage(settings);
Expand Down
Binary file modified schemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
Loading
Loading