refactor: remove X11 support and legacy window decoration code

Removes all X11-specific functionality including xprop dependency, window decoration control, and X11-specific window property handling. The extension is now Wayland-only.

Author: CleoMenezesJr

README.md

@@ -122,12 +122,18 @@ There is file `$XDG_CONFIG_HOME/gnome-mosaic/config.json` where you can add the
 
 ```json
 {
-    "class": "<WM_CLASS String from xprop>",
+    "class": "<WM_CLASS String>",
     "title": "<Optional Window Title>"
 }
 ```
 
-For example, doing `xprop` on GNOME Settings (or GNOME Control Center), the WM_CLASS values are `gnome-control-center` and `Gnome-control-center`. Use the second value (Gnome-control-center), which gnome-mosaic will read. The `title` field is optional.
+To find the WM_CLASS of a window, you can:
+
+1. Use the extension's built-in exception dialog (accessible from the panel menu)
+2. Check the output of `journalctl -f -o cat /usr/bin/gnome-shell` when focusing the window
+3. Use `gdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval 'global.get_window_actors().map(a => a.meta_window.get_wm_class()).join(", ")'`
+
+For example, for GNOME Settings (or GNOME Control Center), the WM_CLASS values are `gnome-control-center` and `Gnome-control-center`. Use the second value (Gnome-control-center), which gnome-mosaic will read. The `title` field is optional.
 
 After applying changes in `config.json`, you can reload the tiling if it doesn't work the first time.
 
@@ -141,7 +147,7 @@ Please install the following as dependencies when developing:
 - Latest `npm` (comes with NodeJS)
 - `npm install typescript@latest`
 
-While working on the shell, you can recompile, reconfigure, reinstall, and restart GNOME Shell with logging with `make debug`. Note that this only works reliably in X11 sessions, since Wayland will exit to the login screen on restarting the shell.
+While working on the shell, you can recompile, reconfigure, reinstall, and restart GNOME Shell with logging with `make debug`. Note that this only works reliably on Wayland sessions when using nested mode, since restarting the shell on Wayland will exit to the login screen.
 
 ## License
 

src/extension.ts

