Merge pull request #88 from nlpsuge/dev-gnome41-compatibility

nlpsuge · web-flow · commit 8181f2a13702 · 2023-07-25T19:51:09.000+08:00
Gnome 41 compatibility. Related to #79. This might fix all issues mentioned in #79.
diff --git a/closeSession.js b/closeSession.js
@@ -391,10 +391,12 @@ var CloseSession = class {
                         Log.Log.getDefault().debug(`Finished to start ydotool.service. Started: ${started}`);
                         resolve(started);
                     } catch (error) {
+                        const additionalInfo = 'Please make sure `ydotool` is installed and set up properly, see https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-make-close-by-rules-work for more instruction';
                         const msg = 'Failed to start ydotool.service';
-                        Log.Log.getDefault().error(error, msg);
-                        global.notify_error(`${msg}`, `${error ? error.message : ''}`);
-                        reject(false);
+                        Log.Log.getDefault().error(error, `${msg} ${additionalInfo}`);
+                        global.notify_error(`${msg}`, `${error ? error.message : ''} ${additionalInfo}`);
+                        // `ydotool` might not be available, which can't stop AWSM continue to close the rest of apps
+                        resolve(false);
                     }
                 });
             });   
@@ -405,7 +407,7 @@ var CloseSession = class {
 
     _getRunningAppsClosingByRules() {
         if (!this._settings.get_boolean('enable-close-by-rules')) {
-            return [[], this._defaultAppSystem.get_running()];
+            return [this._defaultAppSystem.get_running(), [], []];
         }
 
         const closeWindowsRules = this._prefsUtils.getSettingString('close-windows-rules');
diff --git a/metadata.json b/metadata.json
@@ -11,5 +11,5 @@
     ],
     "url": "https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager",
     "uuid": "another-window-session-manager@gmail.com",
-    "version": 40
+    "version": 41
   }
