remove inappropriate configuration module entry in metadata; add deb…

…ug info refactor
nclarius · Mar 2, 2022 · 372173f · 372173f
1 parent 5491cee
commit 372173f
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 6 deletions.
diff --git a/always-open-on-focused-screen/.img/icon.png → always-open-on-focused-screen/.img/logo.png b/always-open-on-focused-screen/.img/icon.png → always-open-on-focused-screen/.img/logo.png
diff --git a/...pen-on-focused-screen/.img/icon_small.png → always-open-on-focused-screen/.img/logo_.png b/...pen-on-focused-screen/.img/icon_small.png → always-open-on-focused-screen/.img/logo_.png
diff --git a/always-open-on-focused-screen/CHANGELOG.bbcode b/always-open-on-focused-screen/CHANGELOG.bbcode
@@ -1,3 +1,9 @@
+[h2]v2.7[/h2]
+[list]\n[*] remove inappropriate configuration module entry in metadata
+[*] add debug info
+[*] refactor
+[/list]
+
 [h2]v2.6[/h2]
 [list]
 [*] fix metadata not found

diff --git a/always-open-on-focused-screen/CHANGELOG.md b/always-open-on-focused-screen/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v2.7
+- remove inappropriate configuration module entry in metadata
+- add debug info
+- refactor
+
 ## v2.6
 - fix metadata not found
 

diff --git a/always-open-on-focused-screen/CHANGELOG.txt b/always-open-on-focused-screen/CHANGELOG.txt
@@ -1 +1,3 @@
 - remove inappropriate configuration module entry in metadata
+- add debug info
+- refactor
diff --git a/always-open-on-focused-screen/contents/code/main.js b/always-open-on-focused-screen/contents/code/main.js
@@ -4,21 +4,32 @@ KWin Script Always Open on Focused Screen
 GNU General Public License v3.0
 */
 
-// when a client is activated
+// initialization
+const debugMode = readConfig("debugMode", true);
+function debug(...args) {if (debugMode) 
+    console.debug("alwaysopenonfocusedscreen:", ...args);}
+debug("initializing");
+
+// when a client is activated, update focused screen to screen client is on
 focusedScreen = workspace.activeScreen;
-workspace.clientActivated.connect(function(client) {
+workspace.clientActivated.connect(client => {
     if (!client || client.resourceClass == "plasmashell") return;
-    // update focused screen to screen client is on
     focusedScreen = client.screen;
+    debug("focused screen", activeScreen);
 });
 
 // when a client is added
-workspace.clientAdded.connect(function(client) {
+workspace.clientAdded.connect(client => {
+    debug("client", JSON.stringify(client, undefined, 2));
+
+    // abort if client is null or not a normal window
     if (!client || client.resourceClass == "plasmashell") return;
+
+    // abort if client is already on the right screen
     if (client.screen == focusedScreen) return;
 
     // move client to focused screen
-    console.debug("sending client", client.caption, "to focused screen", focusedScreen);
+    debug("sending client", client.caption, "to focused screen", focusedScreen);
     workspace.sendClientToScreen(client, focusedScreen);
 
     // clip and move client into bounds of screen dimensions

diff --git a/always-open-on-focused-screen/metadata.desktop b/always-open-on-focused-screen/metadata.desktop
@@ -12,7 +12,7 @@ Comment[nl]=Open nieuwe vensters altijd op het scherm met een gefocust venster
 Icon=preferences-system-windows
 
 X-KDE-PluginInfo-Name=alwaysopenonfocusedscreen
-X-KDE-PluginInfo-Version=2.6
+X-KDE-PluginInfo-Version=2.7
 X-KDE-PluginInfo-Author=Natalie Clarius
 X-KDE-PluginInfo-Email=natalie_clarius@yahoo.de
 X-KDE-PluginInfo-License=GPL v3.0