@@ -1024,8 +1024,7 @@ export class Ext extends Ecs.System<ExtEvent> {
                 `  monitor: ${win.meta.get_monitor()},\n` +
                 `  name: ${win.name(this)},\n` +
                 `  rect: ${win.rect().fmt()},\n` +
-                `  workspace: ${win.workspace_id()},\n` +
-                `  xid: ${win.xid()},\n`;
+                `  workspace: ${win.workspace_id()},\n`;
 
             if (this.auto_tiler) {
                 msg += `  fork: (${this.auto_tiler.attached.get(win.entity)}),\n`;
@@ -1934,24 +1933,6 @@ export class Ext extends Ecs.System<ExtEvent> {
         this.unset_grab_op();
     }
 
-    on_show_window_titles() {
-        const show_title = this.settings.show_title();
-
-        if (indicator) {
-            indicator.toggle_titles.setToggleState(show_title);
-        }
-
-        for (const window of this.windows.values()) {
-            if (window.is_client_decorated()) continue;
-
-            if (show_title) {
-                window.decoration_show(this);
-            } else {
-                window.decoration_hide(this);
-            }
-        }
-    }
-
     on_smart_gap() {
         if (this.auto_tiler) {
             const smart_gaps = this.settings.smart_gaps();
@@ -2197,9 +2178,6 @@ export class Ext extends Ecs.System<ExtEvent> {
                 case 'gap-outer':
                     this.on_gap_outer();
                     break;
-                case 'show-title':
-                    this.on_show_window_titles();
-                    break;
                 case 'smart-gaps':
                     this.on_smart_gap();
                     this.show_border_on_focused();
@@ -3306,6 +3284,8 @@ function _show_skip_taskbar_windows(ext: Ext) {
         };
     }
 
+    // Handle the workspace thumbnail
+
     // Handle the workspace thumbnail
     if (!default_isoverviewwindow_ws_thumbnail) {
         default_isoverviewwindow_ws_thumbnail =

src/settings.ts

@@ -70,7 +70,6 @@ const EDGE_TILING = 'edge-tiling';
 const GAP_INNER = 'gap-inner';
 const GAP_OUTER = 'gap-outer';
 const ROW_SIZE = 'row-size';
-const SHOW_TITLE = 'show-title';
 const SMART_GAPS = 'smart-gaps';
 const SNAP_TO_GRID = 'snap-to-grid';
 const TILE_BY_DEFAULT = 'tile-by-default';
@@ -148,10 +147,6 @@ export class ExtensionSettings {
         return this.ext.get_uint(ROW_SIZE);
     }
 
-    show_title(): boolean {
-        return this.ext.get_boolean(SHOW_TITLE);
-    }
-
     smart_gaps(): boolean {
         return this.ext.get_boolean(SMART_GAPS);
     }
@@ -232,10 +227,6 @@ export class ExtensionSettings {
         this.ext.set_uint(ROW_SIZE, size);
     }
 
-    set_show_title(set: boolean) {
-        this.ext.set_boolean(SHOW_TITLE, set);
-    }
-
     set_smart_gaps(set: boolean) {
         this.ext.set_boolean(SMART_GAPS, set);
     }

src/window.ts

@@ -1,10 +1,8 @@
 import * as lib from './lib.js';
 import * as log from './log.js';
-import * as once_cell from './once_cell.js';
 import * as Rect from './rectangle.js';
 import * as Tags from './tags.js';
 import * as utils from './utils.js';
-import * as xprop from './xprop.js';
 import type {Entity} from './ecs.js';
 import type {Ext} from './extension.js';
 import type {Rectangle} from './rectangle.js';
@@ -18,20 +16,6 @@ import Gio from 'gi://Gio';
 import Mtk from 'gi://Mtk';
 import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 
-const {OnceCell} = once_cell;
-
-const WM_TITLE_BLACKLIST: Array<string> = [
-    'Firefox',
-    'Nightly', // Firefox Nightly
-    'Tor Browser',
-];
-
-interface X11Info {
-    normal_hints: once_cell.OnceCell<lib.SizeHint | null>;
-    wm_role_: once_cell.OnceCell<string | null>;
-    xid_: once_cell.OnceCell<string | null>;
-}
-
 export class ShellWindow {
     entity: Entity;
     meta: Meta.Window;
@@ -57,14 +41,6 @@ export class ShellWindow {
 
     window_app: any;
 
-    private was_hidden: boolean = false;
-
-    private extra: X11Info = {
-        normal_hints: new OnceCell(),
-        wm_role_: new OnceCell(),
-        xid_: new OnceCell(),
-    };
-
     // Cache last border rect to avoid redundant updates
     private last_border_rect: {
         x: number;
@@ -94,8 +70,6 @@ export class ShellWindow {
             ext.add_tag(entity, Tags.Floating);
         }
 
-        this.decorate(ext);
-
         this.bind_window_events(ext);
         this.bind_hint_events(ext);
 
@@ -210,46 +184,6 @@ export class ShellWindow {
         return out;
     }
 
-    private async decorate(ext: Ext) {
-        if (await this.may_decorate()) {
-            if (!this.is_client_decorated()) {
-                if (ext.settings.show_title()) {
-                    this.decoration_show(ext);
-                } else {
-                    this.decoration_hide(ext);
-                }
-            }
-        }
-    }
-
-    private async decoration(
-        _ext: Ext,
-        callback: (xid: string) => void
-    ): Promise<void> {
-        if (await this.may_decorate()) {
-            const xid = this.xid();
-            if (xid) callback(xid);
-        }
-    }
-
-    decoration_hide(ext: Ext): void {
-        if (this.ignore_decoration()) return;
-
-        this.was_hidden = true;
-
-        this.decoration(ext, xid =>
-            xprop.set_hint(xid, xprop.MOTIF_HINTS, xprop.HIDE_FLAGS)
-        );
-    }
-
-    decoration_show(ext: Ext): void {
-        if (!this.was_hidden) return;
-
-        this.decoration(ext, xid =>
-            xprop.set_hint(xid, xprop.MOTIF_HINTS, xprop.SHOW_FLAGS)
-        );
-    }
-
     icon(_ext: Ext, size: number): any {
         let icon = this.window_app.create_icon_texture(size);
 
@@ -264,22 +198,6 @@ export class ShellWindow {
         return icon;
     }
 
-    ignore_decoration(): boolean {
-        const name = this.meta.get_wm_class();
-        if (name === null) return true;
-        return WM_TITLE_BLACKLIST.findIndex(n => name.startsWith(n)) !== -1;
-    }
-
-    is_client_decorated(): boolean {
-        // look I guess I'll hack something together in here if at all possible
-        // Because Meta.Window.is_client_decorated() was removed in Meta 15, using it breaks the extension in gnome 47 or higher
-        //return this.meta.window_type == Meta.WindowType.META_WINDOW_OVERRIDE_OTHER;
-        const xid = this.xid();
-        const extents = xid ? xprop.get_frame_extents(xid) : false;
-        if (!extents) return false;
-        return true;
-    }
-
     is_maximized(): boolean {
         return this.meta.is_maximized
             ? this.meta.is_maximized()
@@ -368,11 +286,6 @@ export class ShellWindow {
         return this.meta.get_transient_for() !== null;
     }
 
-    async may_decorate(): Promise<boolean> {
-        const xid = this.xid();
-        return xid ? await xprop.may_decorate(xid) : false;
-    }
-
     move(ext: Ext, rect: Rectangular, on_complete?: () => void) {
         if (!this.same_workspace() && this.is_maximized()) {
             return;
@@ -426,12 +339,6 @@ export class ShellWindow {
         return Rect.Rectangle.from_meta(this.meta.get_frame_rect());
     }
 
-    async size_hint(): Promise<lib.SizeHint | null> {
-        const xid = this.xid();
-        const hint = xid ? await xprop.get_size_hints(xid) : null;
-        return this.extra.normal_hints.get_or_init(() => hint);
-    }
-
     swap(ext: Ext, other: ShellWindow): void {
         let ar = this.rect().clone();
         let br = other.rect().clone();
@@ -445,12 +352,6 @@ export class ShellWindow {
         return title ? title : this.name(ext);
     }
 
-    async wm_role(): Promise<string | null> {
-        const xid = this.xid();
-        const role = xid ? await xprop.get_window_role(xid) : null;
-        return this.extra.wm_role_.get_or_init(() => role);
-    }
-
     workspace_id(): number {
         const workspace = this.meta.get_workspace();
         if (workspace) {
@@ -461,13 +362,6 @@ export class ShellWindow {
         }
     }
 
-    xid(): string | null {
-        return this.extra.xid_.get_or_init(() => {
-            if (utils.is_wayland()) return null;
-            return xprop.get_xid(this.meta);
-        });
-    }
-
     show_border(ext: Ext) {
         if (!this.border) return;