Compare commits
1 Commits
feat/add-r
...
feat/add-w
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dd565da626 |
@@ -1,99 +0,0 @@
|
|||||||
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"
|
|
||||||
32
extension.ts
32
extension.ts
@@ -53,14 +53,9 @@ export default class aerospike extends Extension {
|
|||||||
this.refreshKeybinding('join-with-right');
|
this.refreshKeybinding('join-with-right');
|
||||||
});
|
});
|
||||||
|
|
||||||
this.settings.connect('changed::print-tree', () => {
|
this.settings.connect('changed::remove-all-dividers', () => {
|
||||||
log(`Print tree keybinding changed to: ${this.settings.get_strv('print-tree')}`);
|
log(`Keybinding remove-all-dividers changed to: ${this.settings.get_strv('remove-all-dividers')}`);
|
||||||
this.refreshKeybinding('print-tree');
|
this.refreshKeybinding('remove-all-dividers');
|
||||||
});
|
|
||||||
|
|
||||||
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', () => {
|
this.settings.connect('changed::dropdown-option', () => {
|
||||||
@@ -98,14 +93,10 @@ export default class aerospike extends Extension {
|
|||||||
Logger.info('Keybinding 4 was pressed!');
|
Logger.info('Keybinding 4 was pressed!');
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case 'print-tree':
|
case 'remove-all-dividers':
|
||||||
this.bindKeybinding('print-tree', () => {
|
this.bindKeybinding('remove-all-dividers', () => {
|
||||||
this.windowManager.printTreeStructure();
|
Logger.info('Remove all dividers keybinding pressed!');
|
||||||
});
|
this.windowManager.removeAllDividersFromActiveContainer();
|
||||||
break;
|
|
||||||
case 'toggle-orientation':
|
|
||||||
this.bindKeybinding('toggle-orientation', () => {
|
|
||||||
this.windowManager.toggleActiveContainerOrientation();
|
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -135,12 +126,9 @@ export default class aerospike extends Extension {
|
|||||||
Logger.info('Keybinding 4 was pressed!');
|
Logger.info('Keybinding 4 was pressed!');
|
||||||
});
|
});
|
||||||
|
|
||||||
this.bindKeybinding('print-tree', () => {
|
this.bindKeybinding('remove-all-dividers', () => {
|
||||||
this.windowManager.printTreeStructure();
|
Logger.info('Remove all dividers keybinding pressed!');
|
||||||
});
|
this.windowManager.removeAllDividersFromActiveContainer();
|
||||||
|
|
||||||
this.bindKeybinding('toggle-orientation', () => {
|
|
||||||
this.windowManager.toggleActiveContainerOrientation();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
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/'],
|
|
||||||
};
|
|
||||||
14
justfile
14
justfile
@@ -28,25 +28,13 @@ install: build
|
|||||||
cp -r dist/* ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/
|
cp -r dist/* ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/
|
||||||
|
|
||||||
run:
|
run:
|
||||||
env MUTTER_DEBUG_DUMMY_MODE_SPECS=1280x720 dbus-run-session -- gnome-shell --devkit --wayland
|
env MUTTER_DEBUG_DUMMY_MODE_SPECS=1280x720 dbus-run-session -- gnome-shell --nested --wayland
|
||||||
|
|
||||||
install-and-run: install run
|
install-and-run: install run
|
||||||
|
|
||||||
live-debug:
|
live-debug:
|
||||||
journalctl /usr/bin/gnome-shell -f -o cat | tee debug.log
|
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
|
#pack: build
|
||||||
# gnome-extensions pack dist \
|
# gnome-extensions pack dist \
|
||||||
# --force \
|
# --force \
|
||||||
|
|||||||
@@ -15,20 +15,11 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/example/my-extension#readme",
|
"homepage": "https://github.com/example/my-extension#readme",
|
||||||
"sideEffects": false,
|
"sideEffects": false,
|
||||||
"scripts": {
|
|
||||||
"test": "jest",
|
|
||||||
"test:watch": "jest --watch",
|
|
||||||
"test:coverage": "jest --coverage"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@girs/gjs": "4.0.0-beta.38",
|
"@girs/gjs": "4.0.0-beta.38",
|
||||||
"@girs/gnome-shell": "49.0.1",
|
"@girs/gnome-shell": "49.0.1",
|
||||||
"@jest/globals": "^29.7.0",
|
|
||||||
"@types/jest": "^29.5.12",
|
|
||||||
"eslint": "^9.36.0",
|
"eslint": "^9.36.0",
|
||||||
"eslint-plugin-jsdoc": "^50.8.0",
|
"eslint-plugin-jsdoc": "^50.8.0",
|
||||||
"jest": "^29.7.0",
|
|
||||||
"ts-jest": "^29.1.2",
|
|
||||||
"typescript": "^5.9.2"
|
"typescript": "^5.9.2"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
2377
pnpm-lock.yaml
generated
2377
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -37,16 +37,10 @@
|
|||||||
<description>Keyboard shortcut for triggering action 4</description>
|
<description>Keyboard shortcut for triggering action 4</description>
|
||||||
</key>
|
</key>
|
||||||
|
|
||||||
<key name="print-tree" type="as">
|
<key name="remove-all-dividers" type="as">
|
||||||
<default><![CDATA[['<Super><Shift>x']]]></default>
|
<default><![CDATA[['<Alt>z']]]></default>
|
||||||
<summary>Print window tree structure</summary>
|
<summary>Remove all dividers from active container</summary>
|
||||||
<description>Prints the current tree of containers and windows per monitor to logs</description>
|
<description>Keyboard shortcut for removing all dividers from the container with the active window</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>
|
</key>
|
||||||
|
|
||||||
</schema>
|
</schema>
|
||||||
|
|||||||
@@ -1,182 +0,0 @@
|
|||||||
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']);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
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,24 +155,6 @@ 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
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,21 +3,24 @@ import {Logger} from "../utils/logger.js";
|
|||||||
import Meta from "gi://Meta";
|
import Meta from "gi://Meta";
|
||||||
import queueEvent from "../utils/events.js";
|
import queueEvent from "../utils/events.js";
|
||||||
import {Rect} from "../utils/rect.js";
|
import {Rect} from "../utils/rect.js";
|
||||||
|
import {Divider} from "./divider.js";
|
||||||
|
|
||||||
enum Orientation {
|
enum Orientation {
|
||||||
HORIZONTAL = 0,
|
HORIZONTAL = 0,
|
||||||
VERTICAL = 1,
|
VERTICAL = 1,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ContainerItem = WindowWrapper | WindowContainer | Divider;
|
||||||
|
|
||||||
export default class WindowContainer {
|
export default class WindowContainer {
|
||||||
|
|
||||||
_tiledItems: (WindowWrapper | WindowContainer)[];
|
_tiledItems: ContainerItem[];
|
||||||
_tiledWindowLookup: Map<number, WindowWrapper>;
|
_tiledWindowLookup: Map<number, WindowWrapper>;
|
||||||
_orientation: Orientation = Orientation.HORIZONTAL;
|
_orientation: Orientation = Orientation.HORIZONTAL;
|
||||||
_workArea: Rect;
|
_workArea: Rect;
|
||||||
|
|
||||||
constructor(workspaceArea: Rect,) {
|
constructor(workspaceArea: Rect,) {
|
||||||
|
// this._id = monitorId;
|
||||||
this._tiledItems = [];
|
this._tiledItems = [];
|
||||||
this._tiledWindowLookup = new Map<number, WindowWrapper>();
|
this._tiledWindowLookup = new Map<number, WindowWrapper>();
|
||||||
this._workArea = workspaceArea;
|
this._workArea = workspaceArea;
|
||||||
@@ -29,17 +32,11 @@ export default class WindowContainer {
|
|||||||
this.tileWindows();
|
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 {
|
addWindow(winWrap: WindowWrapper): void {
|
||||||
|
// Add window to managed windows
|
||||||
this._tiledItems.push(winWrap);
|
this._tiledItems.push(winWrap);
|
||||||
this._tiledWindowLookup.set(winWrap.getWindowId(), winWrap);
|
this._tiledWindowLookup.set(winWrap.getWindowId(), winWrap);
|
||||||
|
// winWrap.setParent(this);
|
||||||
queueEvent({
|
queueEvent({
|
||||||
name: "tiling-windows",
|
name: "tiling-windows",
|
||||||
callback: () => {
|
callback: () => {
|
||||||
@@ -54,12 +51,14 @@ export default class WindowContainer {
|
|||||||
return this._tiledWindowLookup.get(win_id);
|
return this._tiledWindowLookup.get(win_id);
|
||||||
}
|
}
|
||||||
for (const item of this._tiledItems) {
|
for (const item of this._tiledItems) {
|
||||||
if (item instanceof WindowContainer) {
|
if (Divider.isDivider(item)) {
|
||||||
|
continue; // Skip dividers
|
||||||
|
} else if (item instanceof WindowContainer) {
|
||||||
const win = item.getWindow(win_id);
|
const win = item.getWindow(win_id);
|
||||||
if (win) {
|
if (win) {
|
||||||
return win;
|
return win;
|
||||||
}
|
}
|
||||||
} else if (item.getWindowId() === win_id) {
|
} else if (item instanceof WindowWrapper && item.getWindowId() === win_id) {
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -78,12 +77,10 @@ export default class WindowContainer {
|
|||||||
|
|
||||||
removeWindow(win_id: number): void {
|
removeWindow(win_id: number): void {
|
||||||
if (this._tiledWindowLookup.has(win_id)) {
|
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);
|
this._tiledWindowLookup.delete(win_id);
|
||||||
if (index !== -1) {
|
const index = this._getIndexOfWindow(win_id)
|
||||||
this._tiledItems.splice(index, 1);
|
this._tiledItems.splice(index, 1);
|
||||||
}
|
this._cleanupInvalidDividers();
|
||||||
} else {
|
} else {
|
||||||
for (const item of this._tiledItems) {
|
for (const item of this._tiledItems) {
|
||||||
if (item instanceof WindowContainer) {
|
if (item instanceof WindowContainer) {
|
||||||
@@ -94,11 +91,44 @@ export default class WindowContainer {
|
|||||||
this.tileWindows()
|
this.tileWindows()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes invalid dividers from the items list.
|
||||||
|
* Invalid dividers are:
|
||||||
|
* - Dividers at the start or end of the list (no window on one side)
|
||||||
|
* - Consecutive dividers (two dividers in a row)
|
||||||
|
*/
|
||||||
|
_cleanupInvalidDividers(): void {
|
||||||
|
let i = 0;
|
||||||
|
while (i < this._tiledItems.length) {
|
||||||
|
const item = this._tiledItems[i];
|
||||||
|
|
||||||
|
if (Divider.isDivider(item)) {
|
||||||
|
// Check if divider is at start or end
|
||||||
|
const isAtStart = i === 0;
|
||||||
|
const isAtEnd = i === this._tiledItems.length - 1;
|
||||||
|
|
||||||
|
// Check if next item is also a divider
|
||||||
|
const nextIsDivider = i < this._tiledItems.length - 1 &&
|
||||||
|
Divider.isDivider(this._tiledItems[i + 1]);
|
||||||
|
|
||||||
|
if (isAtStart || isAtEnd || nextIsDivider) {
|
||||||
|
Logger.log(`Removing invalid divider at index ${i}`);
|
||||||
|
this._tiledItems.splice(i, 1);
|
||||||
|
continue; // Don't increment i, check the same position again
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
disconnectSignals(): void {
|
disconnectSignals(): void {
|
||||||
this._tiledItems.forEach((item) => {
|
this._tiledItems.forEach((item) => {
|
||||||
if (item instanceof WindowContainer) {
|
if (Divider.isDivider(item)) {
|
||||||
|
// Skip dividers - they don't have signals
|
||||||
|
return;
|
||||||
|
} else if (item instanceof WindowContainer) {
|
||||||
item.disconnectSignals()
|
item.disconnectSignals()
|
||||||
} else {
|
} else if (item instanceof WindowWrapper) {
|
||||||
item.disconnectWindowSignals();
|
item.disconnectWindowSignals();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,6 +145,7 @@ export default class WindowContainer {
|
|||||||
|
|
||||||
Logger.log("WorkArea", this._workArea);
|
Logger.log("WorkArea", this._workArea);
|
||||||
|
|
||||||
|
// Get all windows for current workspaceArea
|
||||||
this._tileItems()
|
this._tileItems()
|
||||||
|
|
||||||
return true
|
return true
|
||||||
@@ -125,13 +156,21 @@ export default class WindowContainer {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const bounds = this.getBounds();
|
const bounds = this.getBounds();
|
||||||
this._tiledItems.forEach((item, index) => {
|
|
||||||
const rect = bounds[index];
|
// Apply bounds to non-divider items
|
||||||
|
let boundsIndex = 0;
|
||||||
|
this._tiledItems.forEach((item) => {
|
||||||
|
if (Divider.isDivider(item)) {
|
||||||
|
return; // Skip dividers
|
||||||
|
}
|
||||||
|
|
||||||
|
const rect = bounds[boundsIndex];
|
||||||
if (item instanceof WindowContainer) {
|
if (item instanceof WindowContainer) {
|
||||||
item.move(rect);
|
item.move(rect);
|
||||||
} else {
|
} else if (item instanceof WindowWrapper) {
|
||||||
item.safelyResizeWindow(rect);
|
item.safelyResizeWindow(rect);
|
||||||
}
|
}
|
||||||
|
boundsIndex++;
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -144,42 +183,177 @@ export default class WindowContainer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getVerticalBounds(): Rect[] {
|
getVerticalBounds(): Rect[] {
|
||||||
const items = this._tiledItems
|
// Filter out dividers to get only windows/containers
|
||||||
const containerHeight = Math.floor(this._workArea.height / items.length);
|
const nonDividerItems = this._tiledItems.filter(item => !Divider.isDivider(item));
|
||||||
return items.map((_, index) => {
|
|
||||||
const y = this._workArea.y + (index * containerHeight);
|
if (nonDividerItems.length === 0) {
|
||||||
return {
|
return [];
|
||||||
x: this._workArea.x,
|
}
|
||||||
y: y,
|
|
||||||
width: this._workArea.width,
|
// If no dividers, use equal distribution
|
||||||
height: containerHeight
|
const hasDividers = this._tiledItems.some(item => Divider.isDivider(item));
|
||||||
} as Rect;
|
if (!hasDividers) {
|
||||||
});
|
const containerHeight = Math.floor(this._workArea.height / nonDividerItems.length);
|
||||||
|
return nonDividerItems.map((_, index) => {
|
||||||
|
const y = this._workArea.y + (index * containerHeight);
|
||||||
|
return {
|
||||||
|
x: this._workArea.x,
|
||||||
|
y: y,
|
||||||
|
width: this._workArea.width,
|
||||||
|
height: containerHeight
|
||||||
|
} as Rect;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate bounds based on divider positions
|
||||||
|
const bounds: Rect[] = [];
|
||||||
|
let currentY = this._workArea.y;
|
||||||
|
let itemIndex = 0;
|
||||||
|
|
||||||
|
for (let i = 0; i < this._tiledItems.length; i++) {
|
||||||
|
const item = this._tiledItems[i];
|
||||||
|
|
||||||
|
if (Divider.isDivider(item)) {
|
||||||
|
// Next segment starts at divider position
|
||||||
|
currentY = this._workArea.y + Math.floor(item.getPosition() * this._workArea.height);
|
||||||
|
} else {
|
||||||
|
// Find the end position for this item
|
||||||
|
let endY: number = this._workArea.y + this._workArea.height;
|
||||||
|
|
||||||
|
// Look ahead to find next divider or end of container
|
||||||
|
for (let j = i + 1; j < this._tiledItems.length; j++) {
|
||||||
|
if (Divider.isDivider(this._tiledItems[j])) {
|
||||||
|
const divider = this._tiledItems[j] as Divider;
|
||||||
|
endY = this._workArea.y + Math.floor(divider.getPosition() * this._workArea.height);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Count non-divider items until next divider
|
||||||
|
let itemCount = 0;
|
||||||
|
let itemsInSegment: number[] = [];
|
||||||
|
for (let j = i; j < this._tiledItems.length; j++) {
|
||||||
|
if (Divider.isDivider(this._tiledItems[j])) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
itemsInSegment.push(j);
|
||||||
|
itemCount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Divide space equally among items in this segment
|
||||||
|
const segmentHeight = endY - currentY;
|
||||||
|
const itemHeight = Math.floor(segmentHeight / itemCount);
|
||||||
|
|
||||||
|
for (let k = 0; k < itemsInSegment.length; k++) {
|
||||||
|
const itemY = currentY + (k * itemHeight);
|
||||||
|
bounds.push({
|
||||||
|
x: this._workArea.x,
|
||||||
|
y: itemY,
|
||||||
|
width: this._workArea.width,
|
||||||
|
height: itemHeight
|
||||||
|
} as Rect);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Skip the items we just processed
|
||||||
|
i += itemCount - 1;
|
||||||
|
currentY = endY;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return bounds;
|
||||||
}
|
}
|
||||||
|
|
||||||
getHorizontalBounds(): Rect[] {
|
getHorizontalBounds(): Rect[] {
|
||||||
const windowWidth = Math.floor(this._workArea.width / this._tiledItems.length);
|
// Filter out dividers to get only windows/containers
|
||||||
|
const nonDividerItems = this._tiledItems.filter(item => !Divider.isDivider(item));
|
||||||
|
|
||||||
return this._tiledItems.map((_, index) => {
|
if (nonDividerItems.length === 0) {
|
||||||
const x = this._workArea.x + (index * windowWidth);
|
return [];
|
||||||
return {
|
}
|
||||||
x: x,
|
|
||||||
y: this._workArea.y,
|
// If no dividers, use equal distribution
|
||||||
width: windowWidth,
|
const hasDividers = this._tiledItems.some(item => Divider.isDivider(item));
|
||||||
height: this._workArea.height
|
if (!hasDividers) {
|
||||||
} as Rect;
|
const windowWidth = Math.floor(this._workArea.width / nonDividerItems.length);
|
||||||
});
|
return nonDividerItems.map((_, index) => {
|
||||||
|
const x = this._workArea.x + (index * windowWidth);
|
||||||
|
return {
|
||||||
|
x: x,
|
||||||
|
y: this._workArea.y,
|
||||||
|
width: windowWidth,
|
||||||
|
height: this._workArea.height
|
||||||
|
} as Rect;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate bounds based on divider positions
|
||||||
|
const bounds: Rect[] = [];
|
||||||
|
let currentX = this._workArea.x;
|
||||||
|
|
||||||
|
for (let i = 0; i < this._tiledItems.length; i++) {
|
||||||
|
const item = this._tiledItems[i];
|
||||||
|
|
||||||
|
if (Divider.isDivider(item)) {
|
||||||
|
// Next segment starts at divider position
|
||||||
|
currentX = this._workArea.x + Math.floor(item.getPosition() * this._workArea.width);
|
||||||
|
} else {
|
||||||
|
// Find the end position for this item
|
||||||
|
let endX: number = this._workArea.x + this._workArea.width;
|
||||||
|
|
||||||
|
// Look ahead to find next divider or end of container
|
||||||
|
for (let j = i + 1; j < this._tiledItems.length; j++) {
|
||||||
|
if (Divider.isDivider(this._tiledItems[j])) {
|
||||||
|
const divider = this._tiledItems[j] as Divider;
|
||||||
|
endX = this._workArea.x + Math.floor(divider.getPosition() * this._workArea.width);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Count non-divider items until next divider
|
||||||
|
let itemCount = 0;
|
||||||
|
let itemsInSegment: number[] = [];
|
||||||
|
for (let j = i; j < this._tiledItems.length; j++) {
|
||||||
|
if (Divider.isDivider(this._tiledItems[j])) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
itemsInSegment.push(j);
|
||||||
|
itemCount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Divide space equally among items in this segment
|
||||||
|
const segmentWidth = endX - currentX;
|
||||||
|
const itemWidth = Math.floor(segmentWidth / itemCount);
|
||||||
|
|
||||||
|
for (let k = 0; k < itemsInSegment.length; k++) {
|
||||||
|
const itemX = currentX + (k * itemWidth);
|
||||||
|
bounds.push({
|
||||||
|
x: itemX,
|
||||||
|
y: this._workArea.y,
|
||||||
|
width: itemWidth,
|
||||||
|
height: this._workArea.height
|
||||||
|
} as Rect);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Skip the items we just processed
|
||||||
|
i += itemCount - 1;
|
||||||
|
currentX = endX;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return bounds;
|
||||||
}
|
}
|
||||||
|
|
||||||
getIndexOfItemNested(item: WindowWrapper): number {
|
getIndexOfItemNested(item: WindowWrapper): number {
|
||||||
for (let i = 0; i < this._tiledItems.length; i++) {
|
for (let i = 0; i < this._tiledItems.length; i++) {
|
||||||
const container = this._tiledItems[i];
|
const container = this._tiledItems[i];
|
||||||
if (container instanceof WindowContainer) {
|
if (Divider.isDivider(container)) {
|
||||||
|
continue; // Skip dividers
|
||||||
|
} else if (container instanceof WindowContainer) {
|
||||||
const index = container.getIndexOfItemNested(item);
|
const index = container.getIndexOfItemNested(item);
|
||||||
if (index !== -1) {
|
if (index !== -1) {
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
} else if (container.getWindowId() === item.getWindowId()) {
|
} else if (container instanceof WindowWrapper && container.getWindowId() === item.getWindowId()) {
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -188,24 +362,271 @@ export default class WindowContainer {
|
|||||||
|
|
||||||
// TODO: update this to work with nested containers - all other logic should already be working
|
// TODO: update this to work with nested containers - all other logic should already be working
|
||||||
itemDragged(item: WindowWrapper, x: number, y: number): void {
|
itemDragged(item: WindowWrapper, x: number, y: number): void {
|
||||||
let original_index = this.getIndexOfItemNested(item);
|
// Find the actual index in _tiledItems (including dividers)
|
||||||
|
const original_actual_index = this._getIndexOfWindow(item.getWindowId());
|
||||||
|
|
||||||
if (original_index === -1) {
|
if (original_actual_index === -1) {
|
||||||
Logger.error("Item not found in container during drag op", item.getWindowId());
|
Logger.error("Item not found in container during drag op", item.getWindowId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let new_index = this.getIndexOfItemNested(item);
|
|
||||||
this.getBounds().forEach((rect, index) => {
|
// Find which visual slot (non-divider index) we're moving to
|
||||||
|
let new_visual_index = this.getIndexOfItemNested(item);
|
||||||
|
const bounds = this.getBounds();
|
||||||
|
bounds.forEach((rect, index) => {
|
||||||
if (rect.x < x && rect.x + rect.width > x && rect.y < y && rect.y + rect.height > y) {
|
if (rect.x < x && rect.x + rect.width > x && rect.y < y && rect.y + rect.height > y) {
|
||||||
new_index = index;
|
new_visual_index = index;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
if (original_index !== new_index) {
|
|
||||||
this._tiledItems.splice(original_index, 1);
|
// Get current visual index (counting only non-dividers before this item)
|
||||||
this._tiledItems.splice(new_index, 0, item);
|
let original_visual_index = 0;
|
||||||
this.tileWindows()
|
for (let i = 0; i < original_actual_index; i++) {
|
||||||
|
if (!Divider.isDivider(this._tiledItems[i])) {
|
||||||
|
original_visual_index++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (original_visual_index === new_visual_index) {
|
||||||
|
return; // No movement needed
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger.log(`Swapping window from visual index ${original_visual_index} to ${new_visual_index}`);
|
||||||
|
|
||||||
|
// Find the target window at the new visual index
|
||||||
|
let target_actual_index = -1;
|
||||||
|
let visual_count = 0;
|
||||||
|
for (let i = 0; i < this._tiledItems.length; i++) {
|
||||||
|
if (!Divider.isDivider(this._tiledItems[i])) {
|
||||||
|
if (visual_count === new_visual_index) {
|
||||||
|
target_actual_index = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
visual_count++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (target_actual_index === -1) {
|
||||||
|
Logger.warn("Could not find target position for drag");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simply swap the two windows in place, leaving dividers where they are
|
||||||
|
const temp = this._tiledItems[original_actual_index];
|
||||||
|
this._tiledItems[original_actual_index] = this._tiledItems[target_actual_index];
|
||||||
|
this._tiledItems[target_actual_index] = temp;
|
||||||
|
|
||||||
|
this.tileWindows();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles window resize operations. Creates or updates dividers based on resize direction.
|
||||||
|
* @param item - The window being resized
|
||||||
|
* @param resizeEdge - The edge being resized (N, S, E, W, etc.)
|
||||||
|
* @param newRect - The new rectangle after resize
|
||||||
|
*/
|
||||||
|
handleWindowResize(item: WindowWrapper, resizeEdge: Meta.GrabOp, newRect: Rect): void {
|
||||||
|
const itemIndex = this._getIndexOfWindow(item.getWindowId());
|
||||||
|
if (itemIndex === -1) {
|
||||||
|
Logger.warn("Window not found in container during resize", item.getWindowId());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine if this is a valid resize for this container orientation
|
||||||
|
const isHorizontalResize = this._isHorizontalResizeOp(resizeEdge);
|
||||||
|
const isVerticalResize = this._isVerticalResizeOp(resizeEdge);
|
||||||
|
|
||||||
|
// Only allow horizontal resizes in horizontal containers
|
||||||
|
// Only allow vertical resizes in vertical containers
|
||||||
|
if (this._orientation === Orientation.HORIZONTAL && !isHorizontalResize) {
|
||||||
|
Logger.log("Ignoring vertical resize in horizontal container");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this._orientation === Orientation.VERTICAL && !isVerticalResize) {
|
||||||
|
Logger.log("Ignoring horizontal resize in vertical container");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine which edge is being resized and find adjacent window
|
||||||
|
let adjacentIndex = -1;
|
||||||
|
let dividerPosition = 0;
|
||||||
|
|
||||||
|
if (this._orientation === Orientation.HORIZONTAL) {
|
||||||
|
// East/West resize
|
||||||
|
if (this._isEastResizeOp(resizeEdge)) {
|
||||||
|
// Resizing east edge - divider goes after this window
|
||||||
|
adjacentIndex = itemIndex + 1;
|
||||||
|
// Calculate divider position as ratio of container width
|
||||||
|
const rightEdge = newRect.x + newRect.width;
|
||||||
|
dividerPosition = (rightEdge - this._workArea.x) / this._workArea.width;
|
||||||
|
} else if (this._isWestResizeOp(resizeEdge)) {
|
||||||
|
// Resizing west edge - divider goes before this window
|
||||||
|
adjacentIndex = itemIndex - 1;
|
||||||
|
dividerPosition = (newRect.x - this._workArea.x) / this._workArea.width;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Vertical orientation - North/South resize
|
||||||
|
if (this._isSouthResizeOp(resizeEdge)) {
|
||||||
|
// Resizing south edge - divider goes after this window
|
||||||
|
adjacentIndex = itemIndex + 1;
|
||||||
|
const bottomEdge = newRect.y + newRect.height;
|
||||||
|
dividerPosition = (bottomEdge - this._workArea.y) / this._workArea.height;
|
||||||
|
} else if (this._isNorthResizeOp(resizeEdge)) {
|
||||||
|
// Resizing north edge - divider goes before this window
|
||||||
|
adjacentIndex = itemIndex - 1;
|
||||||
|
dividerPosition = (newRect.y - this._workArea.y) / this._workArea.height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make sure there's an adjacent item
|
||||||
|
if (adjacentIndex < 0 || adjacentIndex >= this._tiledItems.length) {
|
||||||
|
Logger.log("No adjacent window for resize operation");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Skip if adjacent item is already a divider
|
||||||
|
if (Divider.isDivider(this._tiledItems[adjacentIndex])) {
|
||||||
|
// Update existing divider
|
||||||
|
const divider = this._tiledItems[adjacentIndex] as Divider;
|
||||||
|
divider.setPosition(dividerPosition);
|
||||||
|
Logger.log(`Updated divider at index ${adjacentIndex} to position ${dividerPosition}`);
|
||||||
|
} else {
|
||||||
|
// Insert new divider between items
|
||||||
|
const dividerIndex = Math.max(itemIndex, adjacentIndex);
|
||||||
|
const newDivider = new Divider(dividerPosition, this._orientation);
|
||||||
|
this._tiledItems.splice(dividerIndex, 0, newDivider);
|
||||||
|
Logger.log(`Inserted new divider at index ${dividerIndex} with position ${dividerPosition}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.tileWindows();
|
||||||
|
}
|
||||||
|
|
||||||
|
private _isHorizontalResizeOp(op: Meta.GrabOp): boolean {
|
||||||
|
return op === Meta.GrabOp.RESIZING_E ||
|
||||||
|
op === Meta.GrabOp.RESIZING_W ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NW ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SW;
|
||||||
|
}
|
||||||
|
|
||||||
|
private _isVerticalResizeOp(op: Meta.GrabOp): boolean {
|
||||||
|
return op === Meta.GrabOp.RESIZING_N ||
|
||||||
|
op === Meta.GrabOp.RESIZING_S ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NW ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SW;
|
||||||
|
}
|
||||||
|
|
||||||
|
private _isEastResizeOp(op: Meta.GrabOp): boolean {
|
||||||
|
return op === Meta.GrabOp.RESIZING_E ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private _isWestResizeOp(op: Meta.GrabOp): boolean {
|
||||||
|
return op === Meta.GrabOp.RESIZING_W ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NW ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SW;
|
||||||
|
}
|
||||||
|
|
||||||
|
private _isSouthResizeOp(op: Meta.GrabOp): boolean {
|
||||||
|
return op === Meta.GrabOp.RESIZING_S ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SW;
|
||||||
|
}
|
||||||
|
|
||||||
|
private _isNorthResizeOp(op: Meta.GrabOp): boolean {
|
||||||
|
return op === Meta.GrabOp.RESIZING_N ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NW;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes all dividers from this container, reverting to equal space distribution
|
||||||
|
*/
|
||||||
|
removeAllDividers(): void {
|
||||||
|
Logger.log("Removing all dividers from container");
|
||||||
|
this._tiledItems = this._tiledItems.filter(item => !Divider.isDivider(item));
|
||||||
|
this.tileWindows();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates divider position during a live resize operation (or creates if doesn't exist)
|
||||||
|
* This is called repeatedly during resize for live feedback
|
||||||
|
*/
|
||||||
|
updateDividerDuringResize(item: WindowWrapper, resizeEdge: Meta.GrabOp, newRect: Rect): void {
|
||||||
|
const itemIndex = this._getIndexOfWindow(item.getWindowId());
|
||||||
|
if (itemIndex === -1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine if this is a valid resize for this container orientation
|
||||||
|
const isHorizontalResize = this._isHorizontalResizeOp(resizeEdge);
|
||||||
|
const isVerticalResize = this._isVerticalResizeOp(resizeEdge);
|
||||||
|
|
||||||
|
if (this._orientation === Orientation.HORIZONTAL && !isHorizontalResize) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this._orientation === Orientation.VERTICAL && !isVerticalResize) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine which edge is being resized and find adjacent window
|
||||||
|
let adjacentIndex = -1;
|
||||||
|
let dividerPosition = 0;
|
||||||
|
|
||||||
|
if (this._orientation === Orientation.HORIZONTAL) {
|
||||||
|
if (this._isEastResizeOp(resizeEdge)) {
|
||||||
|
adjacentIndex = itemIndex + 1;
|
||||||
|
const rightEdge = newRect.x + newRect.width;
|
||||||
|
dividerPosition = (rightEdge - this._workArea.x) / this._workArea.width;
|
||||||
|
} else if (this._isWestResizeOp(resizeEdge)) {
|
||||||
|
adjacentIndex = itemIndex - 1;
|
||||||
|
dividerPosition = (newRect.x - this._workArea.x) / this._workArea.width;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (this._isSouthResizeOp(resizeEdge)) {
|
||||||
|
adjacentIndex = itemIndex + 1;
|
||||||
|
const bottomEdge = newRect.y + newRect.height;
|
||||||
|
dividerPosition = (bottomEdge - this._workArea.y) / this._workArea.height;
|
||||||
|
} else if (this._isNorthResizeOp(resizeEdge)) {
|
||||||
|
adjacentIndex = itemIndex - 1;
|
||||||
|
dividerPosition = (newRect.y - this._workArea.y) / this._workArea.height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make sure there's an adjacent item (window or container, not out of bounds)
|
||||||
|
if (adjacentIndex < 0 || adjacentIndex >= this._tiledItems.length) {
|
||||||
|
Logger.log(`No adjacent item at index ${adjacentIndex}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine where divider should be inserted/updated
|
||||||
|
// For East/South resizes: divider between current (itemIndex) and next (itemIndex+1)
|
||||||
|
// For West/North resizes: divider between previous (itemIndex-1) and current (itemIndex)
|
||||||
|
let dividerIndex: number;
|
||||||
|
|
||||||
|
if (this._orientation === Orientation.HORIZONTAL) {
|
||||||
|
dividerIndex = this._isEastResizeOp(resizeEdge) ? itemIndex + 1 : itemIndex;
|
||||||
|
} else {
|
||||||
|
dividerIndex = this._isSouthResizeOp(resizeEdge) ? itemIndex + 1 : itemIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if there's already a divider at this position
|
||||||
|
if (dividerIndex < this._tiledItems.length && Divider.isDivider(this._tiledItems[dividerIndex])) {
|
||||||
|
// Update existing divider
|
||||||
|
const divider = this._tiledItems[dividerIndex] as Divider;
|
||||||
|
divider.setPosition(dividerPosition);
|
||||||
|
} else {
|
||||||
|
// Insert new divider
|
||||||
|
const newDivider = new Divider(dividerPosition, this._orientation);
|
||||||
|
this._tiledItems.splice(dividerIndex, 0, newDivider);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retile to show live updates
|
||||||
|
this.tileWindows();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
45
src/wm/divider.ts
Normal file
45
src/wm/divider.ts
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import {Logger} from "../utils/logger.js";
|
||||||
|
|
||||||
|
enum Orientation {
|
||||||
|
HORIZONTAL = 0,
|
||||||
|
VERTICAL = 1,
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a divider between windows in a container.
|
||||||
|
* Dividers track the split position as a ratio (0-1) of the container's size.
|
||||||
|
*/
|
||||||
|
export class Divider {
|
||||||
|
private _position: number; // Position as ratio 0-1
|
||||||
|
private _orientation: Orientation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new divider
|
||||||
|
* @param position - Position as ratio between 0 and 1
|
||||||
|
* @param orientation - Orientation of the divider (HORIZONTAL or VERTICAL)
|
||||||
|
*/
|
||||||
|
constructor(position: number, orientation: Orientation) {
|
||||||
|
this._position = Math.max(0, Math.min(1, position)); // Clamp between 0 and 1
|
||||||
|
this._orientation = orientation;
|
||||||
|
}
|
||||||
|
|
||||||
|
getPosition(): number {
|
||||||
|
return this._position;
|
||||||
|
}
|
||||||
|
|
||||||
|
setPosition(position: number): void {
|
||||||
|
this._position = Math.max(0, Math.min(1, position)); // Clamp between 0 and 1
|
||||||
|
Logger.log(`Divider position updated to ${this._position}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
getOrientation(): Orientation {
|
||||||
|
return this._orientation;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if this is a divider instance
|
||||||
|
*/
|
||||||
|
static isDivider(item: any): item is Divider {
|
||||||
|
return item instanceof Divider;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -83,4 +83,17 @@ export default class Monitor {
|
|||||||
this._workspaces[item.getWorkspace()].itemDragged(item, x, y);
|
this._workspaces[item.getWorkspace()].itemDragged(item, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
handleWindowResize(item: WindowWrapper, resizeEdge: Meta.GrabOp, newRect: Rect): void {
|
||||||
|
this._workspaces[item.getWorkspace()].handleWindowResize(item, resizeEdge, newRect);
|
||||||
|
}
|
||||||
|
|
||||||
|
updateDividerDuringResize(item: WindowWrapper, resizeEdge: Meta.GrabOp, newRect: Rect): void {
|
||||||
|
this._workspaces[item.getWorkspace()].updateDividerDuringResize(item, resizeEdge, newRect);
|
||||||
|
}
|
||||||
|
|
||||||
|
removeAllDividersFromActiveContainer(): void {
|
||||||
|
const activeWorkspace = global.workspace_manager.get_active_workspace();
|
||||||
|
this._workspaces[activeWorkspace.index()].removeAllDividers();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -16,6 +16,7 @@ export class WindowWrapper {
|
|||||||
readonly _signals: number[] = [];
|
readonly _signals: number[] = [];
|
||||||
_parent: WindowContainer | null = null;
|
_parent: WindowContainer | null = null;
|
||||||
_dragging: boolean = false;
|
_dragging: boolean = false;
|
||||||
|
_resizing: boolean = false;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
window: Meta.Window,
|
window: Meta.Window,
|
||||||
@@ -53,6 +54,13 @@ export class WindowWrapper {
|
|||||||
this._dragging = false;
|
this._dragging = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
startResizing(): void {
|
||||||
|
this._resizing = true;
|
||||||
|
}
|
||||||
|
stopResizing(): void {
|
||||||
|
this._resizing = false;
|
||||||
|
}
|
||||||
|
|
||||||
// setParent(parent: WindowContainer): void {
|
// setParent(parent: WindowContainer): void {
|
||||||
// this._parent = parent;
|
// this._parent = parent;
|
||||||
// }
|
// }
|
||||||
@@ -85,6 +93,11 @@ export class WindowWrapper {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
this._window.connect('notify::has-focus', () => {
|
||||||
|
if (this._window.has_focus()) {
|
||||||
|
windowManager._activeWindowId = windowId;
|
||||||
|
}
|
||||||
|
}),
|
||||||
this._window.connect('notify::maximized-horizontally', () => {
|
this._window.connect('notify::maximized-horizontally', () => {
|
||||||
if (this._window.is_maximized()) {
|
if (this._window.is_maximized()) {
|
||||||
Logger.log(`Window maximized: ${windowId}`);
|
Logger.log(`Window maximized: ${windowId}`);
|
||||||
@@ -119,8 +132,8 @@ export class WindowWrapper {
|
|||||||
|
|
||||||
safelyResizeWindow(rect: Rect, _retry: number = 2): void {
|
safelyResizeWindow(rect: Rect, _retry: number = 2): void {
|
||||||
// Keep minimal logging
|
// Keep minimal logging
|
||||||
if (this._dragging) {
|
if (this._dragging && !this._resizing) {
|
||||||
Logger.info("STOPPED RESIZE BECAUSE ITEM IS BEING DRAGGED")
|
// During drag operations (not resize), skip this entirely
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Logger.log("SAFELY RESIZE", rect.x, rect.y, rect.width, rect.height);
|
// Logger.log("SAFELY RESIZE", rect.x, rect.y, rect.width, rect.height);
|
||||||
@@ -137,6 +150,12 @@ export class WindowWrapper {
|
|||||||
this._window.move_frame(true, rect.x, rect.y);
|
this._window.move_frame(true, rect.x, rect.y);
|
||||||
// Logger.info("RESIZING MOVING")
|
// Logger.info("RESIZING MOVING")
|
||||||
this._window.move_resize_frame(true, rect.x, rect.y, rect.width, rect.height);
|
this._window.move_resize_frame(true, rect.x, rect.y, rect.width, rect.height);
|
||||||
|
|
||||||
|
// Don't retry during live resize operations - it causes spam and isn't needed
|
||||||
|
if (this._resizing) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
let new_rect = this._window.get_frame_rect();
|
let new_rect = this._window.get_frame_rect();
|
||||||
if ( _retry > 0 && (new_rect.x != rect.x || rect.y != new_rect.y || rect.width < new_rect.width || rect.height < new_rect.height)) {
|
if ( _retry > 0 && (new_rect.x != rect.x || rect.y != new_rect.y || rect.width < new_rect.width || rect.height < new_rect.height)) {
|
||||||
Logger.warn("RESIZING FAILED AS SMALLER", new_rect.x, new_rect.y, new_rect.width, new_rect.height, rect.x, rect.y, rect.width, rect.height);
|
Logger.warn("RESIZING FAILED AS SMALLER", new_rect.x, new_rect.y, new_rect.width, new_rect.height, rect.x, rect.y, rect.width, rect.height);
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import * as Main from "resource:///org/gnome/shell/ui/main.js";
|
|||||||
// import Mtk from "@girs/mtk-16";
|
// import Mtk from "@girs/mtk-16";
|
||||||
import {Logger} from "../utils/logger.js";
|
import {Logger} from "../utils/logger.js";
|
||||||
import Monitor from "./monitor.js";
|
import Monitor from "./monitor.js";
|
||||||
import WindowContainer from "./container.js";
|
|
||||||
|
|
||||||
|
|
||||||
export interface IWindowManager {
|
export interface IWindowManager {
|
||||||
@@ -45,6 +44,7 @@ export default class WindowManager implements IWindowManager {
|
|||||||
|
|
||||||
_grabbedWindowMonitor: number = _UNUSED_MONITOR_ID;
|
_grabbedWindowMonitor: number = _UNUSED_MONITOR_ID;
|
||||||
_grabbedWindowId: number = _UNUSED_WINDOW_ID;
|
_grabbedWindowId: number = _UNUSED_WINDOW_ID;
|
||||||
|
_grabbedOp: Meta.GrabOp | null = null;
|
||||||
_changingGrabbedMonitor: boolean = false;
|
_changingGrabbedMonitor: boolean = false;
|
||||||
|
|
||||||
_showingOverview: boolean = false;
|
_showingOverview: boolean = false;
|
||||||
@@ -65,9 +65,6 @@ export default class WindowManager implements IWindowManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.captureExistingWindows();
|
this.captureExistingWindows();
|
||||||
|
|
||||||
// Sync the initially focused window
|
|
||||||
this.syncActiveWindow();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
instantiateDisplaySignals(): void {
|
instantiateDisplaySignals(): void {
|
||||||
@@ -90,9 +87,6 @@ export default class WindowManager implements IWindowManager {
|
|||||||
global.display.connect('window-created', (display, window) => {
|
global.display.connect('window-created', (display, window) => {
|
||||||
this.handleWindowCreated(display, window);
|
this.handleWindowCreated(display, window);
|
||||||
}),
|
}),
|
||||||
global.display.connect('notify::focus-window', () => {
|
|
||||||
this.syncActiveWindow();
|
|
||||||
}),
|
|
||||||
|
|
||||||
global.display.connect("showing-desktop-changed", () => {
|
global.display.connect("showing-desktop-changed", () => {
|
||||||
Logger.log("SHOWING DESKTOP CHANGED");
|
Logger.log("SHOWING DESKTOP CHANGED");
|
||||||
@@ -164,13 +158,10 @@ export default class WindowManager implements IWindowManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
removeAllWindows(): void {
|
removeAllWindows(): void {
|
||||||
// Disconnect signals from minimized windows before clearing
|
|
||||||
this.disconnectMinimizedSignals();
|
|
||||||
this._minimizedItems.clear();
|
|
||||||
|
|
||||||
this._monitors.forEach((monitor: Monitor) => {
|
this._monitors.forEach((monitor: Monitor) => {
|
||||||
monitor.removeAllWindows();
|
monitor.removeAllWindows();
|
||||||
})
|
})
|
||||||
|
this._minimizedItems.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -215,22 +206,56 @@ export default class WindowManager implements IWindowManager {
|
|||||||
Logger.log("Grab Op Start", op);
|
Logger.log("Grab Op Start", op);
|
||||||
Logger.log(display, window, op)
|
Logger.log(display, window, op)
|
||||||
Logger.log(window.get_monitor())
|
Logger.log(window.get_monitor())
|
||||||
this._getWrappedWindow(window)?.startDragging();
|
|
||||||
|
const winWrap = this._getWrappedWindow(window);
|
||||||
|
if (this._isResizeOp(op)) {
|
||||||
|
winWrap?.startResizing();
|
||||||
|
} else {
|
||||||
|
winWrap?.startDragging();
|
||||||
|
}
|
||||||
|
|
||||||
this._grabbedWindowMonitor = window.get_monitor();
|
this._grabbedWindowMonitor = window.get_monitor();
|
||||||
this._grabbedWindowId = window.get_id();
|
this._grabbedWindowId = window.get_id();
|
||||||
|
this._grabbedOp = op;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleGrabOpEnd(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
handleGrabOpEnd(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
||||||
Logger.log("Grab Op End ", op);
|
Logger.log("Grab Op End ", op);
|
||||||
Logger.log("primary display", display.get_primary_monitor())
|
Logger.log("primary display", display.get_primary_monitor())
|
||||||
|
|
||||||
|
// Handle resize operations
|
||||||
|
if (this._isResizeOp(op)) {
|
||||||
|
const winWrap = this._getWrappedWindow(window);
|
||||||
|
if (winWrap && this._grabbedOp) {
|
||||||
|
const newRect = window.get_frame_rect();
|
||||||
|
const monitorId = window.get_monitor();
|
||||||
|
Logger.log(`Handling resize operation: ${op}, new rect:`, newRect);
|
||||||
|
this._monitors.get(monitorId)?.handleWindowResize(winWrap, this._grabbedOp, newRect);
|
||||||
|
winWrap.stopResizing();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this._getWrappedWindow(window)?.stopDragging();
|
||||||
|
}
|
||||||
|
|
||||||
this._grabbedWindowId = _UNUSED_WINDOW_ID;
|
this._grabbedWindowId = _UNUSED_WINDOW_ID;
|
||||||
this._getWrappedWindow(window)?.stopDragging();
|
this._grabbedOp = null;
|
||||||
this._tileMonitors();
|
this._tileMonitors();
|
||||||
Logger.info("monitor_start and monitor_end", this._grabbedWindowMonitor, window.get_monitor());
|
Logger.info("monitor_start and monitor_end", this._grabbedWindowMonitor, window.get_monitor());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private _isResizeOp(op: Meta.GrabOp): boolean {
|
||||||
|
return op === Meta.GrabOp.RESIZING_E ||
|
||||||
|
op === Meta.GrabOp.RESIZING_W ||
|
||||||
|
op === Meta.GrabOp.RESIZING_N ||
|
||||||
|
op === Meta.GrabOp.RESIZING_S ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NW ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SW;
|
||||||
|
}
|
||||||
|
|
||||||
_getWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
_getWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
||||||
let wrapped: WindowWrapper | undefined = undefined;
|
let wrapped = undefined;
|
||||||
for (const monitor of this._monitors.values()) {
|
for (const monitor of this._monitors.values()) {
|
||||||
wrapped = monitor.getWindow(window.get_id());
|
wrapped = monitor.getWindow(window.get_id());
|
||||||
if (wrapped !== undefined) {
|
if (wrapped !== undefined) {
|
||||||
@@ -241,7 +266,7 @@ export default class WindowManager implements IWindowManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_getAndRemoveWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
_getAndRemoveWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
||||||
let wrapped: WindowWrapper | undefined = undefined;
|
let wrapped = undefined;
|
||||||
for (const monitor of this._monitors.values()) {
|
for (const monitor of this._monitors.values()) {
|
||||||
wrapped = monitor.getWindow(window.get_id());
|
wrapped = monitor.getWindow(window.get_id());
|
||||||
if (wrapped !== undefined) {
|
if (wrapped !== undefined) {
|
||||||
@@ -256,7 +281,7 @@ export default class WindowManager implements IWindowManager {
|
|||||||
let wrapped = this._getAndRemoveWrappedWindow(window);
|
let wrapped = this._getAndRemoveWrappedWindow(window);
|
||||||
if (wrapped === undefined) {
|
if (wrapped === undefined) {
|
||||||
Logger.error("WINDOW NOT DEFINED")
|
Logger.error("WINDOW NOT DEFINED")
|
||||||
wrapped = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap));
|
wrapped = new WindowWrapper(window, this.handleWindowMinimized);
|
||||||
wrapped.connectWindowSignals(this);
|
wrapped.connectWindowSignals(this);
|
||||||
}
|
}
|
||||||
let new_mon = this._monitors.get(monitorId);
|
let new_mon = this._monitors.get(monitorId);
|
||||||
@@ -268,6 +293,16 @@ export default class WindowManager implements IWindowManager {
|
|||||||
if (this._changingGrabbedMonitor) {
|
if (this._changingGrabbedMonitor) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handle resize operations - update dividers in real-time
|
||||||
|
if (this._grabbedOp && this._isResizeOp(this._grabbedOp)) {
|
||||||
|
const window = winWrap.getWindow();
|
||||||
|
const newRect = window.get_frame_rect();
|
||||||
|
const monitorId = window.get_monitor();
|
||||||
|
this._monitors.get(monitorId)?.updateDividerDuringResize(winWrap, this._grabbedOp, newRect);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (winWrap.getWindowId() === this._grabbedWindowId) {
|
if (winWrap.getWindowId() === this._grabbedWindowId) {
|
||||||
const [mouseX, mouseY, _] = global.get_pointer();
|
const [mouseX, mouseY, _] = global.get_pointer();
|
||||||
|
|
||||||
@@ -357,7 +392,7 @@ export default class WindowManager implements IWindowManager {
|
|||||||
public addWindowToMonitor(window: Meta.Window) {
|
public addWindowToMonitor(window: Meta.Window) {
|
||||||
|
|
||||||
Logger.log("ADDING WINDOW TO MONITOR", window, window);
|
Logger.log("ADDING WINDOW TO MONITOR", window, window);
|
||||||
var wrapper = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap))
|
var wrapper = new WindowWrapper(window, this.handleWindowMinimized)
|
||||||
wrapper.connectWindowSignals(this);
|
wrapper.connectWindowSignals(this);
|
||||||
this._addWindowWrapperToMonitor(wrapper);
|
this._addWindowWrapperToMonitor(wrapper);
|
||||||
|
|
||||||
@@ -426,158 +461,29 @@ export default class WindowManager implements IWindowManager {
|
|||||||
* @returns The window ID of the active window, or null if no window is active
|
* @returns The window ID of the active window, or null if no window is active
|
||||||
*/
|
*/
|
||||||
public syncActiveWindow(): number | null {
|
public syncActiveWindow(): number | null {
|
||||||
const focusWindow = global.display.focus_window;
|
return null;
|
||||||
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)
|
* Removes all dividers from the container with the currently active window
|
||||||
*/
|
*/
|
||||||
public toggleActiveContainerOrientation(): void {
|
public removeAllDividersFromActiveContainer(): void {
|
||||||
if (this._activeWindowId === null) {
|
const activeWindow = global.display.focus_window;
|
||||||
Logger.warn("No active window, cannot toggle container orientation");
|
if (!activeWindow) {
|
||||||
|
Logger.log("No active window, cannot remove dividers");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find the active window's container
|
const monitorId = activeWindow.get_monitor();
|
||||||
const activeContainer = this._findActiveContainer();
|
const monitor = this._monitors.get(monitorId);
|
||||||
if (activeContainer) {
|
|
||||||
activeContainer.toggleOrientation();
|
if (monitor) {
|
||||||
|
Logger.log(`Removing all dividers from monitor ${monitorId}`);
|
||||||
|
monitor.removeAllDividersFromActiveContainer();
|
||||||
} else {
|
} else {
|
||||||
Logger.warn("Could not find container for active window");
|
Logger.warn(`Monitor ${monitorId} not found`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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,8 +5,6 @@
|
|||||||
"outDir": "./dist",
|
"outDir": "./dist",
|
||||||
"sourceMap": false,
|
"sourceMap": false,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"noImplicitAny": false,
|
|
||||||
"skipLibCheck": true,
|
|
||||||
"target": "ES2022",
|
"target": "ES2022",
|
||||||
"lib": [
|
"lib": [
|
||||||
"ES2022"
|
"ES2022"
|
||||||
|
|||||||
Reference in New Issue
Block a user