diff --git a/model/closeWindowsRule.js b/model/closeWindowsRule.js
@@ -2,6 +2,9 @@
 
 const { GObject } = imports.gi;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const CloseWindowsRule = Me.imports.model.closeWindowsRule;
 
 var CloseWindowsWhitelist = GObject.registerClass({
 }, class CloseWindowsWhitelist extends GObject.Object {
@@ -14,7 +17,7 @@ var CloseWindowsWhitelist = GObject.registerClass({
     enableWhenLogout; // boolean
 
     static new(param) {
-        return Object.assign(new CloseWindowsWhitelist(), param);
+        return Object.assign(new CloseWindowsRule.CloseWindowsWhitelist(), param);
     }
 });
 
@@ -36,7 +39,7 @@ var CloseWindowsRuleByKeyword = class extends CloseWindowsRuleBase {
     method; // string. endsWith, includes, startsWith, equals, regex. 
 
     static new(param) {
-        return Object.assign(new CloseWindowsRuleByKeyword(), param);
+        return Object.assign(new CloseWindowsRule.CloseWindowsRuleByKeyword(), param);
     }
 }
 
@@ -46,7 +49,7 @@ var CloseWindowsRuleByApp = class extends CloseWindowsRuleBase {
     appName; // string, such as 'Firefox'
 
     static new(param) {
-        return Object.assign(new CloseWindowsRuleByApp(), param);
+        return Object.assign(new CloseWindowsRule.CloseWindowsRuleByApp(), param);
     }
 }
 
@@ -83,6 +86,6 @@ var GdkShortcuts = GObject.registerClass({
     shiftRightPressed;
 
     static new(param) {
-        return Object.assign(new GdkShortcuts(), param);
+        return Object.assign(new CloseWindowsRule.GdkShortcuts(), param);
     }
 });
diff --git a/prefs.js b/prefs.js
@@ -6,6 +6,7 @@ const Me = ExtensionUtils.getCurrentExtension();
 
 const FileUtils = Me.imports.utils.fileUtils;
 const Log = Me.imports.utils.log;
+const GnomeVersion = Me.imports.utils.gnomeVersion;
 
 Me.imports.utils.string;
 
@@ -296,6 +297,17 @@ const BuilderScope = GObject.registerClass({
 
 function buildPrefsWidget() {
     const settings = new Prefs();
+
+    if (GnomeVersion.isLessThan42()) {
+        const scroll = new Gtk.ScrolledWindow({ 
+            vexpand: true, 
+            hexpand: true,
+            hscrollbar_policy: Gtk.PolicyType.NEVER,
+            vscrollbar_policy: Gtk.PolicyType.AUTOMATIC
+        });
+        scroll.set_child(settings.notebook);
+        return scroll;
+    }
     return settings.notebook;
 }
 
diff --git a/prefsCloseWindow.js b/prefsCloseWindow.js
@@ -41,15 +41,6 @@ var UICloseWindows = GObject.registerClass(
         }
 
         init() {
-            const close_by_rules_multi_grid2 = this._builder.get_object('close_by_rules_multi_grid2');
-            const close_by_rules_list_box = this._builder.get_object('close_by_rules_list_box');
-            // Remove GtkScrolledWindow on Gnome 42
-            // See: https://gjs.guide/extensions/upgrading/gnome-shell-42.html#gtk-scrolledwindow
-            if (!GnomeVersion.isLessThan42()) {
-                close_by_rules_list_box.unparent();
-                close_by_rules_multi_grid2.attach(close_by_rules_list_box, 0, 0, 1, 1);
-            }
-            
             this._initAppRules();
             this._initKeywordRules();
             this._initWhitelist();
@@ -111,7 +102,7 @@ var UICloseWindows = GObject.registerClass(
         }
 
         _initAppRules() {
-            const close_by_rules_list_box = this._builder.get_object('close_by_rules_list_box');
+            const close_by_rules_list_box = this._builder.get_object('close_by_rules_applications_list_box');
             close_by_rules_list_box.set_header_func((currentRow, beforeRow, data) => {
                 this._setHeader(currentRow, beforeRow, data, 'Applications');
             });
@@ -144,13 +135,7 @@ var UICloseWindows = GObject.registerClass(
         }
 
         _initKeywordRules() {
-            const close_by_rules_multi_grid2 = this._builder.get_object('close_by_rules_multi_grid2');
-            const close_by_rules_by_keyword_list_box = new Gtk.ListBox({
-                hexpand: true,
-                vexpand: true,
-                show_separators: true,
-            });
-            close_by_rules_multi_grid2.attach(close_by_rules_by_keyword_list_box, 0, 1, 1, 1);
+            const close_by_rules_by_keyword_list_box = this._builder.get_object('close_by_rules_keywords_list_box');
             close_by_rules_by_keyword_list_box.set_header_func((currentRow, beforeRow, data) => {
                 this._setHeader(currentRow, beforeRow, data, 'Keywords');
             });
diff --git a/ui/autoclose.js b/ui/autoclose.js
@@ -483,12 +483,16 @@ var RunningApplicationListWindow = GObject.registerClass({
         }
 
         _setInitialKeyFocus(actor) {
-            this._initialKeyFocus?.disconnectObject(this);
+            if (this._initialKeyFocus && this._initialKeyFocusDestroyId) {
+                this._initialKeyFocus.disconnect(this._initialKeyFocusDestroyId);
+            }
 
             this._initialKeyFocus = actor;
 
-            actor.connectObject('destroy',
-                () => (this._initialKeyFocus = null), this);
+            this._initialKeyFocusDestroyId = actor.connect('destroy', () => {
+                this._initialKeyFocus = null;
+                this._initialKeyFocusDestroyId = 0;
+            });
         }
 
         open() {
diff --git a/ui/prefs-gtk4.ui b/ui/prefs-gtk4.ui
@@ -147,40 +147,33 @@
               </object>
             </child>
             <child>
-              <object class="GtkGrid" id="close_by_rules_multi_grid2">
-                <property name="margin-top">12</property>
-                <property name="margin-bottom">12</property>
-                <property name="row-spacing">6</property>
-                <property name="column-spacing">32</property>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="close_rule_listbox_scrolledwindow">
-                    <property name="focusable">1</property>
-                    <property name="child">
-                      <object class="GtkViewport" id="close_rule_listbox_viewport">
-                        <property name="child">
-                          <object class="GtkListBox" id="close_by_rules_list_box">
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <property name="show-separators">True</property>
-                            
-                          </object>
-                        </property>
-                      </object>
-                    </property>
-                    <layout>
-                      <property name="column">0</property>
-                      <property name="row">1</property>
-                    </layout>
+                  <object class="GtkListBox" id="close_by_rules_applications_list_box">
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="show-separators">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkListBox" id="close_by_rules_keywords_list_box">
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="show-separators">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkListBox" id="close_windows_whitelist_listbox">
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="show-separators">True</property>
+                    <child>
+                    </child>
                   </object>
                 </child>
               </object>
             </child>
-            <child>
-                <object class="GtkListBox" id="close_windows_whitelist_listbox">
-                  <child>
-                  </child>
-                </object>
-              </child>
           </object>
         </property>
         <property name="tab">
diff --git a/utils/WindowPicker.js b/utils/WindowPicker.js
@@ -11,6 +11,9 @@ const Main         = imports.ui.main;
 const LookingGlass = imports.ui.lookingGlass;
 const Me           = imports.misc.extensionUtils.getCurrentExtension();
 
+const GnomeVersion = Me.imports.utils.gnomeVersion;
+
+
 // Based on the WindowPicker.js from Burn-My-Windows. 
 // I modified and enhanced it, so it can be used in my case 
 // properly for the Another Window Session Manager extension.
@@ -46,9 +49,14 @@ var WindowPickerServiceProvider = class WindowPickerServiceProvider {
 
     const inspector = new MyInspector(Main.createLookingGlass());
     
+    // Compatibility: gnome shell 41.x does not have the variable `_grab` in lookingGlass.LookingGlass
     // Release the global grab, so that we can move around freely (specially, free to use Ctrl+`
     // to switch windows) and pick a window that is on another workspace.
-    Main.popModal(lookingGlass._grab);
+    if (GnomeVersion.isLessThan42()) {
+      // Main.popModal(lookingGlass._entry);
+    } else {
+      Main.popModal(lookingGlass._grab);
+    }
 
     inspector.connect('target', (me, target, x, y) => {
       // Remove border effect when window is picked.
@@ -91,11 +99,16 @@ var WindowPickerServiceProvider = class WindowPickerServiceProvider {
       this._dbus.emit_signal('WindowPicked', variant);
     });
 
-    // Close LookingGlass when we're done.
+    // Close LookingGlass and release the grab when the picking is finished.
     inspector.connect('closed', () => {
-      // Restore the global grab to prevent the error 'incorrect pop' thrown by LookingGlass.close/Main.popModal(this._grab)
-      lookingGlass._grab = Main.pushModal(lookingGlass, { actionMode: Shell.ActionMode.LOOKING_GLASS });
-      lookingGlass.close();
+      if (GnomeVersion.isLessThan42()) {
+        // Main.pushModal(lookingGlass._entry, { actionMode: Shell.ActionMode.LOOKING_GLASS });
+        lookingGlass.close();
+      } else {
+        // Restore the global grab to prevent the error 'incorrect pop' thrown by LookingGlass.close/Main.popModal(this._grab)
+        lookingGlass._grab = Main.pushModal(lookingGlass, { actionMode: Shell.ActionMode.LOOKING_GLASS });
+        lookingGlass.close();
+      }
     });
 
     inspector.connect('WindowPickCancelled', () => {

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`	`],`
`12`	`12`	`"url": "https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager",`
`13`	`13`	`"uuid": "another-window-session-manager@gmail.com",`
`14`		`- "version": 40`
	`14`	`+ "version": 41`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`
`3`	`3`	`const { GObject } = imports.gi;`
`4`	`4`
	`5`	`+const ExtensionUtils = imports.misc.extensionUtils;`
	`6`	`+const Me = ExtensionUtils.getCurrentExtension();`
	`7`	`+const CloseWindowsRule = Me.imports.model.closeWindowsRule;`
`5`	`8`
`6`	`9`	`var CloseWindowsWhitelist = GObject.registerClass({`
`7`	`10`	`}, class CloseWindowsWhitelist extends GObject.Object {`
`@@ -14,7 +17,7 @@ var CloseWindowsWhitelist = GObject.registerClass({`
`14`	`17`	`enableWhenLogout; // boolean`
`15`	`18`
`16`	`19`	`static new(param) {`
`17`		`- return Object.assign(new CloseWindowsWhitelist(), param);`
	`20`	`+ return Object.assign(new CloseWindowsRule.CloseWindowsWhitelist(), param);`
`18`	`21`	`}`
`19`	`22`	`});`
`20`	`23`
`@@ -36,7 +39,7 @@ var CloseWindowsRuleByKeyword = class extends CloseWindowsRuleBase {`
`36`	`39`	`method; // string. endsWith, includes, startsWith, equals, regex.`
`37`	`40`
`38`	`41`	`static new(param) {`
`39`		`- return Object.assign(new CloseWindowsRuleByKeyword(), param);`
	`42`	`+ return Object.assign(new CloseWindowsRule.CloseWindowsRuleByKeyword(), param);`
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`
`@@ -46,7 +49,7 @@ var CloseWindowsRuleByApp = class extends CloseWindowsRuleBase {`
`46`	`49`	`appName; // string, such as 'Firefox'`
`47`	`50`
`48`	`51`	`static new(param) {`
`49`		`- return Object.assign(new CloseWindowsRuleByApp(), param);`
	`52`	`+ return Object.assign(new CloseWindowsRule.CloseWindowsRuleByApp(), param);`
`50`	`53`	`}`
`51`	`54`	`}`
`52`	`55`
`@@ -83,6 +86,6 @@ var GdkShortcuts = GObject.registerClass({`
`83`	`86`	`shiftRightPressed;`
`84`	`87`
`85`	`88`	`static new(param) {`
`86`		`- return Object.assign(new GdkShortcuts(), param);`
	`89`	`+ return Object.assign(new CloseWindowsRule.GdkShortcuts(), param);`
`87`	`90`	`}`
`88`	`91`	`});`