Compare commits
11 Commits
265ff05436
...
v0.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5da4001a32 | ||
|
|
9011cd48f2 | ||
|
|
e065acd37d | ||
|
|
b4afd6d4dc | ||
|
|
1ae379868b | ||
|
|
8d4e51284d | ||
|
|
9f46347179 | ||
|
|
5a6c3ccd72 | ||
|
|
c977c61714 | ||
|
|
e615efceb9 | ||
|
|
88623f32d7 |
99
.gitea/workflows/build.yaml
Normal file
99
.gitea/workflows/build.yaml
Normal file
@@ -0,0 +1,99 @@
|
||||
name: Build and Test
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: node:20
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install pnpm and TypeScript
|
||||
run: npm install -g pnpm typescript@5.8.3
|
||||
|
||||
- name: Install just
|
||||
run: |
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin
|
||||
|
||||
- name: Install system dependencies
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y libglib2.0-dev glib-networking zip
|
||||
|
||||
- name: Install project dependencies
|
||||
run: pnpm install
|
||||
|
||||
- name: Run unit tests
|
||||
run: just test
|
||||
|
||||
- name: Build and package extension
|
||||
run: just build-package
|
||||
|
||||
- name: Upload extension package
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: aerospike-extension
|
||||
path: aerospike.zip
|
||||
retention-days: 30
|
||||
|
||||
release:
|
||||
needs: build
|
||||
runs-on: ubuntu-latest
|
||||
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
|
||||
environment:
|
||||
name: production
|
||||
container:
|
||||
image: node:20
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Download artifact
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: aerospike-extension
|
||||
|
||||
- name: Get version from package.json
|
||||
id: get_version
|
||||
run: |
|
||||
VERSION=$(node -p "require('./package.json').version")
|
||||
echo "version=v${VERSION}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Create Gitea Release
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
run: |
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"tag_name": "${{ steps.get_version.outputs.version }}",
|
||||
"name": "Release ${{ steps.get_version.outputs.version }}",
|
||||
"body": "Automated release of aerospike GNOME extension ${{ steps.get_version.outputs.version }}\n\n## Installation\nDownload aerospike.zip and install it as a GNOME extension."
|
||||
}' \
|
||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases"
|
||||
|
||||
- name: Upload Release Asset
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
run: |
|
||||
RELEASE_ID=$(curl -H "Authorization: token ${GITEA_TOKEN}" \
|
||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${{ steps.get_version.outputs.version }}" | \
|
||||
grep -Po '"id":\s*\K[0-9]+' | head -1)
|
||||
|
||||
curl -X POST \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: multipart/form-data" \
|
||||
-F "attachment=@aerospike.zip" \
|
||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=aerospike.zip"
|
||||
28
extension.ts
28
extension.ts
@@ -53,6 +53,16 @@ export default class aerospike extends Extension {
|
||||
this.refreshKeybinding('join-with-right');
|
||||
});
|
||||
|
||||
this.settings.connect('changed::print-tree', () => {
|
||||
log(`Print tree keybinding changed to: ${this.settings.get_strv('print-tree')}`);
|
||||
this.refreshKeybinding('print-tree');
|
||||
});
|
||||
|
||||
this.settings.connect('changed::toggle-orientation', () => {
|
||||
log(`Toggle orientation keybinding changed to: ${this.settings.get_strv('toggle-orientation')}`);
|
||||
this.refreshKeybinding('toggle-orientation');
|
||||
});
|
||||
|
||||
this.settings.connect('changed::dropdown-option', () => {
|
||||
log(`Dropdown option changed to: ${this.settings.get_string('dropdown-option')}`);
|
||||
});
|
||||
@@ -88,6 +98,16 @@ export default class aerospike extends Extension {
|
||||
Logger.info('Keybinding 4 was pressed!');
|
||||
});
|
||||
break;
|
||||
case 'print-tree':
|
||||
this.bindKeybinding('print-tree', () => {
|
||||
this.windowManager.printTreeStructure();
|
||||
});
|
||||
break;
|
||||
case 'toggle-orientation':
|
||||
this.bindKeybinding('toggle-orientation', () => {
|
||||
this.windowManager.toggleActiveContainerOrientation();
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -114,6 +134,14 @@ export default class aerospike extends Extension {
|
||||
this.bindKeybinding('join-with-right', () => {
|
||||
Logger.info('Keybinding 4 was pressed!');
|
||||
});
|
||||
|
||||
this.bindKeybinding('print-tree', () => {
|
||||
this.windowManager.printTreeStructure();
|
||||
});
|
||||
|
||||
this.bindKeybinding('toggle-orientation', () => {
|
||||
this.windowManager.toggleActiveContainerOrientation();
|
||||
});
|
||||
}
|
||||
|
||||
private bindKeybinding(settingName: string, callback: () => void) {
|
||||
|
||||
23
jest.config.js
Normal file
23
jest.config.js
Normal file
@@ -0,0 +1,23 @@
|
||||
export default {
|
||||
preset: 'ts-jest/presets/default-esm',
|
||||
testEnvironment: 'node',
|
||||
extensionsToTreatAsEsm: ['.ts'],
|
||||
moduleNameMapper: {
|
||||
'^(\\.{1,2}/.*)\\.js$': '$1',
|
||||
},
|
||||
transform: {
|
||||
'^.+\\.ts$': [
|
||||
'ts-jest',
|
||||
{
|
||||
useESM: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
testMatch: ['**/__tests__/**/*.test.ts', '**/?(*.)+(spec|test).ts'],
|
||||
collectCoverageFrom: [
|
||||
'src/**/*.ts',
|
||||
'!src/**/*.d.ts',
|
||||
'!src/**/__tests__/**',
|
||||
],
|
||||
modulePathIgnorePatterns: ['<rootDir>/dist/', '<rootDir>/node_modules/'],
|
||||
};
|
||||
16
justfile
16
justfile
@@ -24,17 +24,29 @@ build-package: build
|
||||
|
||||
install: build
|
||||
mkdir -p ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}
|
||||
rm -rf /.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/*
|
||||
rm -rf ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/*
|
||||
cp -r dist/* ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/
|
||||
|
||||
run:
|
||||
env MUTTER_DEBUG_DUMMY_MODE_SPECS=1280x720 dbus-run-session -- gnome-shell --nested --wayland
|
||||
env MUTTER_DEBUG_DUMMY_MODE_SPECS=1280x720 dbus-run-session -- gnome-shell --devkit --wayland
|
||||
|
||||
install-and-run: install run
|
||||
|
||||
live-debug:
|
||||
journalctl /usr/bin/gnome-shell -f -o cat | tee debug.log
|
||||
|
||||
test:
|
||||
pnpm test
|
||||
|
||||
test-watch:
|
||||
pnpm test:watch
|
||||
|
||||
test-coverage:
|
||||
pnpm test:coverage
|
||||
|
||||
ci-local:
|
||||
act -W .gitea/workflows/build.yaml
|
||||
|
||||
#pack: build
|
||||
# gnome-extensions pack dist \
|
||||
# --force \
|
||||
|
||||
@@ -15,11 +15,20 @@
|
||||
},
|
||||
"homepage": "https://github.com/example/my-extension#readme",
|
||||
"sideEffects": false,
|
||||
"scripts": {
|
||||
"test": "jest",
|
||||
"test:watch": "jest --watch",
|
||||
"test:coverage": "jest --coverage"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@girs/gjs": "4.0.0-beta.38",
|
||||
"@girs/gnome-shell": "49.0.1",
|
||||
"@jest/globals": "^29.7.0",
|
||||
"@types/jest": "^29.5.12",
|
||||
"eslint": "^9.36.0",
|
||||
"eslint-plugin-jsdoc": "^50.8.0",
|
||||
"jest": "^29.7.0",
|
||||
"ts-jest": "^29.1.2",
|
||||
"typescript": "^5.9.2"
|
||||
},
|
||||
"dependencies": {
|
||||
|
||||
2377
pnpm-lock.yaml
generated
2377
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -37,5 +37,17 @@
|
||||
<description>Keyboard shortcut for triggering action 4</description>
|
||||
</key>
|
||||
|
||||
<key name="print-tree" type="as">
|
||||
<default><![CDATA[['<Super><Shift>x']]]></default>
|
||||
<summary>Print window tree structure</summary>
|
||||
<description>Prints the current tree of containers and windows per monitor to logs</description>
|
||||
</key>
|
||||
|
||||
<key name="toggle-orientation" type="as">
|
||||
<default><![CDATA[['<Super><Shift>comma']]]></default>
|
||||
<summary>Toggle active container orientation</summary>
|
||||
<description>Toggles the orientation of the container holding the active window between horizontal and vertical</description>
|
||||
</key>
|
||||
|
||||
</schema>
|
||||
</schemalist>
|
||||
182
src/__tests__/container.test.ts
Normal file
182
src/__tests__/container.test.ts
Normal file
@@ -0,0 +1,182 @@
|
||||
import { describe, test, expect, jest, beforeEach } from '@jest/globals';
|
||||
|
||||
// Mock the dependencies
|
||||
jest.mock('../utils/logger.js', () => ({
|
||||
Logger: {
|
||||
log: jest.fn(),
|
||||
info: jest.fn(),
|
||||
debug: jest.fn(),
|
||||
warn: jest.fn(),
|
||||
error: jest.fn(),
|
||||
},
|
||||
}));
|
||||
|
||||
jest.mock('../utils/events.js', () => ({
|
||||
default: jest.fn(),
|
||||
}));
|
||||
|
||||
// Since we can't import the actual WindowContainer that depends on GNOME APIs,
|
||||
// we'll test the logic patterns used in the container
|
||||
|
||||
describe('Container Logic Tests', () => {
|
||||
describe('Orientation Toggle Logic', () => {
|
||||
enum Orientation {
|
||||
HORIZONTAL = 0,
|
||||
VERTICAL = 1,
|
||||
}
|
||||
|
||||
const toggleOrientation = (current: Orientation): Orientation => {
|
||||
return current === Orientation.HORIZONTAL
|
||||
? Orientation.VERTICAL
|
||||
: Orientation.HORIZONTAL;
|
||||
};
|
||||
|
||||
test('should toggle from HORIZONTAL to VERTICAL', () => {
|
||||
const result = toggleOrientation(Orientation.HORIZONTAL);
|
||||
expect(result).toBe(Orientation.VERTICAL);
|
||||
});
|
||||
|
||||
test('should toggle from VERTICAL to HORIZONTAL', () => {
|
||||
const result = toggleOrientation(Orientation.VERTICAL);
|
||||
expect(result).toBe(Orientation.HORIZONTAL);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Window Bounds Calculation', () => {
|
||||
test('should calculate horizontal bounds correctly', () => {
|
||||
const workArea = { x: 0, y: 0, width: 1000, height: 500 };
|
||||
const itemCount = 3;
|
||||
const windowWidth = Math.floor(workArea.width / itemCount);
|
||||
|
||||
const bounds = Array.from({ length: itemCount }, (_, index) => ({
|
||||
x: workArea.x + (index * windowWidth),
|
||||
y: workArea.y,
|
||||
width: windowWidth,
|
||||
height: workArea.height,
|
||||
}));
|
||||
|
||||
expect(bounds.length).toBe(3);
|
||||
expect(bounds[0].x).toBe(0);
|
||||
expect(bounds[1].x).toBe(333);
|
||||
expect(bounds[2].x).toBe(666);
|
||||
expect(bounds[0].width).toBe(333);
|
||||
});
|
||||
|
||||
test('should calculate vertical bounds correctly', () => {
|
||||
const workArea = { x: 0, y: 0, width: 1000, height: 900 };
|
||||
const itemCount = 3;
|
||||
const windowHeight = Math.floor(workArea.height / itemCount);
|
||||
|
||||
const bounds = Array.from({ length: itemCount }, (_, index) => ({
|
||||
x: workArea.x,
|
||||
y: workArea.y + (index * windowHeight),
|
||||
width: workArea.width,
|
||||
height: windowHeight,
|
||||
}));
|
||||
|
||||
expect(bounds.length).toBe(3);
|
||||
expect(bounds[0].y).toBe(0);
|
||||
expect(bounds[1].y).toBe(300);
|
||||
expect(bounds[2].y).toBe(600);
|
||||
expect(bounds[0].height).toBe(300);
|
||||
});
|
||||
|
||||
test('should handle single window bounds', () => {
|
||||
const workArea = { x: 100, y: 50, width: 800, height: 600 };
|
||||
const itemCount = 1;
|
||||
const windowWidth = Math.floor(workArea.width / itemCount);
|
||||
|
||||
const bounds = [{
|
||||
x: workArea.x,
|
||||
y: workArea.y,
|
||||
width: windowWidth,
|
||||
height: workArea.height,
|
||||
}];
|
||||
|
||||
expect(bounds[0].x).toBe(100);
|
||||
expect(bounds[0].y).toBe(50);
|
||||
expect(bounds[0].width).toBe(800);
|
||||
expect(bounds[0].height).toBe(600);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Window Index Finding', () => {
|
||||
test('should find window index in array', () => {
|
||||
const windows = [
|
||||
{ id: 1, title: 'Window 1' },
|
||||
{ id: 2, title: 'Window 2' },
|
||||
{ id: 3, title: 'Window 3' },
|
||||
];
|
||||
|
||||
const findIndex = (id: number) => {
|
||||
for (let i = 0; i < windows.length; i++) {
|
||||
if (windows[i].id === id) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
};
|
||||
|
||||
expect(findIndex(2)).toBe(1);
|
||||
expect(findIndex(3)).toBe(2);
|
||||
expect(findIndex(999)).toBe(-1);
|
||||
});
|
||||
|
||||
test('should safely remove window by index', () => {
|
||||
const windows = [
|
||||
{ id: 1, title: 'Window 1' },
|
||||
{ id: 2, title: 'Window 2' },
|
||||
{ id: 3, title: 'Window 3' },
|
||||
];
|
||||
|
||||
const removeWindow = (id: number) => {
|
||||
const index = windows.findIndex(w => w.id === id);
|
||||
if (index !== -1) {
|
||||
windows.splice(index, 1);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
const removed = removeWindow(2);
|
||||
expect(removed).toBe(true);
|
||||
expect(windows.length).toBe(2);
|
||||
expect(windows.find(w => w.id === 2)).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe('Container Item Reordering', () => {
|
||||
test('should reorder items correctly', () => {
|
||||
const items = ['A', 'B', 'C', 'D'];
|
||||
const originalIndex = 1; // 'B'
|
||||
const newIndex = 3;
|
||||
|
||||
// Remove from original position and insert at new position
|
||||
const [item] = items.splice(originalIndex, 1);
|
||||
items.splice(newIndex, 0, item);
|
||||
|
||||
expect(items).toEqual(['A', 'C', 'D', 'B']);
|
||||
});
|
||||
|
||||
test('should handle reordering to same position', () => {
|
||||
const items = ['A', 'B', 'C'];
|
||||
const originalIndex = 1;
|
||||
const newIndex = 1;
|
||||
|
||||
if (originalIndex !== newIndex) {
|
||||
const [item] = items.splice(originalIndex, 1);
|
||||
items.splice(newIndex, 0, item);
|
||||
}
|
||||
|
||||
expect(items).toEqual(['A', 'B', 'C']);
|
||||
});
|
||||
|
||||
test('should handle moving first item to last', () => {
|
||||
const items = ['A', 'B', 'C'];
|
||||
const [item] = items.splice(0, 1);
|
||||
items.splice(2, 0, item);
|
||||
|
||||
expect(items).toEqual(['B', 'C', 'A']);
|
||||
});
|
||||
});
|
||||
});
|
||||
75
src/__tests__/rect.test.ts
Normal file
75
src/__tests__/rect.test.ts
Normal file
@@ -0,0 +1,75 @@
|
||||
import { describe, test, expect } from '@jest/globals';
|
||||
import type { Rect } from '../utils/rect.js';
|
||||
|
||||
describe('Rect Type Tests', () => {
|
||||
test('should create a valid Rect object', () => {
|
||||
const rect: Rect = {
|
||||
x: 10,
|
||||
y: 20,
|
||||
width: 100,
|
||||
height: 200,
|
||||
};
|
||||
|
||||
expect(rect.x).toBe(10);
|
||||
expect(rect.y).toBe(20);
|
||||
expect(rect.width).toBe(100);
|
||||
expect(rect.height).toBe(200);
|
||||
});
|
||||
|
||||
test('should handle zero dimensions', () => {
|
||||
const rect: Rect = {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 0,
|
||||
height: 0,
|
||||
};
|
||||
|
||||
expect(rect.width).toBe(0);
|
||||
expect(rect.height).toBe(0);
|
||||
});
|
||||
|
||||
test('should handle negative coordinates', () => {
|
||||
const rect: Rect = {
|
||||
x: -50,
|
||||
y: -100,
|
||||
width: 200,
|
||||
height: 300,
|
||||
};
|
||||
|
||||
expect(rect.x).toBe(-50);
|
||||
expect(rect.y).toBe(-100);
|
||||
});
|
||||
|
||||
test('should calculate rect area correctly', () => {
|
||||
const rect: Rect = {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 100,
|
||||
height: 50,
|
||||
};
|
||||
|
||||
const area = rect.width * rect.height;
|
||||
expect(area).toBe(5000);
|
||||
});
|
||||
|
||||
test('should determine if point is inside rect', () => {
|
||||
const rect: Rect = {
|
||||
x: 10,
|
||||
y: 10,
|
||||
width: 100,
|
||||
height: 100,
|
||||
};
|
||||
|
||||
const pointInside = { x: 50, y: 50 };
|
||||
const pointOutside = { x: 200, y: 200 };
|
||||
|
||||
const isInside = (point: { x: number; y: number }, r: Rect) =>
|
||||
point.x >= r.x &&
|
||||
point.x <= r.x + r.width &&
|
||||
point.y >= r.y &&
|
||||
point.y <= r.y + r.height;
|
||||
|
||||
expect(isInside(pointInside, rect)).toBe(true);
|
||||
expect(isInside(pointOutside, rect)).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -155,6 +155,24 @@ export default class AerospikeExtensions extends ExtensionPreferences {
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Print Tree Structure'),
|
||||
settings: settings,
|
||||
bind: 'print-tree',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Toggle Orientation'),
|
||||
settings: settings,
|
||||
bind: 'toggle-orientation',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@ export default class WindowContainer {
|
||||
_workArea: Rect;
|
||||
|
||||
constructor(workspaceArea: Rect,) {
|
||||
// this._id = monitorId;
|
||||
this._tiledItems = [];
|
||||
this._tiledWindowLookup = new Map<number, WindowWrapper>();
|
||||
this._workArea = workspaceArea;
|
||||
@@ -30,11 +29,17 @@ export default class WindowContainer {
|
||||
this.tileWindows();
|
||||
}
|
||||
|
||||
toggleOrientation(): void {
|
||||
this._orientation = this._orientation === Orientation.HORIZONTAL
|
||||
? Orientation.VERTICAL
|
||||
: Orientation.HORIZONTAL;
|
||||
Logger.info(`Container orientation toggled to ${this._orientation === Orientation.HORIZONTAL ? 'HORIZONTAL' : 'VERTICAL'}`);
|
||||
this.tileWindows();
|
||||
}
|
||||
|
||||
addWindow(winWrap: WindowWrapper): void {
|
||||
// Add window to managed windows
|
||||
this._tiledItems.push(winWrap);
|
||||
this._tiledWindowLookup.set(winWrap.getWindowId(), winWrap);
|
||||
// winWrap.setParent(this);
|
||||
queueEvent({
|
||||
name: "tiling-windows",
|
||||
callback: () => {
|
||||
@@ -73,9 +78,12 @@ export default class WindowContainer {
|
||||
|
||||
removeWindow(win_id: number): void {
|
||||
if (this._tiledWindowLookup.has(win_id)) {
|
||||
// Get index before deleting from lookup to avoid race condition
|
||||
const index = this._getIndexOfWindow(win_id);
|
||||
this._tiledWindowLookup.delete(win_id);
|
||||
const index = this._getIndexOfWindow(win_id)
|
||||
if (index !== -1) {
|
||||
this._tiledItems.splice(index, 1);
|
||||
}
|
||||
} else {
|
||||
for (const item of this._tiledItems) {
|
||||
if (item instanceof WindowContainer) {
|
||||
@@ -107,7 +115,6 @@ export default class WindowContainer {
|
||||
|
||||
Logger.log("WorkArea", this._workArea);
|
||||
|
||||
// Get all windows for current workspaceArea
|
||||
this._tileItems()
|
||||
|
||||
return true
|
||||
|
||||
@@ -85,11 +85,6 @@ export class WindowWrapper {
|
||||
|
||||
}
|
||||
}),
|
||||
this._window.connect('notify::has-focus', () => {
|
||||
if (this._window.has_focus()) {
|
||||
windowManager._activeWindowId = windowId;
|
||||
}
|
||||
}),
|
||||
this._window.connect('notify::maximized-horizontally', () => {
|
||||
if (this._window.is_maximized()) {
|
||||
Logger.log(`Window maximized: ${windowId}`);
|
||||
|
||||
@@ -7,6 +7,7 @@ import * as Main from "resource:///org/gnome/shell/ui/main.js";
|
||||
// import Mtk from "@girs/mtk-16";
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import Monitor from "./monitor.js";
|
||||
import WindowContainer from "./container.js";
|
||||
|
||||
|
||||
export interface IWindowManager {
|
||||
@@ -64,6 +65,9 @@ export default class WindowManager implements IWindowManager {
|
||||
}
|
||||
|
||||
this.captureExistingWindows();
|
||||
|
||||
// Sync the initially focused window
|
||||
this.syncActiveWindow();
|
||||
}
|
||||
|
||||
instantiateDisplaySignals(): void {
|
||||
@@ -86,6 +90,9 @@ export default class WindowManager implements IWindowManager {
|
||||
global.display.connect('window-created', (display, window) => {
|
||||
this.handleWindowCreated(display, window);
|
||||
}),
|
||||
global.display.connect('notify::focus-window', () => {
|
||||
this.syncActiveWindow();
|
||||
}),
|
||||
|
||||
global.display.connect("showing-desktop-changed", () => {
|
||||
Logger.log("SHOWING DESKTOP CHANGED");
|
||||
@@ -157,10 +164,13 @@ export default class WindowManager implements IWindowManager {
|
||||
}
|
||||
|
||||
removeAllWindows(): void {
|
||||
// Disconnect signals from minimized windows before clearing
|
||||
this.disconnectMinimizedSignals();
|
||||
this._minimizedItems.clear();
|
||||
|
||||
this._monitors.forEach((monitor: Monitor) => {
|
||||
monitor.removeAllWindows();
|
||||
})
|
||||
this._minimizedItems.clear();
|
||||
}
|
||||
|
||||
|
||||
@@ -220,7 +230,7 @@ export default class WindowManager implements IWindowManager {
|
||||
}
|
||||
|
||||
_getWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
||||
let wrapped = undefined;
|
||||
let wrapped: WindowWrapper | undefined = undefined;
|
||||
for (const monitor of this._monitors.values()) {
|
||||
wrapped = monitor.getWindow(window.get_id());
|
||||
if (wrapped !== undefined) {
|
||||
@@ -231,7 +241,7 @@ export default class WindowManager implements IWindowManager {
|
||||
}
|
||||
|
||||
_getAndRemoveWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
||||
let wrapped = undefined;
|
||||
let wrapped: WindowWrapper | undefined = undefined;
|
||||
for (const monitor of this._monitors.values()) {
|
||||
wrapped = monitor.getWindow(window.get_id());
|
||||
if (wrapped !== undefined) {
|
||||
@@ -246,7 +256,7 @@ export default class WindowManager implements IWindowManager {
|
||||
let wrapped = this._getAndRemoveWrappedWindow(window);
|
||||
if (wrapped === undefined) {
|
||||
Logger.error("WINDOW NOT DEFINED")
|
||||
wrapped = new WindowWrapper(window, this.handleWindowMinimized);
|
||||
wrapped = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap));
|
||||
wrapped.connectWindowSignals(this);
|
||||
}
|
||||
let new_mon = this._monitors.get(monitorId);
|
||||
@@ -347,7 +357,7 @@ export default class WindowManager implements IWindowManager {
|
||||
public addWindowToMonitor(window: Meta.Window) {
|
||||
|
||||
Logger.log("ADDING WINDOW TO MONITOR", window, window);
|
||||
var wrapper = new WindowWrapper(window, this.handleWindowMinimized)
|
||||
var wrapper = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap))
|
||||
wrapper.connectWindowSignals(this);
|
||||
this._addWindowWrapperToMonitor(wrapper);
|
||||
|
||||
@@ -416,8 +426,158 @@ export default class WindowManager implements IWindowManager {
|
||||
* @returns The window ID of the active window, or null if no window is active
|
||||
*/
|
||||
public syncActiveWindow(): number | null {
|
||||
const focusWindow = global.display.focus_window;
|
||||
if (focusWindow) {
|
||||
this._activeWindowId = focusWindow.get_id();
|
||||
Logger.debug(`Active window changed to: ${this._activeWindowId} (${focusWindow.get_title()})`);
|
||||
} else {
|
||||
this._activeWindowId = null;
|
||||
Logger.debug('No active window');
|
||||
}
|
||||
return this._activeWindowId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggles the orientation of the active container (the container holding the active window)
|
||||
*/
|
||||
public toggleActiveContainerOrientation(): void {
|
||||
if (this._activeWindowId === null) {
|
||||
Logger.warn("No active window, cannot toggle container orientation");
|
||||
return;
|
||||
}
|
||||
|
||||
// Find the active window's container
|
||||
const activeContainer = this._findActiveContainer();
|
||||
if (activeContainer) {
|
||||
activeContainer.toggleOrientation();
|
||||
} else {
|
||||
Logger.warn("Could not find container for active window");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds the container that directly contains the active window
|
||||
* @returns The container holding the active window, or null if not found
|
||||
*/
|
||||
private _findActiveContainer(): WindowContainer | null {
|
||||
if (this._activeWindowId === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
for (const monitor of this._monitors.values()) {
|
||||
const activeWorkspaceIndex = global.workspace_manager.get_active_workspace().index();
|
||||
|
||||
// Bounds check to prevent accessing invalid workspace
|
||||
if (activeWorkspaceIndex >= monitor._workspaces.length || activeWorkspaceIndex < 0) {
|
||||
Logger.warn(`Active workspace index ${activeWorkspaceIndex} out of bounds for monitor with ${monitor._workspaces.length} workspaces`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const workspace = monitor._workspaces[activeWorkspaceIndex];
|
||||
|
||||
// Check if the window is directly in the workspace container
|
||||
const windowWrapper = workspace.getWindow(this._activeWindowId);
|
||||
if (windowWrapper) {
|
||||
// Try to find the parent container
|
||||
const container = this._findContainerHoldingWindow(workspace, this._activeWindowId);
|
||||
return container;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursively finds the container that directly contains a specific window
|
||||
* @param container The container to search
|
||||
* @param windowId The window ID to find
|
||||
* @returns The container that directly contains the window, or null if not found
|
||||
*/
|
||||
private _findContainerHoldingWindow(container: WindowContainer, windowId: number): WindowContainer | null {
|
||||
// Check if this container directly contains the window
|
||||
for (const item of container._tiledItems) {
|
||||
if (item instanceof WindowContainer) {
|
||||
// Recursively search nested containers
|
||||
const result = this._findContainerHoldingWindow(item, windowId);
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
} else if (item.getWindowId() === windowId) {
|
||||
// Found it! Return this container as it directly holds the window
|
||||
return container;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prints the tree structure of all monitors, workspaces, containers, and windows to the logs
|
||||
*/
|
||||
public printTreeStructure(): void {
|
||||
Logger.info("=".repeat(80));
|
||||
Logger.info("WINDOW TREE STRUCTURE");
|
||||
Logger.info("=".repeat(80));
|
||||
Logger.info(`Active Window ID: ${this._activeWindowId ?? 'none'}`);
|
||||
Logger.info("=".repeat(80));
|
||||
|
||||
const activeWorkspaceIndex = global.workspace_manager.get_active_workspace().index();
|
||||
|
||||
this._monitors.forEach((monitor: Monitor, monitorId: number) => {
|
||||
const isActiveMonitor = this._activeWindowId !== null &&
|
||||
monitor.getWindow(this._activeWindowId) !== undefined;
|
||||
const monitorMarker = isActiveMonitor ? ' *' : '';
|
||||
|
||||
Logger.info(`Monitor ${monitorId}${monitorMarker}:`);
|
||||
Logger.info(` Work Area: x=${monitor._workArea.x}, y=${monitor._workArea.y}, w=${monitor._workArea.width}, h=${monitor._workArea.height}`);
|
||||
|
||||
monitor._workspaces.forEach((workspace, workspaceIndex) => {
|
||||
const isActiveWorkspace = workspaceIndex === activeWorkspaceIndex;
|
||||
const workspaceMarker = isActiveWorkspace && isActiveMonitor ? ' *' : '';
|
||||
|
||||
Logger.info(` Workspace ${workspaceIndex}${workspaceMarker}:`);
|
||||
Logger.info(` Orientation: ${workspace._orientation === 0 ? 'HORIZONTAL' : 'VERTICAL'}`);
|
||||
Logger.info(` Items: ${workspace._tiledItems.length}`);
|
||||
|
||||
this._printContainerTree(workspace, 4);
|
||||
});
|
||||
});
|
||||
|
||||
Logger.info("=".repeat(80));
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursively prints the container tree structure
|
||||
* @param container The container to print
|
||||
* @param indentLevel The indentation level (number of spaces)
|
||||
*/
|
||||
private _printContainerTree(container: any, indentLevel: number): void {
|
||||
const indent = " ".repeat(indentLevel);
|
||||
|
||||
container._tiledItems.forEach((item: any, index: number) => {
|
||||
if (item instanceof WindowContainer) {
|
||||
// Check if this container contains the active window
|
||||
const containsActiveWindow = this._activeWindowId !== null &&
|
||||
item.getWindow(this._activeWindowId) !== undefined;
|
||||
const containerMarker = containsActiveWindow ? ' *' : '';
|
||||
|
||||
Logger.info(`${indent}[${index}] Container (${item._orientation === 0 ? 'HORIZONTAL' : 'VERTICAL'})${containerMarker}:`);
|
||||
Logger.info(`${indent} Items: ${item._tiledItems.length}`);
|
||||
Logger.info(`${indent} Work Area: x=${item._workArea.x}, y=${item._workArea.y}, w=${item._workArea.width}, h=${item._workArea.height}`);
|
||||
this._printContainerTree(item, indentLevel + 4);
|
||||
} else {
|
||||
const window = item.getWindow();
|
||||
const isActiveWindow = this._activeWindowId === item.getWindowId();
|
||||
const windowMarker = isActiveWindow ? ' *' : '';
|
||||
|
||||
Logger.info(`${indent}[${index}] Window ID: ${item.getWindowId()}${windowMarker}`);
|
||||
Logger.info(`${indent} Title: "${window.get_title()}"`);
|
||||
Logger.info(`${indent} Class: ${window.get_wm_class()}`);
|
||||
const rect = item.getRect();
|
||||
Logger.info(`${indent} Rect: x=${rect.x}, y=${rect.y}, w=${rect.width}, h=${rect.height}`);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
"outDir": "./dist",
|
||||
"sourceMap": false,
|
||||
"strict": true,
|
||||
"noImplicitAny": false,
|
||||
"skipLibCheck": true,
|
||||
"target": "ES2022",
|
||||
"lib": [
|
||||
"ES2022"
|
||||
|
||||
Reference in New Issue
Block a user