Compare commits
13 Commits
d59a0fef6d
...
main
Author | SHA1 | Date | |
---|---|---|---|
|
2b86856a97 | ||
|
a858af73f4 | ||
|
ecb5a568cd | ||
|
5e9bc796ea | ||
|
04f402c686 | ||
|
1d3d9dc402 | ||
|
c7f45ecf3b | ||
|
c23b9113ab | ||
|
50ceb02124 | ||
|
717c240d70 | ||
|
822a7bd2e4 | ||
|
4543c98de8 | ||
|
ed661b3fa6 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -3,3 +3,4 @@ node_modules
|
||||
dist
|
||||
/schemas/gschemas.compiled
|
||||
/aerospike.zip
|
||||
/debug.log
|
||||
|
70
extension.ts
70
extension.ts
@@ -3,7 +3,7 @@ import {Extension, ExtensionMetadata} from 'resource:///org/gnome/shell/extensio
|
||||
import * as Main from 'resource:///org/gnome/shell/ui/main.js';
|
||||
import Gio from 'gi://Gio';
|
||||
import Shell from 'gi://Shell';
|
||||
import WindowManager from './src/windowManager.js'
|
||||
import WindowManager from './src/wm/windowManager.js'
|
||||
import {Logger} from "./src/utils/logger.js";
|
||||
|
||||
export default class aerospike extends Extension {
|
||||
@@ -21,34 +21,36 @@ export default class aerospike extends Extension {
|
||||
enable() {
|
||||
Logger.log("STARTING AEROSPIKE!")
|
||||
this.bindSettings();
|
||||
this.setupKeybindings();
|
||||
this.windowManager.enable()
|
||||
}
|
||||
|
||||
disable() {
|
||||
this.windowManager.disable()
|
||||
this.removeKeybindings()
|
||||
}
|
||||
|
||||
|
||||
private bindSettings() {
|
||||
// Monitor settings changes
|
||||
this.settings.connect('changed::keybinding-1', () => {
|
||||
log(`Keybinding 1 changed to: ${this.settings.get_strv('keybinding-1')}`);
|
||||
this.refreshKeybinding('keybinding-1');
|
||||
this.settings.connect('changed::move-left', () => {
|
||||
log(`Keybinding 1 changed to: ${this.settings.get_strv('move-left')}`);
|
||||
this.refreshKeybinding('move-left');
|
||||
});
|
||||
|
||||
this.settings.connect('changed::keybinding-2', () => {
|
||||
log(`Keybinding 2 changed to: ${this.settings.get_strv('keybinding-2')}`);
|
||||
this.refreshKeybinding('keybinding-2');
|
||||
this.settings.connect('changed::move-right', () => {
|
||||
log(`Keybinding 2 changed to: ${this.settings.get_strv('move-right')}`);
|
||||
this.refreshKeybinding('move-right');
|
||||
});
|
||||
|
||||
this.settings.connect('changed::keybinding-3', () => {
|
||||
log(`Keybinding 3 changed to: ${this.settings.get_strv('keybinding-3')}`);
|
||||
this.refreshKeybinding('keybinding-3');
|
||||
this.settings.connect('changed::join-with-left', () => {
|
||||
log(`Keybinding 3 changed to: ${this.settings.get_strv('join-with-left')}`);
|
||||
this.refreshKeybinding('join-with-left');
|
||||
});
|
||||
|
||||
this.settings.connect('changed::keybinding-4', () => {
|
||||
log(`Keybinding 4 changed to: ${this.settings.get_strv('keybinding-4')}`);
|
||||
this.refreshKeybinding('keybinding-4');
|
||||
this.settings.connect('changed::join-with-right', () => {
|
||||
log(`Keybinding 4 changed to: ${this.settings.get_strv('join-with-right')}`);
|
||||
this.refreshKeybinding('join-with-right');
|
||||
});
|
||||
|
||||
this.settings.connect('changed::dropdown-option', () => {
|
||||
@@ -66,24 +68,24 @@ export default class aerospike extends Extension {
|
||||
}
|
||||
|
||||
switch (settingName) {
|
||||
case 'keybinding-1':
|
||||
this.bindKeybinding('keybinding-1', () => {
|
||||
log('Keybinding 1 was pressed!');
|
||||
case 'move-left':
|
||||
this.bindKeybinding('move-left', () => {
|
||||
Logger.info('Keybinding 1 was pressed!');
|
||||
});
|
||||
break;
|
||||
case 'keybinding-2':
|
||||
this.bindKeybinding('keybinding-2', () => {
|
||||
log('Keybinding 2 was pressed!');
|
||||
case 'move-right':
|
||||
this.bindKeybinding('move-right', () => {
|
||||
Logger.info('Keybinding 2 was pressed!');
|
||||
});
|
||||
break;
|
||||
case 'keybinding-3':
|
||||
this.bindKeybinding('keybinding-3', () => {
|
||||
log('Keybinding 3 was pressed!');
|
||||
case 'join-with-left':
|
||||
this.bindKeybinding('join-with-left', () => {
|
||||
Logger.info('Keybinding 3 was pressed!');
|
||||
});
|
||||
break;
|
||||
case 'keybinding-4':
|
||||
this.bindKeybinding('keybinding-4', () => {
|
||||
log('Keybinding 4 was pressed!');
|
||||
case 'join-with-right':
|
||||
this.bindKeybinding('join-with-right', () => {
|
||||
Logger.info('Keybinding 4 was pressed!');
|
||||
});
|
||||
break;
|
||||
}
|
||||
@@ -97,20 +99,20 @@ export default class aerospike extends Extension {
|
||||
}
|
||||
|
||||
private setupKeybindings() {
|
||||
this.bindKeybinding('keybinding-1', () => {
|
||||
log('Keybinding 1 was pressed!');
|
||||
this.bindKeybinding('move-left', () => {
|
||||
Logger.info('Keybinding 1 was pressed!');
|
||||
});
|
||||
|
||||
this.bindKeybinding('keybinding-2', () => {
|
||||
log('Keybinding 2 was pressed!');
|
||||
this.bindKeybinding('move-right', () => {
|
||||
Logger.info('Keybinding 2 was pressed!');
|
||||
});
|
||||
|
||||
this.bindKeybinding('keybinding-3', () => {
|
||||
log('Keybinding 3 was pressed!');
|
||||
this.bindKeybinding('join-with-left', () => {
|
||||
Logger.info('Keybinding 3 was pressed!');
|
||||
});
|
||||
|
||||
this.bindKeybinding('keybinding-4', () => {
|
||||
log('Keybinding 4 was pressed!');
|
||||
this.bindKeybinding('join-with-right', () => {
|
||||
Logger.info('Keybinding 4 was pressed!');
|
||||
});
|
||||
}
|
||||
|
||||
@@ -124,7 +126,7 @@ export default class aerospike extends Extension {
|
||||
const keyBindingAction = Main.wm.addKeybinding(
|
||||
settingName,
|
||||
this.settings,
|
||||
Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
|
||||
Meta.KeyBindingFlags.NONE,
|
||||
Shell.ActionMode.NORMAL,
|
||||
callback
|
||||
);
|
||||
|
2
justfile
2
justfile
@@ -33,7 +33,7 @@ run:
|
||||
install-and-run: install run
|
||||
|
||||
live-debug:
|
||||
journalctl /usr/bin/gnome-shell -f -o cat
|
||||
journalctl /usr/bin/gnome-shell -f -o cat | tee debug.log
|
||||
|
||||
#pack: build
|
||||
# gnome-extensions pack dist \
|
||||
|
10
package.json
10
package.json
@@ -16,11 +16,11 @@
|
||||
"homepage": "https://github.com/example/my-extension#readme",
|
||||
"sideEffects": false,
|
||||
"devDependencies": {
|
||||
"@girs/gjs": "^4.0.0-beta.23",
|
||||
"@girs/gnome-shell": "^48.0.1",
|
||||
"eslint": "^9.23.0",
|
||||
"eslint-plugin-jsdoc": "^50.6.9",
|
||||
"typescript": "^5.8.2"
|
||||
"@girs/gjs": "4.0.0-beta.23",
|
||||
"@girs/gnome-shell": "^48.0.2",
|
||||
"eslint": "^9.27.0",
|
||||
"eslint-plugin-jsdoc": "^50.6.17",
|
||||
"typescript": "^5.8.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@girs/mtk-16": "16.0.0-4.0.0-beta.23"
|
||||
|
232
pnpm-lock.yaml
generated
232
pnpm-lock.yaml
generated
@@ -13,29 +13,29 @@ importers:
|
||||
version: 16.0.0-4.0.0-beta.23
|
||||
devDependencies:
|
||||
'@girs/gjs':
|
||||
specifier: ^4.0.0-beta.23
|
||||
specifier: 4.0.0-beta.23
|
||||
version: 4.0.0-beta.23
|
||||
'@girs/gnome-shell':
|
||||
specifier: ^48.0.1
|
||||
version: 48.0.1
|
||||
specifier: ^48.0.2
|
||||
version: 48.0.2
|
||||
eslint:
|
||||
specifier: ^9.23.0
|
||||
version: 9.23.0
|
||||
specifier: ^9.27.0
|
||||
version: 9.27.0
|
||||
eslint-plugin-jsdoc:
|
||||
specifier: ^50.6.9
|
||||
version: 50.6.9(eslint@9.23.0)
|
||||
specifier: ^50.6.17
|
||||
version: 50.6.17(eslint@9.27.0)
|
||||
typescript:
|
||||
specifier: ^5.8.2
|
||||
version: 5.8.2
|
||||
specifier: ^5.8.3
|
||||
version: 5.8.3
|
||||
|
||||
packages:
|
||||
|
||||
'@es-joy/jsdoccomment@0.49.0':
|
||||
resolution: {integrity: sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==}
|
||||
engines: {node: '>=16'}
|
||||
'@es-joy/jsdoccomment@0.50.2':
|
||||
resolution: {integrity: sha512-YAdE/IJSpwbOTiaURNCKECdAwqrJuFiZhylmesBcIRawtYKnBR2wxPhoIewMg+Yu+QuYvHfJNReWpoxGBKOChA==}
|
||||
engines: {node: '>=18'}
|
||||
|
||||
'@eslint-community/eslint-utils@4.4.1':
|
||||
resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==}
|
||||
'@eslint-community/eslint-utils@4.7.0':
|
||||
resolution: {integrity: sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==}
|
||||
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
|
||||
peerDependencies:
|
||||
eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
|
||||
@@ -44,32 +44,32 @@ packages:
|
||||
resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
|
||||
engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
|
||||
|
||||
'@eslint/config-array@0.19.2':
|
||||
resolution: {integrity: sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==}
|
||||
'@eslint/config-array@0.20.0':
|
||||
resolution: {integrity: sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@eslint/config-helpers@0.2.0':
|
||||
resolution: {integrity: sha512-yJLLmLexii32mGrhW29qvU3QBVTu0GUmEf/J4XsBtVhp4JkIUFN/BjWqTF63yRvGApIDpZm5fa97LtYtINmfeQ==}
|
||||
'@eslint/config-helpers@0.2.2':
|
||||
resolution: {integrity: sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@eslint/core@0.12.0':
|
||||
resolution: {integrity: sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==}
|
||||
'@eslint/core@0.14.0':
|
||||
resolution: {integrity: sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@eslint/eslintrc@3.3.1':
|
||||
resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@eslint/js@9.23.0':
|
||||
resolution: {integrity: sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==}
|
||||
'@eslint/js@9.27.0':
|
||||
resolution: {integrity: sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@eslint/object-schema@2.1.6':
|
||||
resolution: {integrity: sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@eslint/plugin-kit@0.2.7':
|
||||
resolution: {integrity: sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==}
|
||||
'@eslint/plugin-kit@0.3.1':
|
||||
resolution: {integrity: sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@girs/accountsservice-1.0@1.0.0-4.0.0-beta.23':
|
||||
@@ -129,8 +129,8 @@ packages:
|
||||
'@girs/gmodule-2.0@2.0.0-4.0.0-beta.23':
|
||||
resolution: {integrity: sha512-Dc+Pq1peNlwQ0o/WFsUzT1qt3oqgMLBhzjEfOTGAD0Jw1Ut3QCoBuryVFFNMIruOKnSSBoBnQO7Qelly5aSd2w==}
|
||||
|
||||
'@girs/gnome-shell@48.0.1':
|
||||
resolution: {integrity: sha512-6Oj8cLTD2vwfiNAI7AexLEW/UpZswbiw9Kdg4scf0Te3DpK/YD2M+KKYFyxXafQUlfNg/HEHlRpeo+0f4OWjnQ==}
|
||||
'@girs/gnome-shell@48.0.2':
|
||||
resolution: {integrity: sha512-hrlnTCc6y9O7GTn7M7YAufKdmIF8Et7ZFTRRUVXyv3hBHAor0bUFDrHdmVD+D7KdMHCJrtaLW6EtUCRQyovU2A==}
|
||||
|
||||
'@girs/gnomebg-4.0@4.0.0-4.0.0-beta.23':
|
||||
resolution: {integrity: sha512-mXipjnVd+lUSMhUeugo49TXo32ihlKiN2ggpGDLIcD6ZfGe644DSgxoHFeYkn44HmNW39DvSqF9AcSvLP0cZJA==}
|
||||
@@ -214,27 +214,27 @@ packages:
|
||||
resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==}
|
||||
engines: {node: '>=18.18'}
|
||||
|
||||
'@humanwhocodes/retry@0.4.2':
|
||||
resolution: {integrity: sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==}
|
||||
'@humanwhocodes/retry@0.4.3':
|
||||
resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
|
||||
engines: {node: '>=18.18'}
|
||||
|
||||
'@pkgr/core@0.1.1':
|
||||
resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
|
||||
engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
|
||||
|
||||
'@types/estree@1.0.6':
|
||||
resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
|
||||
'@types/estree@1.0.7':
|
||||
resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==}
|
||||
|
||||
'@types/json-schema@7.0.15':
|
||||
resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
|
||||
|
||||
'@typescript-eslint/types@8.32.1':
|
||||
resolution: {integrity: sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
acorn-jsx@5.3.2:
|
||||
resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
|
||||
peerDependencies:
|
||||
acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
|
||||
|
||||
acorn@8.14.0:
|
||||
resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
|
||||
acorn@8.14.1:
|
||||
resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==}
|
||||
engines: {node: '>=0.4.0'}
|
||||
hasBin: true
|
||||
|
||||
@@ -284,8 +284,8 @@ packages:
|
||||
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
|
||||
engines: {node: '>= 8'}
|
||||
|
||||
debug@4.3.7:
|
||||
resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
|
||||
debug@4.4.1:
|
||||
resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
|
||||
engines: {node: '>=6.0'}
|
||||
peerDependencies:
|
||||
supports-color: '*'
|
||||
@@ -296,15 +296,12 @@ packages:
|
||||
deep-is@0.1.4:
|
||||
resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
|
||||
|
||||
es-module-lexer@1.5.4:
|
||||
resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
|
||||
|
||||
escape-string-regexp@4.0.0:
|
||||
resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
|
||||
engines: {node: '>=10'}
|
||||
|
||||
eslint-plugin-jsdoc@50.6.9:
|
||||
resolution: {integrity: sha512-7/nHu3FWD4QRG8tCVqcv+BfFtctUtEDWc29oeDXB4bwmDM2/r1ndl14AG/2DUntdqH7qmpvdemJKwb3R97/QEw==}
|
||||
eslint-plugin-jsdoc@50.6.17:
|
||||
resolution: {integrity: sha512-hq+VQylhd12l8qjexyriDsejZhqiP33WgMTy2AmaGZ9+MrMWVqPECsM87GPxgHfQn0zw+YTuhqjUfk1f+q67aQ==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
|
||||
@@ -321,8 +318,8 @@ packages:
|
||||
resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
eslint@9.23.0:
|
||||
resolution: {integrity: sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==}
|
||||
eslint@9.27.0:
|
||||
resolution: {integrity: sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
hasBin: true
|
||||
peerDependencies:
|
||||
@@ -372,8 +369,8 @@ packages:
|
||||
resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
|
||||
engines: {node: '>=16'}
|
||||
|
||||
flatted@3.3.1:
|
||||
resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
|
||||
flatted@3.3.3:
|
||||
resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
|
||||
|
||||
glob-parent@6.0.2:
|
||||
resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
|
||||
@@ -466,9 +463,11 @@ packages:
|
||||
resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
|
||||
engines: {node: '>=6'}
|
||||
|
||||
parse-imports@2.2.1:
|
||||
resolution: {integrity: sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==}
|
||||
engines: {node: '>= 18'}
|
||||
parse-imports-exports@0.2.4:
|
||||
resolution: {integrity: sha512-4s6vd6dx1AotCx/RCI2m7t7GCh5bDRUtGNvRfHSP2wbBQdMi67pPe7mtzmgwcaQ8VKK/6IB7Glfyu3qdZJPybQ==}
|
||||
|
||||
parse-statements@1.0.11:
|
||||
resolution: {integrity: sha512-HlsyYdMBnbPQ9Jr/VgJ1YF4scnldvJpJxCVx6KgqPL4dxppsWrJHCIIxQXMJrqGnsRkNPATbeMJ8Yxu7JMsYcA==}
|
||||
|
||||
path-exists@4.0.0:
|
||||
resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
|
||||
@@ -490,8 +489,8 @@ packages:
|
||||
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
|
||||
engines: {node: '>=4'}
|
||||
|
||||
semver@7.6.3:
|
||||
resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
|
||||
semver@7.7.2:
|
||||
resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
|
||||
engines: {node: '>=10'}
|
||||
hasBin: true
|
||||
|
||||
@@ -503,17 +502,14 @@ packages:
|
||||
resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
|
||||
engines: {node: '>=8'}
|
||||
|
||||
slashes@3.0.12:
|
||||
resolution: {integrity: sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==}
|
||||
|
||||
spdx-exceptions@2.5.0:
|
||||
resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==}
|
||||
|
||||
spdx-expression-parse@4.0.0:
|
||||
resolution: {integrity: sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==}
|
||||
|
||||
spdx-license-ids@3.0.20:
|
||||
resolution: {integrity: sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==}
|
||||
spdx-license-ids@3.0.21:
|
||||
resolution: {integrity: sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==}
|
||||
|
||||
strip-json-comments@3.1.1:
|
||||
resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
|
||||
@@ -523,19 +519,12 @@ packages:
|
||||
resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
|
||||
engines: {node: '>=8'}
|
||||
|
||||
synckit@0.9.2:
|
||||
resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==}
|
||||
engines: {node: ^14.18.0 || >=16.0.0}
|
||||
|
||||
tslib@2.8.1:
|
||||
resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
|
||||
|
||||
type-check@0.4.0:
|
||||
resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
|
||||
engines: {node: '>= 0.8.0'}
|
||||
|
||||
typescript@5.8.2:
|
||||
resolution: {integrity: sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==}
|
||||
typescript@5.8.3:
|
||||
resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==}
|
||||
engines: {node: '>=14.17'}
|
||||
hasBin: true
|
||||
|
||||
@@ -557,37 +546,39 @@ packages:
|
||||
|
||||
snapshots:
|
||||
|
||||
'@es-joy/jsdoccomment@0.49.0':
|
||||
'@es-joy/jsdoccomment@0.50.2':
|
||||
dependencies:
|
||||
'@types/estree': 1.0.7
|
||||
'@typescript-eslint/types': 8.32.1
|
||||
comment-parser: 1.4.1
|
||||
esquery: 1.6.0
|
||||
jsdoc-type-pratt-parser: 4.1.0
|
||||
|
||||
'@eslint-community/eslint-utils@4.4.1(eslint@9.23.0)':
|
||||
'@eslint-community/eslint-utils@4.7.0(eslint@9.27.0)':
|
||||
dependencies:
|
||||
eslint: 9.23.0
|
||||
eslint: 9.27.0
|
||||
eslint-visitor-keys: 3.4.3
|
||||
|
||||
'@eslint-community/regexpp@4.12.1': {}
|
||||
|
||||
'@eslint/config-array@0.19.2':
|
||||
'@eslint/config-array@0.20.0':
|
||||
dependencies:
|
||||
'@eslint/object-schema': 2.1.6
|
||||
debug: 4.3.7
|
||||
debug: 4.4.1
|
||||
minimatch: 3.1.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@eslint/config-helpers@0.2.0': {}
|
||||
'@eslint/config-helpers@0.2.2': {}
|
||||
|
||||
'@eslint/core@0.12.0':
|
||||
'@eslint/core@0.14.0':
|
||||
dependencies:
|
||||
'@types/json-schema': 7.0.15
|
||||
|
||||
'@eslint/eslintrc@3.3.1':
|
||||
dependencies:
|
||||
ajv: 6.12.6
|
||||
debug: 4.3.7
|
||||
debug: 4.4.1
|
||||
espree: 10.3.0
|
||||
globals: 14.0.0
|
||||
ignore: 5.3.2
|
||||
@@ -598,13 +589,13 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@eslint/js@9.23.0': {}
|
||||
'@eslint/js@9.27.0': {}
|
||||
|
||||
'@eslint/object-schema@2.1.6': {}
|
||||
|
||||
'@eslint/plugin-kit@0.2.7':
|
||||
'@eslint/plugin-kit@0.3.1':
|
||||
dependencies:
|
||||
'@eslint/core': 0.12.0
|
||||
'@eslint/core': 0.14.0
|
||||
levn: 0.4.1
|
||||
|
||||
'@girs/accountsservice-1.0@1.0.0-4.0.0-beta.23':
|
||||
@@ -767,7 +758,7 @@ snapshots:
|
||||
'@girs/glib-2.0': 2.84.0-4.0.0-beta.23
|
||||
'@girs/gobject-2.0': 2.84.0-4.0.0-beta.23
|
||||
|
||||
'@girs/gnome-shell@48.0.1':
|
||||
'@girs/gnome-shell@48.0.2':
|
||||
dependencies:
|
||||
'@girs/accountsservice-1.0': 1.0.0-4.0.0-beta.23
|
||||
'@girs/adw-1': 1.8.0-4.0.0-beta.23
|
||||
@@ -1063,19 +1054,19 @@ snapshots:
|
||||
|
||||
'@humanwhocodes/retry@0.3.1': {}
|
||||
|
||||
'@humanwhocodes/retry@0.4.2': {}
|
||||
'@humanwhocodes/retry@0.4.3': {}
|
||||
|
||||
'@pkgr/core@0.1.1': {}
|
||||
|
||||
'@types/estree@1.0.6': {}
|
||||
'@types/estree@1.0.7': {}
|
||||
|
||||
'@types/json-schema@7.0.15': {}
|
||||
|
||||
acorn-jsx@5.3.2(acorn@8.14.0):
|
||||
dependencies:
|
||||
acorn: 8.14.0
|
||||
'@typescript-eslint/types@8.32.1': {}
|
||||
|
||||
acorn@8.14.0: {}
|
||||
acorn-jsx@5.3.2(acorn@8.14.1):
|
||||
dependencies:
|
||||
acorn: 8.14.1
|
||||
|
||||
acorn@8.14.1: {}
|
||||
|
||||
ajv@6.12.6:
|
||||
dependencies:
|
||||
@@ -1122,30 +1113,27 @@ snapshots:
|
||||
shebang-command: 2.0.0
|
||||
which: 2.0.2
|
||||
|
||||
debug@4.3.7:
|
||||
debug@4.4.1:
|
||||
dependencies:
|
||||
ms: 2.1.3
|
||||
|
||||
deep-is@0.1.4: {}
|
||||
|
||||
es-module-lexer@1.5.4: {}
|
||||
|
||||
escape-string-regexp@4.0.0: {}
|
||||
|
||||
eslint-plugin-jsdoc@50.6.9(eslint@9.23.0):
|
||||
eslint-plugin-jsdoc@50.6.17(eslint@9.27.0):
|
||||
dependencies:
|
||||
'@es-joy/jsdoccomment': 0.49.0
|
||||
'@es-joy/jsdoccomment': 0.50.2
|
||||
are-docs-informative: 0.0.2
|
||||
comment-parser: 1.4.1
|
||||
debug: 4.3.7
|
||||
debug: 4.4.1
|
||||
escape-string-regexp: 4.0.0
|
||||
eslint: 9.23.0
|
||||
eslint: 9.27.0
|
||||
espree: 10.3.0
|
||||
esquery: 1.6.0
|
||||
parse-imports: 2.2.1
|
||||
semver: 7.6.3
|
||||
parse-imports-exports: 0.2.4
|
||||
semver: 7.7.2
|
||||
spdx-expression-parse: 4.0.0
|
||||
synckit: 0.9.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
@@ -1158,25 +1146,25 @@ snapshots:
|
||||
|
||||
eslint-visitor-keys@4.2.0: {}
|
||||
|
||||
eslint@9.23.0:
|
||||
eslint@9.27.0:
|
||||
dependencies:
|
||||
'@eslint-community/eslint-utils': 4.4.1(eslint@9.23.0)
|
||||
'@eslint-community/eslint-utils': 4.7.0(eslint@9.27.0)
|
||||
'@eslint-community/regexpp': 4.12.1
|
||||
'@eslint/config-array': 0.19.2
|
||||
'@eslint/config-helpers': 0.2.0
|
||||
'@eslint/core': 0.12.0
|
||||
'@eslint/config-array': 0.20.0
|
||||
'@eslint/config-helpers': 0.2.2
|
||||
'@eslint/core': 0.14.0
|
||||
'@eslint/eslintrc': 3.3.1
|
||||
'@eslint/js': 9.23.0
|
||||
'@eslint/plugin-kit': 0.2.7
|
||||
'@eslint/js': 9.27.0
|
||||
'@eslint/plugin-kit': 0.3.1
|
||||
'@humanfs/node': 0.16.6
|
||||
'@humanwhocodes/module-importer': 1.0.1
|
||||
'@humanwhocodes/retry': 0.4.2
|
||||
'@types/estree': 1.0.6
|
||||
'@humanwhocodes/retry': 0.4.3
|
||||
'@types/estree': 1.0.7
|
||||
'@types/json-schema': 7.0.15
|
||||
ajv: 6.12.6
|
||||
chalk: 4.1.2
|
||||
cross-spawn: 7.0.6
|
||||
debug: 4.3.7
|
||||
debug: 4.4.1
|
||||
escape-string-regexp: 4.0.0
|
||||
eslint-scope: 8.3.0
|
||||
eslint-visitor-keys: 4.2.0
|
||||
@@ -1200,8 +1188,8 @@ snapshots:
|
||||
|
||||
espree@10.3.0:
|
||||
dependencies:
|
||||
acorn: 8.14.0
|
||||
acorn-jsx: 5.3.2(acorn@8.14.0)
|
||||
acorn: 8.14.1
|
||||
acorn-jsx: 5.3.2(acorn@8.14.1)
|
||||
eslint-visitor-keys: 4.2.0
|
||||
|
||||
esquery@1.6.0:
|
||||
@@ -1233,10 +1221,10 @@ snapshots:
|
||||
|
||||
flat-cache@4.0.1:
|
||||
dependencies:
|
||||
flatted: 3.3.1
|
||||
flatted: 3.3.3
|
||||
keyv: 4.5.4
|
||||
|
||||
flatted@3.3.1: {}
|
||||
flatted@3.3.3: {}
|
||||
|
||||
glob-parent@6.0.2:
|
||||
dependencies:
|
||||
@@ -1319,10 +1307,11 @@ snapshots:
|
||||
dependencies:
|
||||
callsites: 3.1.0
|
||||
|
||||
parse-imports@2.2.1:
|
||||
parse-imports-exports@0.2.4:
|
||||
dependencies:
|
||||
es-module-lexer: 1.5.4
|
||||
slashes: 3.0.12
|
||||
parse-statements: 1.0.11
|
||||
|
||||
parse-statements@1.0.11: {}
|
||||
|
||||
path-exists@4.0.0: {}
|
||||
|
||||
@@ -1334,7 +1323,7 @@ snapshots:
|
||||
|
||||
resolve-from@4.0.0: {}
|
||||
|
||||
semver@7.6.3: {}
|
||||
semver@7.7.2: {}
|
||||
|
||||
shebang-command@2.0.0:
|
||||
dependencies:
|
||||
@@ -1342,16 +1331,14 @@ snapshots:
|
||||
|
||||
shebang-regex@3.0.0: {}
|
||||
|
||||
slashes@3.0.12: {}
|
||||
|
||||
spdx-exceptions@2.5.0: {}
|
||||
|
||||
spdx-expression-parse@4.0.0:
|
||||
dependencies:
|
||||
spdx-exceptions: 2.5.0
|
||||
spdx-license-ids: 3.0.20
|
||||
spdx-license-ids: 3.0.21
|
||||
|
||||
spdx-license-ids@3.0.20: {}
|
||||
spdx-license-ids@3.0.21: {}
|
||||
|
||||
strip-json-comments@3.1.1: {}
|
||||
|
||||
@@ -1359,18 +1346,11 @@ snapshots:
|
||||
dependencies:
|
||||
has-flag: 4.0.0
|
||||
|
||||
synckit@0.9.2:
|
||||
dependencies:
|
||||
'@pkgr/core': 0.1.1
|
||||
tslib: 2.8.1
|
||||
|
||||
tslib@2.8.1: {}
|
||||
|
||||
type-check@0.4.0:
|
||||
dependencies:
|
||||
prelude-ls: 1.2.1
|
||||
|
||||
typescript@5.8.2: {}
|
||||
typescript@5.8.3: {}
|
||||
|
||||
uri-js@4.4.1:
|
||||
dependencies:
|
||||
|
4
prefs.ts
4
prefs.ts
@@ -1,4 +1,4 @@
|
||||
// This file is just a wrapper around the compiled TypeScript code
|
||||
import MyExtensionPreferences from './src/prefs/prefs.js';
|
||||
import AerospikeExtensions from './src/prefs/prefs.js';
|
||||
|
||||
export default MyExtensionPreferences;
|
||||
export default AerospikeExtensions;
|
@@ -1,30 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<schemalist>
|
||||
<schema id="org.gnome.shell.extensions.aerospike" path="/org/gnome/shell/extensions/aerospike/">
|
||||
<key name="keybinding-1" type="as">
|
||||
<default><![CDATA[['<Super>1']]]></default>
|
||||
<summary>Keybinding for action 1</summary>
|
||||
<description>Keyboard shortcut for triggering action 1</description>
|
||||
</key>
|
||||
|
||||
<key name="keybinding-2" type="as">
|
||||
<default><![CDATA[['<Super>2']]]></default>
|
||||
<summary>Keybinding for action 2</summary>
|
||||
<description>Keyboard shortcut for triggering action 2</description>
|
||||
</key>
|
||||
|
||||
<key name="keybinding-3" type="as">
|
||||
<default><![CDATA[['<Super>3']]]></default>
|
||||
<summary>Keybinding for action 3</summary>
|
||||
<description>Keyboard shortcut for triggering action 3</description>
|
||||
</key>
|
||||
|
||||
<key name="keybinding-4" type="as">
|
||||
<default><![CDATA[['<Super>4']]]></default>
|
||||
<summary>Keybinding for action 4</summary>
|
||||
<description>Keyboard shortcut for triggering action 4</description>
|
||||
</key>
|
||||
|
||||
<key name="dropdown-option" type="s">
|
||||
<default>'option1'</default>
|
||||
<summary>Dropdown selection</summary>
|
||||
@@ -36,5 +12,30 @@
|
||||
<summary>Selected color</summary>
|
||||
<description>Color chosen from the color picker</description>
|
||||
</key>
|
||||
|
||||
<key name="move-left" type="as">
|
||||
<default><![CDATA[['<Super>1']]]></default>
|
||||
<summary>Keybinding for action 1</summary>
|
||||
<description>Keyboard shortcut for triggering action 1</description>
|
||||
</key>
|
||||
|
||||
<key name="move-right" type="as">
|
||||
<default><![CDATA[['<Super>2']]]></default>
|
||||
<summary>Keybinding for action 2</summary>
|
||||
<description>Keyboard shortcut for triggering action 2</description>
|
||||
</key>
|
||||
|
||||
<key name="join-with-left" type="as">
|
||||
<default><![CDATA[['<Super>3']]]></default>
|
||||
<summary>Keybinding for action 3</summary>
|
||||
<description>Keyboard shortcut for triggering action 3</description>
|
||||
</key>
|
||||
|
||||
<key name="join-with-right" type="as">
|
||||
<default><![CDATA[['<Super>4']]]></default>
|
||||
<summary>Keybinding for action 4</summary>
|
||||
<description>Keyboard shortcut for triggering action 4</description>
|
||||
</key>
|
||||
|
||||
</schema>
|
||||
</schemalist>
|
@@ -1,76 +0,0 @@
|
||||
import {WindowWrapper} from "./window.js";
|
||||
import {Logger} from "./utils/logger.js";
|
||||
import Mtk from "@girs/mtk-16";
|
||||
|
||||
export default class MonitorManager {
|
||||
|
||||
_id: number;
|
||||
_windows: Map<number, WindowWrapper>;
|
||||
|
||||
|
||||
constructor(monitorId: number) {
|
||||
this._windows = new Map<number, WindowWrapper>();
|
||||
this._id = monitorId;
|
||||
}
|
||||
|
||||
addWindow(winWrap: WindowWrapper): void {
|
||||
// Add window to managed windows
|
||||
this._windows.set(winWrap.getWindowId(), winWrap);
|
||||
this._tileWindows();
|
||||
}
|
||||
|
||||
getWindow(win_id: number): WindowWrapper | undefined {
|
||||
return this._windows.get(win_id)
|
||||
}
|
||||
|
||||
removeWindow(win_id: number): void {
|
||||
this._windows.delete(win_id)
|
||||
this._tileWindows()
|
||||
}
|
||||
|
||||
|
||||
_tileWindows() {
|
||||
Logger.log("TILING WINDOWS ON MONITOR", this._id)
|
||||
const workspace = global.workspace_manager.get_active_workspace();
|
||||
const workArea = workspace.get_work_area_for_monitor(
|
||||
this._id
|
||||
);
|
||||
Logger.log("Workspace", workspace);
|
||||
Logger.log("WorkArea", workArea);
|
||||
|
||||
// Get all windows for current workspace
|
||||
const windows = Array.from(this._windows.values())
|
||||
.filter(({_window}) => {
|
||||
|
||||
if (_window != null) {
|
||||
return _window.get_workspace() === workspace;
|
||||
}
|
||||
})
|
||||
.map(x => x);
|
||||
|
||||
if (windows.length === 0) {
|
||||
return;
|
||||
}
|
||||
this._tileHorizontally(windows, workArea)
|
||||
|
||||
}
|
||||
|
||||
|
||||
_tileHorizontally(windows: (WindowWrapper | null)[], workArea: Mtk.Rectangle) {
|
||||
const windowWidth = Math.floor(workArea.width / windows.length);
|
||||
|
||||
windows.forEach((window, index) => {
|
||||
const x = workArea.x + (index * windowWidth);
|
||||
const rect = {
|
||||
x: x,
|
||||
y: workArea.y,
|
||||
width: windowWidth,
|
||||
height: workArea.height
|
||||
};
|
||||
if (window != null) {
|
||||
window.safelyResizeWindow(rect.x, rect.y, rect.width, rect.height);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
83
src/prefs/keybindings.ts
Normal file
83
src/prefs/keybindings.ts
Normal file
@@ -0,0 +1,83 @@
|
||||
// Gnome imports
|
||||
import Adw from 'gi://Adw';
|
||||
import Gtk from 'gi://Gtk';
|
||||
import Gio from 'gi://Gio';
|
||||
import GObject from 'gi://GObject';
|
||||
import { gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
|
||||
import { Logger } from '../utils/logger.js';
|
||||
|
||||
/**
|
||||
* EntryRow class for handling text input including keybindings
|
||||
*/
|
||||
export class EntryRow extends Adw.EntryRow {
|
||||
static {
|
||||
GObject.registerClass(this);
|
||||
}
|
||||
|
||||
constructor(params: {
|
||||
title: string,
|
||||
settings: Gio.Settings,
|
||||
bind: string,
|
||||
map?: {
|
||||
from: (settings: Gio.Settings, bind: string) => string,
|
||||
to: (settings: Gio.Settings, bind: string, value: string) => void
|
||||
}
|
||||
}) {
|
||||
super({ title: params.title });
|
||||
|
||||
const { settings, bind, map } = params;
|
||||
|
||||
// When text changes, update settings
|
||||
this.connect('changed', () => {
|
||||
const text = this.get_text();
|
||||
if (typeof text === 'string') {
|
||||
if (map) {
|
||||
map.to(settings, bind, text);
|
||||
} else {
|
||||
settings.set_string(bind, text);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Set initial text from settings
|
||||
const current = map ? map.from(settings, bind) : settings.get_string(bind);
|
||||
this.set_text(current ?? '');
|
||||
|
||||
// Add reset button
|
||||
this.add_suffix(
|
||||
new ResetButton({
|
||||
settings,
|
||||
bind,
|
||||
onReset: () => {
|
||||
this.set_text((map ? map.from(settings, bind) : settings.get_string(bind)) ?? '');
|
||||
},
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset button for settings
|
||||
*/
|
||||
export class ResetButton extends Gtk.Button {
|
||||
static {
|
||||
GObject.registerClass(this);
|
||||
}
|
||||
|
||||
constructor(params: {
|
||||
settings?: Gio.Settings,
|
||||
bind: string,
|
||||
onReset?: () => void
|
||||
}) {
|
||||
super({
|
||||
icon_name: 'edit-clear-symbolic',
|
||||
tooltip_text: _('Reset'),
|
||||
valign: Gtk.Align.CENTER,
|
||||
});
|
||||
|
||||
this.connect('clicked', () => {
|
||||
params.settings?.reset(params.bind);
|
||||
params.onReset?.();
|
||||
});
|
||||
}
|
||||
}
|
@@ -3,8 +3,10 @@ import Gio from 'gi://Gio';
|
||||
import Gtk from 'gi://Gtk';
|
||||
import Gdk from 'gi://Gdk';
|
||||
import { ExtensionPreferences, gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import {EntryRow} from "./keybindings.js";
|
||||
|
||||
export default class MyExtensionPreferences extends ExtensionPreferences {
|
||||
export default class AerospikeExtensions extends ExtensionPreferences {
|
||||
async fillPreferencesWindow(window: Adw.PreferencesWindow) {
|
||||
// Create settings object
|
||||
const settings = this.getSettings('org.gnome.shell.extensions.aerospike');
|
||||
@@ -16,17 +18,6 @@ export default class MyExtensionPreferences extends ExtensionPreferences {
|
||||
});
|
||||
window.add(page);
|
||||
|
||||
// Create keybindings group
|
||||
const keybindingsGroup = new Adw.PreferencesGroup({
|
||||
title: _('Keyboard Shortcuts'),
|
||||
});
|
||||
page.add(keybindingsGroup);
|
||||
|
||||
// Add keybinding rows
|
||||
this.addKeybindingRow(keybindingsGroup, settings, 'keybinding-1', _('Action 1'));
|
||||
this.addKeybindingRow(keybindingsGroup, settings, 'keybinding-2', _('Action 2'));
|
||||
this.addKeybindingRow(keybindingsGroup, settings, 'keybinding-3', _('Action 3'));
|
||||
this.addKeybindingRow(keybindingsGroup, settings, 'keybinding-4', _('Action 4'));
|
||||
|
||||
// Create options group
|
||||
const optionsGroup = new Adw.PreferencesGroup({
|
||||
@@ -114,79 +105,82 @@ export default class MyExtensionPreferences extends ExtensionPreferences {
|
||||
const color = colorButton.get_rgba().to_string();
|
||||
settings.set_string('color-selection', color);
|
||||
});
|
||||
|
||||
// Create keybindings group
|
||||
const keybindingsGroup = new Adw.PreferencesGroup({
|
||||
title: _('Keyboard Shortcuts'),
|
||||
description: `${_("Syntax")}: <Super>h, <Shift>g, <Super><Shift>h
|
||||
${_("Legend")}: <Super> - ${_("Windows key")}, <Primary> - ${_("Control key")}
|
||||
${_("Delete text to unset. Press Return key to accept.")}`,
|
||||
});
|
||||
page.add(keybindingsGroup);
|
||||
|
||||
// Add keybinding rows as EntryRows with proper mapping
|
||||
// Use the helper function to create the map object
|
||||
const keybindingMap = this.createKeybindingMap();
|
||||
|
||||
keybindingsGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Action 1'),
|
||||
settings: settings,
|
||||
bind: 'move-left',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Action 2'),
|
||||
settings: settings,
|
||||
bind: 'move-right',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Action 3'),
|
||||
settings: settings,
|
||||
bind: 'join-with-left',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Action 4'),
|
||||
settings: settings,
|
||||
bind: 'join-with-right',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
|
||||
}
|
||||
|
||||
private addKeybindingRow(
|
||||
group: Adw.PreferencesGroup,
|
||||
settings: Gio.Settings,
|
||||
key: string,
|
||||
title: string
|
||||
) {
|
||||
const shortcutsRow = new Adw.ActionRow({
|
||||
title: title,
|
||||
});
|
||||
|
||||
group.add(shortcutsRow);
|
||||
|
||||
// Create a button for setting shortcuts
|
||||
const shortcutButton = new Gtk.Button({
|
||||
valign: Gtk.Align.CENTER,
|
||||
label: settings.get_strv(key)[0] || _("Disabled")
|
||||
});
|
||||
|
||||
shortcutsRow.add_suffix(shortcutButton);
|
||||
shortcutsRow.set_activatable_widget(shortcutButton);
|
||||
|
||||
// When clicking the button, show a dialog or start listening for keystroke
|
||||
shortcutButton.connect('clicked', () => {
|
||||
// Show a simple popup stating that the shortcut is being recorded
|
||||
const dialog = new Gtk.MessageDialog({
|
||||
modal: true,
|
||||
text: _("Press a key combination to set as shortcut"),
|
||||
secondary_text: _("Press Esc to cancel or Backspace to disable"),
|
||||
buttons: Gtk.ButtonsType.CANCEL,
|
||||
transient_for: group.get_root() as Gtk.Window
|
||||
});
|
||||
|
||||
// Create a keypress event controller
|
||||
const controller = new Gtk.EventControllerKey();
|
||||
dialog.add_controller(controller);
|
||||
|
||||
controller.connect('key-pressed', (_controller, keyval, keycode, state) => {
|
||||
// Get the key name
|
||||
let keyName = Gdk.keyval_name(keyval);
|
||||
|
||||
// Handle special cases
|
||||
if (keyName === 'Escape') {
|
||||
dialog.response(Gtk.ResponseType.CANCEL);
|
||||
return Gdk.EVENT_STOP;
|
||||
} else if (keyName === 'BackSpace') {
|
||||
// Clear the shortcut
|
||||
settings.set_strv(key, []);
|
||||
shortcutButton.set_label(_("Disabled"));
|
||||
dialog.response(Gtk.ResponseType.OK);
|
||||
return Gdk.EVENT_STOP;
|
||||
// Helper function to create a keybinding mapping object
|
||||
private createKeybindingMap() {
|
||||
return {
|
||||
from(settings: Gio.Settings, bind: string) {
|
||||
return settings.get_strv(bind).join(',');
|
||||
},
|
||||
to(settings: Gio.Settings, bind: string, value: string) {
|
||||
if (!!value) {
|
||||
const mappings = value.split(',').map((x) => {
|
||||
const [, key, mods] = Gtk.accelerator_parse(x);
|
||||
return Gtk.accelerator_valid(key, mods) && Gtk.accelerator_name(key, mods);
|
||||
});
|
||||
// Filter out any false values to ensure we only have strings
|
||||
const stringMappings = mappings.filter((x): x is string => typeof x === 'string');
|
||||
if (stringMappings.length > 0) {
|
||||
Logger.debug("setting", bind, "to", stringMappings);
|
||||
settings.set_strv(bind, stringMappings);
|
||||
}
|
||||
} else {
|
||||
// If value deleted, unset the mapping
|
||||
settings.set_strv(bind, []);
|
||||
}
|
||||
|
||||
// Convert modifier state to keybinding modifiers
|
||||
let modifiers = state & Gtk.accelerator_get_default_mod_mask();
|
||||
|
||||
// Ignore standalone modifier keys
|
||||
if (Gdk.ModifierType.SHIFT_MASK <= keyval && keyval <= Gdk.ModifierType.META_MASK)
|
||||
return Gdk.EVENT_STOP;
|
||||
|
||||
// Create accelerator string
|
||||
let accelerator = Gtk.accelerator_name(keyval, modifiers);
|
||||
if (accelerator) {
|
||||
settings.set_strv(key, [accelerator]);
|
||||
shortcutButton.set_label(accelerator);
|
||||
dialog.response(Gtk.ResponseType.OK);
|
||||
}
|
||||
|
||||
return Gdk.EVENT_STOP;
|
||||
});
|
||||
|
||||
dialog.present();
|
||||
});
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
20
src/utils/events.ts
Normal file
20
src/utils/events.ts
Normal file
@@ -0,0 +1,20 @@
|
||||
import GLib from "gi://GLib";
|
||||
|
||||
|
||||
export type QueuedEvent = {
|
||||
name: string;
|
||||
callback: () => void;
|
||||
}
|
||||
|
||||
const queuedEvents: QueuedEvent[] = [];
|
||||
|
||||
export default function queueEvent(event: QueuedEvent, interval = 200) {
|
||||
queuedEvents.push(event);
|
||||
GLib.timeout_add(GLib.PRIORITY_DEFAULT, interval, () => {
|
||||
const e = queuedEvents.pop()
|
||||
if (e) {
|
||||
e.callback();
|
||||
}
|
||||
return queuedEvents.length !== 0;
|
||||
});
|
||||
}
|
6
src/utils/rect.ts
Normal file
6
src/utils/rect.ts
Normal file
@@ -0,0 +1,6 @@
|
||||
export type Rect = {
|
||||
x: number;
|
||||
y: number;
|
||||
width: number;
|
||||
height: number;
|
||||
}
|
227
src/window.ts
227
src/window.ts
@@ -1,227 +0,0 @@
|
||||
import Meta from 'gi://Meta';
|
||||
import GLib from "gi://GLib";
|
||||
import Clutter from "gi://Clutter";
|
||||
import {IWindowManager} from "./windowManager.js";
|
||||
import {Logger} from "./utils/logger.js";
|
||||
|
||||
export type Signal = {
|
||||
name: string;
|
||||
id: number;
|
||||
}
|
||||
|
||||
export class WindowWrapper {
|
||||
readonly _window: Meta.Window;
|
||||
readonly _signals: Signal[];
|
||||
|
||||
constructor(window: Meta.Window) {
|
||||
this._window = window;
|
||||
this._signals = [];
|
||||
}
|
||||
|
||||
getWindow(): Meta.Window {
|
||||
return this._window;
|
||||
}
|
||||
|
||||
getWindowId(): number {
|
||||
return this._window.get_id();
|
||||
}
|
||||
|
||||
connectWindowSignals(
|
||||
windowManager: IWindowManager,
|
||||
): void {
|
||||
|
||||
const windowId = this._window.get_id();
|
||||
|
||||
|
||||
// Handle window destruction
|
||||
const destroyId = this._window.connect('unmanaging', window => {
|
||||
Logger.log("REMOVING WINDOW", windowId);
|
||||
windowManager.handleWindowClosed(this)
|
||||
});
|
||||
this._signals.push({name: 'unmanaging', id: destroyId});
|
||||
|
||||
// Handle focus changes
|
||||
const focusId = this._window.connect('notify::has-focus', () => {
|
||||
if (this._window.has_focus()) {
|
||||
windowManager._activeWindowId = windowId;
|
||||
}
|
||||
});
|
||||
this._signals.push({name: 'notify::has-focus', id: focusId});
|
||||
|
||||
// Track window movement using position-changed signal
|
||||
let lastPositionChangeTime = 0;
|
||||
let dragInProgress = false;
|
||||
|
||||
// const positionChangedId = this._window.connect('position-changed', window => {
|
||||
// Logger.log("position-changed", window.get_id());
|
||||
// Logger.log(window.get_monitor())
|
||||
// // const currentTime = Date.now();
|
||||
// // const [x, y, _] = global.get_pointer();
|
||||
// //
|
||||
// // // If this is the first move or it's been a while since the last move, consider it the start of a drag
|
||||
// // if (!dragInProgress) {
|
||||
// // dragInProgress = true;
|
||||
// // Logger.log(`Window drag started for window ${windowId}. Mouse position: ${x}, ${y}`);
|
||||
// // }
|
||||
// //
|
||||
// // // Update the time of the last position change
|
||||
// // lastPositionChangeTime = currentTime;
|
||||
// //
|
||||
// // // Set a timeout to detect when dragging stops (when position changes stop coming in)
|
||||
// // GLib.timeout_add(GLib.PRIORITY_DEFAULT, 300, () => {
|
||||
// // const timeSinceLastMove = Date.now() - lastPositionChangeTime;
|
||||
// // // If it's been more than 200ms since the last move and we were dragging, consider the drag ended
|
||||
// // if (timeSinceLastMove >= 200 && dragInProgress) {
|
||||
// // dragInProgress = false;
|
||||
// // const [endX, endY, _] = global.get_pointer();
|
||||
// // Logger.log(`Window drag ended for window ${windowId}. Mouse position: ${endX}, ${endY}`);
|
||||
// // }
|
||||
// // return GLib.SOURCE_REMOVE; // Remove the timeout
|
||||
// // });
|
||||
// });
|
||||
// this._signals.push({name: 'position-changed', id: positionChangedId});
|
||||
|
||||
// Handle minimization
|
||||
const minimizeId = this._window.connect('notify::minimized', () => {
|
||||
if (this._window.minimized) {
|
||||
Logger.log(`Window minimized: ${windowId}`);
|
||||
// Remove window from managed windows temporarily
|
||||
// windowManager.removeFromTree(this._window);
|
||||
// If this was the active window, find a new one
|
||||
windowManager.syncActiveWindow()
|
||||
// Retile remaining windows
|
||||
windowManager._tileMonitors();
|
||||
|
||||
} else if (!this._window.minimized) {
|
||||
Logger.log(`Window unminimized: ${windowId}`);
|
||||
// windowManager.addWindow(this._window);
|
||||
|
||||
}
|
||||
});
|
||||
this._signals.push({name: 'notify::minimized', id: minimizeId});
|
||||
|
||||
// Handle maximization
|
||||
const maximizeId = this._window.connect('notify::maximized-horizontally', () => {
|
||||
if (this._window.get_maximized()) {
|
||||
Logger.log(`Window maximized: ${windowId}`);
|
||||
} else {
|
||||
Logger.log(`Window unmaximized: ${windowId}`);
|
||||
}
|
||||
});
|
||||
this._signals.push({name: 'notify::maximized-horizontally', id: maximizeId});
|
||||
}
|
||||
|
||||
disconnectWindowSignals(): void {
|
||||
|
||||
// Disconnect signals
|
||||
if (this._signals) {
|
||||
this._signals.forEach(signal => {
|
||||
try {
|
||||
if (this._window != null) {
|
||||
this._window.disconnect(signal.id);
|
||||
}
|
||||
} catch (e) {
|
||||
// Window might already be gone
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
resizeWindow(x: number, y: number, width: number, height: number) {
|
||||
// First, ensure window is not maximized or fullscreen
|
||||
if (this._window.get_maximized()) {
|
||||
Logger.log("WINDOW MAXIMIZED")
|
||||
this._window.unmaximize(Meta.MaximizeFlags.BOTH);
|
||||
}
|
||||
|
||||
if (this._window.is_fullscreen()) {
|
||||
Logger.log("WINDOW IS FULLSCREEN")
|
||||
this._window.unmake_fullscreen();
|
||||
}
|
||||
Logger.log("WINDOW", this._window.get_window_type(), this._window.allows_move());
|
||||
Logger.log("MONITOR INFO", getUsableMonitorSpace(this._window));
|
||||
Logger.log("NEW_SIZE", x, y, width, height);
|
||||
// win.move_resize_frame(false, 50, 50, 300, 300);
|
||||
this._window.move_resize_frame(false, x, y, width, height);
|
||||
Logger.log("RESIZED WINDOW", this._window.get_frame_rect().height, this._window.get_frame_rect().width, this._window.get_frame_rect().x, this._window.get_frame_rect().y);
|
||||
}
|
||||
|
||||
safelyResizeWindow(x: number, y: number, width: number, height: number): void {
|
||||
Logger.log("SAFELY RESIZE", x, y, width, height);
|
||||
const actor = this._window.get_compositor_private();
|
||||
|
||||
if (!actor) {
|
||||
Logger.log("No actor available, can't resize safely yet");
|
||||
return;
|
||||
}
|
||||
|
||||
// Set a flag to track if the resize has been done
|
||||
let resizeDone = false;
|
||||
|
||||
// Connect to the first-frame signal
|
||||
const id = actor.connect('first-frame', () => {
|
||||
// Disconnect the signal handler
|
||||
actor.disconnect(id);
|
||||
|
||||
if (!resizeDone) {
|
||||
resizeDone = true;
|
||||
|
||||
// Add a small delay
|
||||
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 50, () => {
|
||||
try {
|
||||
this.resizeWindow(x, y, width, height);
|
||||
} catch (e) {
|
||||
console.error("Error resizing window:", e);
|
||||
}
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Fallback timeout in case the first-frame signal doesn't fire
|
||||
// (for windows that are already mapped)
|
||||
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 50, () => {
|
||||
if (!resizeDone) {
|
||||
resizeDone = true;
|
||||
try {
|
||||
this.resizeWindow(x, y, width, height);
|
||||
} catch (e) {
|
||||
console.error("Error resizing window (fallback):", e);
|
||||
}
|
||||
}
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
}
|
||||
|
||||
// if (!this._window) return;
|
||||
// this._window.unmaximize(Meta.MaximizeFlags.HORIZONTAL);
|
||||
// this._window.unmaximize(Meta.MaximizeFlags.VERTICAL);
|
||||
// this._window.unmaximize(Meta.MaximizeFlags.BOTH);
|
||||
//
|
||||
// let windowActor = this._window.get_compositor_private() as Clutter.Actor;
|
||||
// if (!windowActor) return;
|
||||
// windowActor.remove_all_transitions();
|
||||
//
|
||||
// this._window.move_frame(true, x, y);
|
||||
// this._window.move_resize_frame(true, x, y, width, height);
|
||||
|
||||
|
||||
}
|
||||
|
||||
function getUsableMonitorSpace(window: Meta.Window) {
|
||||
// Get the current workspace
|
||||
const workspace = window.get_workspace();
|
||||
|
||||
// Get the monitor index that this window is on
|
||||
const monitorIndex = window.get_monitor();
|
||||
|
||||
// Get the work area
|
||||
const workArea = workspace.get_work_area_for_monitor(monitorIndex);
|
||||
|
||||
return {
|
||||
x: workArea.x,
|
||||
y: workArea.y,
|
||||
width: workArea.width,
|
||||
height: workArea.height
|
||||
};
|
||||
}
|
@@ -1,262 +0,0 @@
|
||||
import Meta from "gi://Meta";
|
||||
|
||||
import {WindowWrapper} from './window.js';
|
||||
import Mtk from "@girs/mtk-16";
|
||||
import {Logger} from "./utils/logger.js";
|
||||
import MonitorManager from "./monitor.js";
|
||||
|
||||
|
||||
export interface IWindowManager {
|
||||
_activeWindowId: number | null;
|
||||
|
||||
// addWindow(window: Meta.Window): void;
|
||||
|
||||
handleWindowClosed(windowId: WindowWrapper): void;
|
||||
|
||||
_tileMonitors(): void;
|
||||
|
||||
// removeFromTree(window: Meta.Window): void;
|
||||
syncActiveWindow(): number | null;
|
||||
}
|
||||
|
||||
const _UNUSED_MONITOR_ID = -1
|
||||
export default class WindowManager implements IWindowManager {
|
||||
_displaySignals: number[];
|
||||
_activeWindowId: number | null;
|
||||
_grabbedWindowMonitor: number;
|
||||
_monitors: Map<number, MonitorManager>;
|
||||
|
||||
constructor() {
|
||||
this._displaySignals = [];
|
||||
this._activeWindowId = null;
|
||||
this._grabbedWindowMonitor = _UNUSED_MONITOR_ID;
|
||||
this._monitors = new Map<number, MonitorManager>();
|
||||
}
|
||||
|
||||
public enable(): void {
|
||||
Logger.log("Starting Aerospike Window Manager");
|
||||
this.captureExistingWindows();
|
||||
// Connect window signals
|
||||
this.instantiateDisplaySignals()
|
||||
|
||||
const mon_count = global.display.get_n_monitors();
|
||||
for (let i = 0; i < mon_count; i++) {
|
||||
this._monitors.set(i, new MonitorManager(i));
|
||||
}
|
||||
}
|
||||
|
||||
public disable(): void {
|
||||
Logger.log("DISABLED AEROSPIKE WINDOW MANAGER!")
|
||||
// Disconnect the focus signal and remove any existing borders
|
||||
this.disconnectDisplaySignals();
|
||||
}
|
||||
|
||||
|
||||
instantiateDisplaySignals(): void {
|
||||
this._displaySignals.push(
|
||||
global.display.connect("grab-op-begin", (display, window, op) => {
|
||||
this.handleGrabOpBegin(display, window, op)
|
||||
}),
|
||||
global.display.connect("grab-op-end", (display, window, op) => {
|
||||
this.handleGrabOpEnd(display, window, op)
|
||||
}),
|
||||
global.display.connect("window-entered-monitor", (display, monitor, window) => {
|
||||
Logger.log("WINDOW HAS ENTERED NEW MONITOR!")
|
||||
}),
|
||||
global.display.connect('window-created', (display, window) => {
|
||||
this.handleWindowCreated(display, window);
|
||||
}),
|
||||
global.display.connect("showing-desktop-changed", () => {
|
||||
Logger.log("SHOWING DESKTOP CHANGED");
|
||||
}),
|
||||
global.display.connect("workareas-changed", () => {
|
||||
Logger.log("WORK AREAS CHANGED");
|
||||
}),
|
||||
global.display.connect("in-fullscreen-changed", () => {
|
||||
Logger.log("IN FULL SCREEN CHANGED");
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
disconnectDisplaySignals(): void {
|
||||
this._displaySignals.forEach((signal) => {
|
||||
global.disconnect(signal)
|
||||
})
|
||||
}
|
||||
|
||||
handleGrabOpBegin(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
||||
Logger.log("Grab Op Start");
|
||||
Logger.log(display, window, op)
|
||||
Logger.log(window.get_monitor())
|
||||
this._grabbedWindowMonitor = window.get_monitor();
|
||||
}
|
||||
|
||||
handleGrabOpEnd(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
||||
Logger.log("Grab Op End ", op);
|
||||
Logger.log("primary display", display.get_primary_monitor())
|
||||
var rect = window.get_frame_rect()
|
||||
Logger.info("Release Location", window.get_monitor(), rect.x, rect.y, rect.width, rect.height)
|
||||
this._tileMonitors();
|
||||
const old_mon_id = this._grabbedWindowMonitor;
|
||||
const new_mon_id = window.get_monitor();
|
||||
|
||||
Logger.info("MONITOR MATCH", old_mon_id !== new_mon_id);
|
||||
if (old_mon_id !== new_mon_id) {
|
||||
Logger.trace("MOVING MONITOR");
|
||||
let old_mon = this._monitors.get(old_mon_id);
|
||||
let new_mon = this._monitors.get(new_mon_id);
|
||||
if (old_mon === undefined || new_mon === undefined) {
|
||||
return;
|
||||
}
|
||||
let wrapped = old_mon.getWindow(window.get_id())
|
||||
if (wrapped === undefined) {
|
||||
wrapped = new WindowWrapper(window)
|
||||
} else {
|
||||
old_mon.removeWindow(window.get_id())
|
||||
}
|
||||
new_mon.addWindow(wrapped)
|
||||
}
|
||||
Logger.info("monitor_start and monitor_end", this._grabbedWindowMonitor, window.get_monitor());
|
||||
}
|
||||
|
||||
public captureExistingWindows() {
|
||||
Logger.log("CAPTURING WINDOWS")
|
||||
const workspace = global.workspace_manager.get_active_workspace();
|
||||
const windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
|
||||
Logger.log("WINDOWS", windows);
|
||||
windows.forEach(window => {
|
||||
if (this._isWindowTileable(window)) {
|
||||
this.addWindowToMonitor(window);
|
||||
}
|
||||
});
|
||||
|
||||
this._tileMonitors();
|
||||
}
|
||||
|
||||
|
||||
handleWindowCreated(display: Meta.Display, window: Meta.Window) {
|
||||
Logger.log("WINDOW CREATED ON DISPLAY", window, display);
|
||||
if (!this._isWindowTileable(window)) {
|
||||
return;
|
||||
}
|
||||
Logger.log("WINDOW IS TILABLE");
|
||||
const actor = window.get_compositor_private();
|
||||
if (!actor) {
|
||||
return;
|
||||
}
|
||||
this.addWindowToMonitor(window);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Handle window closed event
|
||||
*/
|
||||
handleWindowClosed(window: WindowWrapper): void {
|
||||
|
||||
window.disconnectWindowSignals()
|
||||
const mon_id = window._window.get_monitor();
|
||||
this._monitors.get(mon_id)?.removeWindow(window.getWindowId());
|
||||
|
||||
// Remove from managed windows
|
||||
this.syncActiveWindow();
|
||||
// Retile remaining windows
|
||||
this._tileMonitors();
|
||||
}
|
||||
|
||||
|
||||
public addWindowToMonitor(window: Meta.Window) {
|
||||
|
||||
var wrapper = new WindowWrapper(window)
|
||||
wrapper.connectWindowSignals(this)
|
||||
this._monitors.get(window.get_monitor())?.addWindow(wrapper)
|
||||
}
|
||||
|
||||
// public UnmanageWindow(window: Meta.Window) {
|
||||
// this._windows.delete(window.get_id());
|
||||
// this._unmanagedWindows.add(window.get_id())
|
||||
// }
|
||||
//
|
||||
// public ManageWindow(window: Meta.Window) {
|
||||
// this._windows.set(window.get_id(), {
|
||||
// window,
|
||||
// })
|
||||
// }
|
||||
|
||||
_tileMonitors(): void {
|
||||
for (const monitor of this._monitors.values()) {
|
||||
monitor._tileWindows()
|
||||
}
|
||||
}
|
||||
|
||||
_isWindowTileable(window: Meta.Window) {
|
||||
if (!window || !window.get_compositor_private()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const windowType = window.get_window_type();
|
||||
Logger.log("WINDOW TYPE", windowType);
|
||||
// Skip certain types of windows
|
||||
return !window.is_skip_taskbar() &&
|
||||
windowType !== Meta.WindowType.DESKTOP &&
|
||||
windowType !== Meta.WindowType.DOCK &&
|
||||
windowType !== Meta.WindowType.DIALOG &&
|
||||
windowType !== Meta.WindowType.MODAL_DIALOG &&
|
||||
windowType !== Meta.WindowType.UTILITY &&
|
||||
windowType !== Meta.WindowType.MENU;
|
||||
}
|
||||
|
||||
/**
|
||||
* Synchronizes the active window with GNOME's currently active window
|
||||
*
|
||||
* This function queries GNOME Shell for the current focused window and
|
||||
* updates the extension's active window tracking to match.
|
||||
*
|
||||
* @returns The window ID of the active window, or null if no window is active
|
||||
*/
|
||||
public syncActiveWindow(): number | null {
|
||||
// // Get the active workspace
|
||||
// const workspace = global.workspace_manager.get_active_workspace();
|
||||
//
|
||||
// // Check if there is an active window
|
||||
// const activeWindow = global.display.get_focus_window();
|
||||
//
|
||||
// if (!activeWindow) {
|
||||
// Logger.log("No active window found in GNOME");
|
||||
// this._activeWindowId = null;
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// // Get the window ID
|
||||
// const windowId = activeWindow.get_id();
|
||||
//
|
||||
// // Check if this window is being managed by our extension
|
||||
// if (this._windows.has(windowId)) {
|
||||
// Logger.log(`Setting active window to ${windowId}`);
|
||||
// this._activeWindowId = windowId;
|
||||
// return windowId;
|
||||
// } else {
|
||||
// Logger.log(`Window ${windowId} is not managed by this extension`);
|
||||
//
|
||||
// // Try to find a managed window on the current workspace to make active
|
||||
// const managedWindows = Array.from(this._windows.entries())
|
||||
// .filter(([_, wrapper]) =>
|
||||
// wrapper.window && wrapper.window.get_workspace() === workspace);
|
||||
//
|
||||
// if (managedWindows.length > 0) {
|
||||
// // Take the first managed window on this workspace
|
||||
// const firstWindowId = managedWindows[0][0];
|
||||
// Logger.log(`Using managed window ${firstWindowId} as active instead`);
|
||||
// this._activeWindowId = firstWindowId;
|
||||
// return firstWindowId;
|
||||
// }
|
||||
//
|
||||
// // No managed windows on this workspace
|
||||
// Logger.log("No managed windows found on the active workspace");
|
||||
// this._activeWindowId = null;
|
||||
// return null;
|
||||
// }
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
205
src/wm/container.ts
Normal file
205
src/wm/container.ts
Normal file
@@ -0,0 +1,205 @@
|
||||
import {WindowWrapper} from "./window.js";
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import Meta from "gi://Meta";
|
||||
import queueEvent from "../utils/events.js";
|
||||
import {Rect} from "../utils/rect.js";
|
||||
|
||||
enum Orientation {
|
||||
HORIZONTAL = 0,
|
||||
VERTICAL = 1,
|
||||
}
|
||||
|
||||
|
||||
export default class WindowContainer {
|
||||
|
||||
_tiledItems: (WindowWrapper | WindowContainer)[];
|
||||
_tiledWindowLookup: Map<number, WindowWrapper>;
|
||||
_orientation: Orientation = Orientation.HORIZONTAL;
|
||||
_workArea: Rect;
|
||||
|
||||
constructor(workspaceArea: Rect,) {
|
||||
// this._id = monitorId;
|
||||
this._tiledItems = [];
|
||||
this._tiledWindowLookup = new Map<number, WindowWrapper>();
|
||||
this._workArea = workspaceArea;
|
||||
}
|
||||
|
||||
|
||||
move(rect: Rect): void {
|
||||
this._workArea = rect;
|
||||
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: () => {
|
||||
this.tileWindows();
|
||||
}
|
||||
}, 100)
|
||||
|
||||
}
|
||||
|
||||
getWindow(win_id: number): WindowWrapper | undefined {
|
||||
if (this._tiledWindowLookup.has(win_id)) {
|
||||
return this._tiledWindowLookup.get(win_id);
|
||||
}
|
||||
for (const item of this._tiledItems) {
|
||||
if (item instanceof WindowContainer) {
|
||||
const win = item.getWindow(win_id);
|
||||
if (win) {
|
||||
return win;
|
||||
}
|
||||
} else if (item.getWindowId() === win_id) {
|
||||
return item;
|
||||
}
|
||||
}
|
||||
return undefined
|
||||
}
|
||||
|
||||
_getIndexOfWindow(win_id: number) {
|
||||
for (let i = 0; i < this._tiledItems.length; i++) {
|
||||
const item = this._tiledItems[i];
|
||||
if (item instanceof WindowWrapper && item.getWindowId() === win_id) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
removeWindow(win_id: number): void {
|
||||
if (this._tiledWindowLookup.has(win_id)) {
|
||||
this._tiledWindowLookup.delete(win_id);
|
||||
const index = this._getIndexOfWindow(win_id)
|
||||
this._tiledItems.splice(index, 1);
|
||||
} else {
|
||||
for (const item of this._tiledItems) {
|
||||
if (item instanceof WindowContainer) {
|
||||
item.removeWindow(win_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
this.tileWindows()
|
||||
}
|
||||
|
||||
disconnectSignals(): void {
|
||||
this._tiledItems.forEach((item) => {
|
||||
if (item instanceof WindowContainer) {
|
||||
item.disconnectSignals()
|
||||
} else {
|
||||
item.disconnectWindowSignals();
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
removeAllWindows(): void {
|
||||
this._tiledItems = []
|
||||
this._tiledWindowLookup.clear()
|
||||
}
|
||||
|
||||
tileWindows() {
|
||||
Logger.log("TILING WINDOWS IN CONTAINER")
|
||||
|
||||
Logger.log("WorkArea", this._workArea);
|
||||
|
||||
// Get all windows for current workspaceArea
|
||||
this._tileItems()
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
_tileItems() {
|
||||
if (this._tiledItems.length === 0) {
|
||||
return;
|
||||
}
|
||||
const bounds = this.getBounds();
|
||||
this._tiledItems.forEach((item, index) => {
|
||||
const rect = bounds[index];
|
||||
if (item instanceof WindowContainer) {
|
||||
item.move(rect);
|
||||
} else {
|
||||
item.safelyResizeWindow(rect);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
getBounds(): Rect[] {
|
||||
if (this._orientation === Orientation.HORIZONTAL) {
|
||||
return this.getHorizontalBounds();
|
||||
}
|
||||
return this.getVerticalBounds();
|
||||
}
|
||||
|
||||
getVerticalBounds(): Rect[] {
|
||||
const items = this._tiledItems
|
||||
const containerHeight = Math.floor(this._workArea.height / items.length);
|
||||
return items.map((_, index) => {
|
||||
const y = this._workArea.y + (index * containerHeight);
|
||||
return {
|
||||
x: this._workArea.x,
|
||||
y: y,
|
||||
width: this._workArea.width,
|
||||
height: containerHeight
|
||||
} as Rect;
|
||||
});
|
||||
}
|
||||
|
||||
getHorizontalBounds(): Rect[] {
|
||||
const windowWidth = Math.floor(this._workArea.width / this._tiledItems.length);
|
||||
|
||||
return this._tiledItems.map((_, index) => {
|
||||
const x = this._workArea.x + (index * windowWidth);
|
||||
return {
|
||||
x: x,
|
||||
y: this._workArea.y,
|
||||
width: windowWidth,
|
||||
height: this._workArea.height
|
||||
} as Rect;
|
||||
});
|
||||
}
|
||||
|
||||
getIndexOfItemNested(item: WindowWrapper): number {
|
||||
for (let i = 0; i < this._tiledItems.length; i++) {
|
||||
const container = this._tiledItems[i];
|
||||
if (container instanceof WindowContainer) {
|
||||
const index = container.getIndexOfItemNested(item);
|
||||
if (index !== -1) {
|
||||
return i;
|
||||
}
|
||||
} else if (container.getWindowId() === item.getWindowId()) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
// TODO: update this to work with nested containers - all other logic should already be working
|
||||
itemDragged(item: WindowWrapper, x: number, y: number): void {
|
||||
let original_index = this.getIndexOfItemNested(item);
|
||||
|
||||
if (original_index === -1) {
|
||||
Logger.error("Item not found in container during drag op", item.getWindowId());
|
||||
return;
|
||||
}
|
||||
let new_index = this.getIndexOfItemNested(item);
|
||||
this.getBounds().forEach((rect, index) => {
|
||||
if (rect.x < x && rect.x + rect.width > x && rect.y < y && rect.y + rect.height > y) {
|
||||
new_index = index;
|
||||
}
|
||||
})
|
||||
if (original_index !== new_index) {
|
||||
this._tiledItems.splice(original_index, 1);
|
||||
this._tiledItems.splice(new_index, 0, item);
|
||||
this.tileWindows()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
86
src/wm/monitor.ts
Normal file
86
src/wm/monitor.ts
Normal file
@@ -0,0 +1,86 @@
|
||||
import {WindowWrapper} from "./window.js";
|
||||
import {Rect} from "../utils/rect.js";
|
||||
import queueEvent from "../utils/events.js";
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import Meta from "gi://Meta";
|
||||
import Mtk from "@girs/mtk-16";
|
||||
|
||||
import WindowContainer from "./container.js";
|
||||
import Window = Meta.Window;
|
||||
|
||||
export default class Monitor {
|
||||
|
||||
_id: number;
|
||||
_workArea: Rect;
|
||||
_workspaces: WindowContainer[] = [];
|
||||
|
||||
constructor(monitorId: number) {
|
||||
this._id = monitorId;
|
||||
const workspace = global.workspace_manager.get_active_workspace();
|
||||
this._workArea = workspace.get_work_area_for_monitor(this._id);
|
||||
Logger.log("CREATING MONITOR", monitorId);
|
||||
Logger.log("WorkArea", this._workArea.x, this._workArea.y, this._workArea.width, this._workArea.height);
|
||||
const workspaceCount = global.workspace_manager.get_n_workspaces()
|
||||
Logger.log("Workspace Count", workspaceCount);
|
||||
for (let i = 0; i < workspaceCount; i++) {
|
||||
this._workspaces.push(new WindowContainer(this._workArea));
|
||||
}
|
||||
}
|
||||
|
||||
disconnectSignals() {
|
||||
for (const container of this._workspaces) {
|
||||
container.disconnectSignals();
|
||||
}
|
||||
}
|
||||
|
||||
removeAllWindows(): void {
|
||||
for (const container of this._workspaces) {
|
||||
container.removeAllWindows();
|
||||
}
|
||||
}
|
||||
|
||||
getWindow(windowId: number): WindowWrapper | undefined {
|
||||
for (const container of this._workspaces) {
|
||||
const win = container.getWindow(windowId);
|
||||
if (win) {
|
||||
return win;
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
removeWindow(winWrap: WindowWrapper) {
|
||||
const windowId = winWrap.getWindowId();
|
||||
for (const container of this._workspaces) {
|
||||
const win = container.getWindow(windowId);
|
||||
if (win) {
|
||||
container.removeWindow(windowId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
addWindow(winWrap: WindowWrapper) {
|
||||
const window_workspace = winWrap.getWindow().get_workspace().index();
|
||||
this._workspaces[window_workspace].addWindow(winWrap);
|
||||
}
|
||||
|
||||
tileWindows(): void {
|
||||
this._workArea = global.workspace_manager.get_active_workspace().get_work_area_for_monitor(this._id);
|
||||
const activeWorkspace = global.workspace_manager.get_active_workspace();
|
||||
this._workspaces[activeWorkspace.index()].move(this._workArea);
|
||||
this._workspaces[activeWorkspace.index()].tileWindows()
|
||||
}
|
||||
|
||||
removeWorkspace(workspaceId: number): void {
|
||||
this._workspaces.splice(workspaceId, 1);
|
||||
}
|
||||
|
||||
addWorkspace(): void {
|
||||
this._workspaces.push(new WindowContainer(this._workArea));
|
||||
}
|
||||
|
||||
itemDragged(item: WindowWrapper, x: number, y: number): void {
|
||||
this._workspaces[item.getWorkspace()].itemDragged(item, x, y);
|
||||
}
|
||||
|
||||
}
|
148
src/wm/window.ts
Normal file
148
src/wm/window.ts
Normal file
@@ -0,0 +1,148 @@
|
||||
import Meta from 'gi://Meta';
|
||||
import Clutter from "gi://Clutter";
|
||||
import {IWindowManager} from "./windowManager.js";
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import {Rect} from "../utils/rect.js";
|
||||
import WindowContainer from "./container.js";
|
||||
|
||||
|
||||
type WindowMinimizedHandler = (window: WindowWrapper) => void;
|
||||
type WindowWorkspaceChangedHandler = (window: WindowWrapper) => void;
|
||||
|
||||
export class WindowWrapper {
|
||||
readonly _window: Meta.Window;
|
||||
readonly _windowMinimizedHandler: WindowMinimizedHandler;
|
||||
readonly _signals: number[] = [];
|
||||
_parent: WindowContainer | null = null;
|
||||
_dragging: boolean = false;
|
||||
|
||||
constructor(
|
||||
window: Meta.Window,
|
||||
winMinimized: WindowMinimizedHandler
|
||||
) {
|
||||
this._window = window;
|
||||
this._windowMinimizedHandler = winMinimized;
|
||||
}
|
||||
|
||||
getWindow(): Meta.Window {
|
||||
return this._window;
|
||||
}
|
||||
|
||||
getWindowId(): number {
|
||||
return this._window.get_id();
|
||||
}
|
||||
|
||||
getWorkspace(): number {
|
||||
return this._window.get_workspace().index();
|
||||
}
|
||||
|
||||
getMonitor(): number {
|
||||
return this._window.get_monitor();
|
||||
}
|
||||
|
||||
getRect(): Rect {
|
||||
return this._window.get_frame_rect();
|
||||
}
|
||||
|
||||
startDragging(): void {
|
||||
this._dragging = true;
|
||||
}
|
||||
stopDragging(): void {
|
||||
Logger.log("STOPPED DRAGGING")
|
||||
this._dragging = false;
|
||||
}
|
||||
|
||||
// setParent(parent: WindowContainer): void {
|
||||
// this._parent = parent;
|
||||
// }
|
||||
//
|
||||
// getParent(): WindowContainer | null {
|
||||
// if (this._parent == null) {
|
||||
// Logger.warn(`Attempting to get parent for window without parent ${JSON.stringify(this)}`);
|
||||
// }
|
||||
// return this._parent
|
||||
// }
|
||||
|
||||
connectWindowSignals(
|
||||
windowManager: IWindowManager,
|
||||
): void {
|
||||
const windowId = this._window.get_id()
|
||||
// Handle window destruction
|
||||
this._signals.push(
|
||||
this._window.connect('unmanaging', window => {
|
||||
Logger.log("REMOVING WINDOW", windowId);
|
||||
windowManager.handleWindowClosed(this)
|
||||
}),
|
||||
this._window.connect('notify::minimized', (we) => {
|
||||
if (this._window.minimized) {
|
||||
Logger.log(`Window minimized: ${windowId}`);
|
||||
windowManager.handleWindowMinimized(this);
|
||||
|
||||
} else if (!this._window.minimized) {
|
||||
Logger.log(`Window unminimized: ${windowId}`);
|
||||
windowManager.handleWindowUnminimized(this);
|
||||
|
||||
}
|
||||
}),
|
||||
this._window.connect('notify::has-focus', () => {
|
||||
if (this._window.has_focus()) {
|
||||
windowManager._activeWindowId = windowId;
|
||||
}
|
||||
}),
|
||||
this._window.connect('notify::maximized-horizontally', () => {
|
||||
if (this._window.get_maximized()) {
|
||||
Logger.log(`Window maximized: ${windowId}`);
|
||||
} else {
|
||||
Logger.log(`Window unmaximized: ${windowId}`);
|
||||
}
|
||||
}),
|
||||
this._window.connect("workspace-changed", (_metaWindow) => {
|
||||
Logger.log("WORKSPACE CHANGED FOR WINDOW", this._window.get_id());
|
||||
windowManager.handleWindowChangedWorkspace(this);
|
||||
}),
|
||||
this._window.connect("position-changed", (_metaWindow) => {
|
||||
windowManager.handleWindowPositionChanged(this);
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
disconnectWindowSignals(): void {
|
||||
|
||||
if (this._signals) {
|
||||
this._signals.forEach(signal => {
|
||||
try {
|
||||
if (this._window != null) {
|
||||
this._window.disconnect(signal);
|
||||
}
|
||||
} catch (e) {
|
||||
Logger.warn("error disconnecting signal", signal, e);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
safelyResizeWindow(rect: Rect): void {
|
||||
// Keep minimal logging
|
||||
if (this._dragging) {
|
||||
Logger.info("STOPPED RESIZE BECAUSE ITEM IS BEING DRAGGED")
|
||||
return;
|
||||
}
|
||||
Logger.log("SAFELY RESIZE", rect.x, rect.y, rect.width, rect.height);
|
||||
const actor = this._window.get_compositor_private();
|
||||
|
||||
if (!actor) {
|
||||
Logger.log("No actor available, can't resize safely yet");
|
||||
return;
|
||||
}
|
||||
let windowActor = this._window.get_compositor_private() as Clutter.Actor;
|
||||
if (!windowActor) return;
|
||||
windowActor.remove_all_transitions();
|
||||
Logger.info("MOVING")
|
||||
this._window.move_frame(true, rect.x, rect.y);
|
||||
Logger.info("RESIZING MOVING")
|
||||
this._window.move_resize_frame(true, rect.x, rect.y, rect.width, rect.height);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
429
src/wm/windowManager.ts
Normal file
429
src/wm/windowManager.ts
Normal file
@@ -0,0 +1,429 @@
|
||||
import Meta from "gi://Meta";
|
||||
// import Gio from "gi://Gio";
|
||||
// import GLib from "gi://GLib";
|
||||
|
||||
import {WindowWrapper} from './window.js';
|
||||
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";
|
||||
|
||||
|
||||
export interface IWindowManager {
|
||||
_activeWindowId: number | null;
|
||||
|
||||
// addWindow(window: Meta.Window): void;
|
||||
|
||||
handleWindowClosed(winWrap: WindowWrapper): void;
|
||||
|
||||
handleWindowMinimized(winWrap: WindowWrapper): void;
|
||||
|
||||
handleWindowUnminimized(winWrap: WindowWrapper): void;
|
||||
|
||||
handleWindowChangedWorkspace(winWrap: WindowWrapper): void;
|
||||
|
||||
handleWindowPositionChanged(winWrap: WindowWrapper): void;
|
||||
|
||||
syncActiveWindow(): number | null;
|
||||
}
|
||||
|
||||
|
||||
const _UNUSED_MONITOR_ID = -1
|
||||
const _UNUSED_WINDOW_ID = -1
|
||||
|
||||
export default class WindowManager implements IWindowManager {
|
||||
_displaySignals: number[] = [];
|
||||
_windowManagerSignals: number[] = [];
|
||||
_workspaceManagerSignals: number[] = [];
|
||||
_overviewSignals: number[] = [];
|
||||
|
||||
_activeWindowId: number | null = null;
|
||||
_monitors: Map<number, Monitor> = new Map<number, Monitor>();
|
||||
|
||||
_minimizedItems: Map<number, WindowWrapper> = new Map<number, WindowWrapper>();
|
||||
|
||||
_grabbedWindowMonitor: number = _UNUSED_MONITOR_ID;
|
||||
_grabbedWindowId: number = _UNUSED_WINDOW_ID;
|
||||
_changingGrabbedMonitor: boolean = false;
|
||||
|
||||
_showingOverview: boolean = false;
|
||||
|
||||
constructor() {
|
||||
|
||||
|
||||
}
|
||||
|
||||
public enable(): void {
|
||||
Logger.log("Starting Aerospike Window Manager");
|
||||
// Connect window signals
|
||||
this.instantiateDisplaySignals();
|
||||
|
||||
const mon_count = global.display.get_n_monitors();
|
||||
for (let i = 0; i < mon_count; i++) {
|
||||
this._monitors.set(i, new Monitor(i));
|
||||
}
|
||||
|
||||
this.captureExistingWindows();
|
||||
}
|
||||
|
||||
instantiateDisplaySignals(): void {
|
||||
this._displaySignals.push(
|
||||
global.display.connect("grab-op-begin", (display, window, op) => {
|
||||
this.handleGrabOpBegin(display, window, op)
|
||||
}),
|
||||
global.display.connect("grab-op-end", (display, window, op) => {
|
||||
this.handleGrabOpEnd(display, window, op)
|
||||
}),
|
||||
global.display.connect("window-entered-monitor", (display, monitor, window) => {
|
||||
Logger.log("WINDOW HAS ENTERED NEW MONITOR!")
|
||||
if (this._showingOverview) {
|
||||
if (this._getWrappedWindow(window) !== undefined) {
|
||||
Logger.log("OVERVIEW - MOVING")
|
||||
this._moveWindowToMonitor(window, monitor)
|
||||
}
|
||||
}
|
||||
}),
|
||||
global.display.connect('window-created', (display, window) => {
|
||||
this.handleWindowCreated(display, window);
|
||||
}),
|
||||
|
||||
global.display.connect("showing-desktop-changed", () => {
|
||||
Logger.log("SHOWING DESKTOP CHANGED");
|
||||
}),
|
||||
global.display.connect("workareas-changed", (display) => {
|
||||
Logger.log("WORK AREAS CHANGED",);
|
||||
console.log(display.get_workspace_manager().get_active_workspace_index())
|
||||
}),
|
||||
global.display.connect("in-fullscreen-changed", () => {
|
||||
Logger.log("IN FULL SCREEN CHANGED");
|
||||
}),
|
||||
)
|
||||
|
||||
// this._windowManagerSignals = [
|
||||
// global.window_manager.connect("show-tile-preview", (_, _metaWindow, _rect, _num) => {
|
||||
// Logger.log("SHOW TITLE PREVIEW!")
|
||||
// }),
|
||||
// ];
|
||||
|
||||
this._workspaceManagerSignals = [
|
||||
global.workspace_manager.connect("showing-desktop-changed", () => {
|
||||
Logger.log("SHOWING DESKTOP CHANGED AT WORKSPACE LEVEL");
|
||||
}),
|
||||
global.workspace_manager.connect("workspace-added", (_, wsIndex) => {
|
||||
Logger.log("WORKSPACE ADDED", wsIndex);
|
||||
this._monitors.forEach((monitor: Monitor) => {
|
||||
monitor.addWorkspace();
|
||||
})
|
||||
}),
|
||||
global.workspace_manager.connect("workspace-removed", (_, wsIndex) => {
|
||||
Logger.log("WORKSPACE REMOVED", wsIndex);
|
||||
this._monitors.forEach((monitor: Monitor) => {
|
||||
monitor.removeWorkspace(wsIndex);
|
||||
})
|
||||
}),
|
||||
global.workspace_manager.connect("active-workspace-changed", (source) => {
|
||||
Logger.log("Active workspace-changed", source.get_active_workspace().index());
|
||||
}),
|
||||
];
|
||||
|
||||
this._overviewSignals = [
|
||||
Main.overview.connect("hiding", () => {
|
||||
// this.fromOverview = true;
|
||||
Logger.log("HIDING OVERVIEW")
|
||||
this._showingOverview = false;
|
||||
this._tileMonitors();
|
||||
// const eventObj = {
|
||||
// name: "focus-after-overview",
|
||||
// callback: () => {
|
||||
// Logger.log("FOCUSING AFTER OVERVIEW");
|
||||
// },
|
||||
// };
|
||||
// this.queueEvent(eventObj);
|
||||
}),
|
||||
Main.overview.connect("showing", () => {
|
||||
this._showingOverview = true;
|
||||
Logger.log("SHOWING OVERVIEW");
|
||||
}),
|
||||
];
|
||||
|
||||
|
||||
}
|
||||
|
||||
public disable(): void {
|
||||
Logger.log("DISABLED AEROSPIKE WINDOW MANAGER!")
|
||||
// Disconnect the focus signal and remove any existing borders
|
||||
this.disconnectSignals();
|
||||
this.removeAllWindows();
|
||||
}
|
||||
|
||||
removeAllWindows(): void {
|
||||
this._monitors.forEach((monitor: Monitor) => {
|
||||
monitor.removeAllWindows();
|
||||
})
|
||||
this._minimizedItems.clear();
|
||||
}
|
||||
|
||||
|
||||
disconnectSignals(): void {
|
||||
this.disconnectDisplaySignals();
|
||||
this.disconnectMonitorSignals();
|
||||
this.disconnectMinimizedSignals();
|
||||
}
|
||||
|
||||
disconnectMonitorSignals(): void {
|
||||
this._monitors.forEach((monitor: Monitor) => {
|
||||
monitor.disconnectSignals();
|
||||
})
|
||||
}
|
||||
|
||||
disconnectDisplaySignals(): void {
|
||||
this._displaySignals.forEach((signal) => {
|
||||
global.display.disconnect(signal)
|
||||
})
|
||||
this._windowManagerSignals.forEach((signal) => {
|
||||
global.window_manager.disconnect(signal)
|
||||
})
|
||||
this._workspaceManagerSignals.forEach((signal) => {
|
||||
global.workspace_manager.disconnect(signal)
|
||||
})
|
||||
this._overviewSignals.forEach((signal) => {
|
||||
Main.overview.disconnect(signal)
|
||||
})
|
||||
}
|
||||
|
||||
disconnectMinimizedSignals(): void {
|
||||
this._minimizedItems.forEach((item) => {
|
||||
item.disconnectWindowSignals();
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
handleGrabOpBegin(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
||||
if (op === Meta.GrabOp.MOVING_UNCONSTRAINED){
|
||||
|
||||
}
|
||||
Logger.log("Grab Op Start", op);
|
||||
Logger.log(display, window, op)
|
||||
Logger.log(window.get_monitor())
|
||||
this._getWrappedWindow(window)?.startDragging();
|
||||
this._grabbedWindowMonitor = window.get_monitor();
|
||||
this._grabbedWindowId = window.get_id();
|
||||
}
|
||||
|
||||
handleGrabOpEnd(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
||||
Logger.log("Grab Op End ", op);
|
||||
Logger.log("primary display", display.get_primary_monitor())
|
||||
this._grabbedWindowId = _UNUSED_WINDOW_ID;
|
||||
this._getWrappedWindow(window)?.stopDragging();
|
||||
this._tileMonitors();
|
||||
Logger.info("monitor_start and monitor_end", this._grabbedWindowMonitor, window.get_monitor());
|
||||
}
|
||||
|
||||
_getWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
||||
let wrapped = undefined;
|
||||
for (const monitor of this._monitors.values()) {
|
||||
wrapped = monitor.getWindow(window.get_id());
|
||||
if (wrapped !== undefined) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return wrapped;
|
||||
}
|
||||
|
||||
_getAndRemoveWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
||||
let wrapped = undefined;
|
||||
for (const monitor of this._monitors.values()) {
|
||||
wrapped = monitor.getWindow(window.get_id());
|
||||
if (wrapped !== undefined) {
|
||||
monitor.removeWindow(wrapped);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return wrapped;
|
||||
}
|
||||
|
||||
_moveWindowToMonitor(window: Meta.Window, monitorId: number): void {
|
||||
Logger.info("MOVING WINDOW TO MONITOR", window.get_id(), monitorId);
|
||||
let wrapped = this._getAndRemoveWrappedWindow(window);
|
||||
if (wrapped === undefined) {
|
||||
Logger.error("WINDOW NOT DEFINED")
|
||||
wrapped = new WindowWrapper(window, this.handleWindowMinimized);
|
||||
wrapped.connectWindowSignals(this);
|
||||
}
|
||||
|
||||
// wrapped.startDragging()
|
||||
let new_mon = this._monitors.get(monitorId);
|
||||
new_mon?.addWindow(wrapped)
|
||||
Logger.info("UPDATE MONITOR", new_mon);
|
||||
this._grabbedWindowMonitor = monitorId;
|
||||
// wrapped.stopDragging();
|
||||
}
|
||||
|
||||
public handleWindowPositionChanged(winWrap: WindowWrapper): void {
|
||||
if (this._changingGrabbedMonitor) {
|
||||
return;
|
||||
}
|
||||
if (winWrap.getWindowId() === this._grabbedWindowId) {
|
||||
const [mouseX, mouseY, _] = global.get_pointer();
|
||||
|
||||
let monitorIndex = -1;
|
||||
for (let i = 0; i < global.display.get_n_monitors(); i++) {
|
||||
const workArea = global.workspace_manager.get_active_workspace().get_work_area_for_monitor(i);
|
||||
if (mouseX >= workArea.x && mouseX < workArea.x + workArea.width &&
|
||||
mouseY >= workArea.y && mouseY < workArea.y + workArea.height) {
|
||||
monitorIndex = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (monitorIndex === -1) {
|
||||
return
|
||||
}
|
||||
|
||||
if (monitorIndex !== this._grabbedWindowMonitor) {
|
||||
this._changingGrabbedMonitor = true;
|
||||
Logger.log("CHANGING MONITOR FOR WINDOW");
|
||||
this._moveWindowToMonitor(winWrap.getWindow(), monitorIndex);
|
||||
this._changingGrabbedMonitor = false
|
||||
}
|
||||
this._monitors.get(monitorIndex)?.itemDragged(winWrap, mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public handleWindowMinimized(winWrap: WindowWrapper): void {
|
||||
const monitor_id = winWrap.getWindow().get_monitor()
|
||||
this._minimizedItems.set(winWrap.getWindowId(), winWrap);
|
||||
this._monitors.get(monitor_id)?.removeWindow(winWrap);
|
||||
this._tileMonitors()
|
||||
}
|
||||
|
||||
public handleWindowUnminimized(winWrap: WindowWrapper): void {
|
||||
this._minimizedItems.delete(winWrap.getWindowId());
|
||||
this._addWindowWrapperToMonitor(winWrap);
|
||||
this._tileMonitors()
|
||||
}
|
||||
|
||||
|
||||
public handleWindowChangedWorkspace(winWrap: WindowWrapper): void {
|
||||
const monitor = winWrap.getWindow().get_monitor();
|
||||
this._monitors.get(monitor)?.removeWindow(winWrap);
|
||||
this._monitors.get(monitor)?.addWindow(winWrap);
|
||||
}
|
||||
|
||||
public captureExistingWindows() {
|
||||
const workspace = global.workspace_manager.get_active_workspace();
|
||||
const windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
|
||||
windows.forEach(window => {
|
||||
if (this._isWindowTileable(window)) {
|
||||
this.addWindowToMonitor(window);
|
||||
}
|
||||
});
|
||||
|
||||
this._tileMonitors();
|
||||
}
|
||||
|
||||
|
||||
handleWindowCreated(display: Meta.Display, window: Meta.Window) {
|
||||
Logger.log("WINDOW CREATED ON DISPLAY", window, display);
|
||||
if (!this._isWindowTileable(window)) {
|
||||
return;
|
||||
}
|
||||
Logger.log("WINDOW IS TILABLE");
|
||||
this.addWindowToMonitor(window);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Handle window closed event
|
||||
*/
|
||||
handleWindowClosed(window: WindowWrapper): void {
|
||||
|
||||
const mon_id = window._window.get_monitor();
|
||||
|
||||
this._monitors.get(mon_id)?.removeWindow(window);
|
||||
|
||||
window.disconnectWindowSignals()
|
||||
// Remove from managed windows
|
||||
this.syncActiveWindow();
|
||||
// Retile remaining windows
|
||||
this._tileMonitors();
|
||||
}
|
||||
|
||||
|
||||
public addWindowToMonitor(window: Meta.Window) {
|
||||
|
||||
Logger.log("ADDING WINDOW TO MONITOR", window, window);
|
||||
var wrapper = new WindowWrapper(window, this.handleWindowMinimized)
|
||||
wrapper.connectWindowSignals(this);
|
||||
this._addWindowWrapperToMonitor(wrapper);
|
||||
|
||||
}
|
||||
|
||||
_addWindowWrapperToMonitor(winWrap: WindowWrapper) {
|
||||
if (winWrap.getWindow().minimized) {
|
||||
this._minimizedItems.set(winWrap.getWindow().get_id(), winWrap);
|
||||
} else {
|
||||
this._monitors.get(winWrap.getWindow().get_monitor())?.addWindow(winWrap)
|
||||
}
|
||||
}
|
||||
|
||||
_tileMonitors(): void {
|
||||
|
||||
for (const monitor of this._monitors.values()) {
|
||||
monitor.tileWindows()
|
||||
}
|
||||
}
|
||||
|
||||
block_titles = [
|
||||
"org.gnome.Shell.Extensions",
|
||||
]
|
||||
|
||||
_isWindowTilingBlocked(window: Meta.Window) : boolean {
|
||||
Logger.info("title", window.get_title());
|
||||
Logger.info("description", window.get_description());
|
||||
Logger.info("class", window.get_wm_class());
|
||||
Logger.info("class", window.get_wm_class_instance());
|
||||
return this.block_titles.some((title) => {
|
||||
if (window.get_title() === title) {
|
||||
Logger.log("WINDOW BLOCKED FROM TILING", window.get_title());
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
_isWindowTileable(window: Meta.Window) {
|
||||
|
||||
if (!window || !window.get_compositor_private()) {
|
||||
return false;
|
||||
}
|
||||
if (this._isWindowTilingBlocked(window)) {
|
||||
return false;
|
||||
}
|
||||
const windowType = window.get_window_type();
|
||||
Logger.log("WINDOW TILING CHECK",);
|
||||
|
||||
// Skip certain types of windows
|
||||
return !window.is_skip_taskbar() &&
|
||||
windowType !== Meta.WindowType.DESKTOP &&
|
||||
windowType !== Meta.WindowType.DOCK &&
|
||||
windowType !== Meta.WindowType.DIALOG &&
|
||||
windowType !== Meta.WindowType.MODAL_DIALOG &&
|
||||
windowType !== Meta.WindowType.UTILITY &&
|
||||
windowType !== Meta.WindowType.MENU;
|
||||
}
|
||||
|
||||
/**
|
||||
* Synchronizes the active window with GNOME's currently active window
|
||||
*
|
||||
* This function queries GNOME Shell for the current focused window and
|
||||
* updates the extension's active window tracking to match.
|
||||
*
|
||||
* @returns The window ID of the active window, or null if no window is active
|
||||
*/
|
||||
public syncActiveWindow(): number | null {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
Reference in New Issue
Block a user