diff --git a/extension.ts b/extension.ts index c02cc27..4af617d 100644 --- a/extension.ts +++ b/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 { diff --git a/package.json b/package.json index a0c1c6a..f3e27d5 100644 --- a/package.json +++ b/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" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index acc2036..8553d9a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -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: diff --git a/src/workspace.ts b/src/prefs/keybindings.ts similarity index 100% rename from src/workspace.ts rename to src/prefs/keybindings.ts diff --git a/src/prefs/prefs.ts b/src/prefs/prefs.ts index 57dbcf0..b0cebb1 100644 --- a/src/prefs/prefs.ts +++ b/src/prefs/prefs.ts @@ -3,6 +3,7 @@ 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"; export default class MyExtensionPreferences extends ExtensionPreferences { async fillPreferencesWindow(window: Adw.PreferencesWindow) { @@ -153,37 +154,7 @@ export default class MyExtensionPreferences extends ExtensionPreferences { 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; - } - - // 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(); diff --git a/src/container.ts b/src/wm/container.ts similarity index 97% rename from src/container.ts rename to src/wm/container.ts index 3ba35cf..719c247 100644 --- a/src/container.ts +++ b/src/wm/container.ts @@ -1,8 +1,8 @@ import {WindowWrapper} from "./window.js"; -import {Logger} from "./utils/logger.js"; +import {Logger} from "../utils/logger.js"; import Meta from "gi://Meta"; -import queueEvent from "./utils/events.js"; -import {Rect} from "./utils/rect.js"; +import queueEvent from "../utils/events.js"; +import {Rect} from "../utils/rect.js"; enum Orientation { HORIZONTAL = 0, @@ -34,6 +34,7 @@ export default class WindowContainer { // Add window to managed windows this._tiledItems.push(winWrap); this._tiledWindowLookup.set(winWrap.getWindowId(), winWrap); + winWrap.setParent(this); queueEvent({ name: "tiling-windows", callback: () => { diff --git a/src/monitor.ts b/src/wm/monitor.ts similarity index 95% rename from src/monitor.ts rename to src/wm/monitor.ts index a676efd..1a05a16 100644 --- a/src/monitor.ts +++ b/src/wm/monitor.ts @@ -1,7 +1,7 @@ import {WindowWrapper} from "./window.js"; -import {Rect} from "./utils/rect.js"; -import queueEvent from "./utils/events.js"; -import {Logger} from "./utils/logger.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"; diff --git a/src/window.ts b/src/wm/window.ts similarity index 89% rename from src/window.ts rename to src/wm/window.ts index 6834141..a9daf03 100644 --- a/src/window.ts +++ b/src/wm/window.ts @@ -1,8 +1,8 @@ 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 {Logger} from "../utils/logger.js"; +import {Rect} from "../utils/rect.js"; import WindowContainer from "./container.js"; @@ -12,15 +12,14 @@ type WindowWorkspaceChangedHandler = (window: WindowWrapper) => void; export class WindowWrapper { readonly _window: Meta.Window; readonly _windowMinimizedHandler: WindowMinimizedHandler; - // readonly _windowWorkspaceChangedHandler: WindowWorkspaceChangedHandler; - readonly _signals: number[]; + readonly _signals: number[] = []; + _parent: WindowContainer | null = null; constructor( window: Meta.Window, winMinimized: WindowMinimizedHandler ) { this._window = window; - this._signals = []; this._windowMinimizedHandler = winMinimized; } @@ -44,6 +43,17 @@ export class WindowWrapper { return this._window.get_frame_rect(); } + 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 { diff --git a/src/windowManager.ts b/src/wm/windowManager.ts similarity index 90% rename from src/windowManager.ts rename to src/wm/windowManager.ts index d2d3a72..573d0ca 100644 --- a/src/windowManager.ts +++ b/src/wm/windowManager.ts @@ -1,14 +1,11 @@ import Meta from "gi://Meta"; -import Gio from "gi://Gio"; -import GLib from "gi://GLib"; +// 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 WindowContainer from "./container.js"; -import {MessageTray} from "@girs/gnome-shell/ui/messageTray"; -import queueEvent, {QueuedEvent} from "./utils/events.js"; +// import Mtk from "@girs/mtk-16"; +import {Logger} from "../utils/logger.js"; import Monitor from "./monitor.js"; @@ -76,6 +73,7 @@ export default class WindowManager implements IWindowManager { }), global.display.connect("window-entered-monitor", (display, monitor, window) => { Logger.log("WINDOW HAS ENTERED NEW MONITOR!") + // this._moveWindowToMonitor(window, monitor); }), global.display.connect('window-created', (display, window) => { this.handleWindowCreated(display, window); @@ -230,15 +228,33 @@ export default class WindowManager implements IWindowManager { Logger.info("monitor_start and monitor_end", this._grabbedWindowMonitor, window.get_monitor()); } + _moveWindowToMonitor(window: Meta.Window, monitorId: number): void { + let wrapped = undefined; + for (const monitor of this._monitors.values()) { + wrapped = monitor.getWindow(window.get_id()); + if (wrapped !== undefined) { + monitor.removeWindow(wrapped); + break; + } + } + if (wrapped === undefined) { + wrapped = new WindowWrapper(window, this.handleWindowMinimized); + wrapped.connectWindowSignals(this); + } + let new_mon = this._monitors.get(monitorId); + new_mon?.addWindow(wrapped) + this._tileMonitors(); + } + public handleWindowPositionChanged(winWrap: WindowWrapper): void { if (winWrap.getWindowId() === this._grabbedWindowId) { const rect = winWrap.getRect(); - Logger.log("GRABBED WINDOW POSITION CHANGED", rect.x); + // Logger.log("GRABBED WINDOW POSITION CHANGED", rect.x); const [mouseX, mouseY, _] = global.get_pointer(); this._monitors.get(winWrap.getMonitor())?.itemDragged(winWrap, mouseX, mouseY); // Log or use the coordinates - console.log(`Mouse position: X=${mouseX}, Y=${mouseY}`); + // console.log(`Mouse position: X=${mouseX}, Y=${mouseY}`); } } @@ -327,10 +343,14 @@ export default class WindowManager implements IWindowManager { } _addWindowWrapperToMonitor(winWrap: WindowWrapper) { + Logger.log("Adding window", JSON.stringify(winWrap)); + Logger.log("Adding window raw", JSON.stringify(winWrap.getWindow())); + Logger.log("Adding window raw", JSON.stringify(winWrap.getWindow().minimized)); if (winWrap.getWindow().minimized) { this._minimizedItems.set(winWrap.getWindow().get_id(), winWrap); + } else { + this._monitors.get(winWrap.getWindow().get_monitor())?.addWindow(winWrap) } - this._monitors.get(winWrap.getWindow().get_monitor())?.addWindow(winWrap) } _tileMonitors(): void {