💥 fix(bar/focused-client): focused client is null after opening a new window on an empty workspace
AstalHyprland reports the focused client in a wrong way, so I decided to use a different way to get the focused client using colorshell's `Compositor` abstraction
This commit is contained in:
@@ -1,15 +1,23 @@
|
||||
import { register } from "ags/gobject";
|
||||
import { Compositors } from ".";
|
||||
import { createRoot } from "ags";
|
||||
import { register } from "ags/gobject";
|
||||
import { createRoot, getScope, Scope } from "ags";
|
||||
import { createScopedConnection } from "../utils";
|
||||
|
||||
|
||||
import AstalHyprland from "gi://AstalHyprland";
|
||||
|
||||
|
||||
type Event = "activewindow" | "activewindowv2"
|
||||
| "workspace" | "workspacev2"
|
||||
| "focusedmon" | "focusedmonv2";
|
||||
|
||||
@register({ GTypeName: "CompositorHyprland" })
|
||||
export class CompositorHyprland extends Compositors.Compositor {
|
||||
#scope: Scope;
|
||||
hyprland: AstalHyprland.Hyprland;
|
||||
|
||||
protected _focusedClient: Compositors.Client | null = null;
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
@@ -19,16 +27,43 @@ export class CompositorHyprland extends Compositors.Compositor {
|
||||
throw new Error(`Couldn't initialize CompositorHyprland: ${e}`);
|
||||
}
|
||||
|
||||
createRoot(() => {
|
||||
this.#scope = createRoot(() => {
|
||||
createScopedConnection(
|
||||
this.hyprland, "workspace-added", (hws) => {
|
||||
// check workspace existance
|
||||
if(this._workspaces.filter(w => w.id === hws.id)[0])
|
||||
return;
|
||||
this.hyprland, "event", (e, args) => {
|
||||
switch(e as Event) {
|
||||
case "activewindowv2":
|
||||
const address = args;
|
||||
const clients = AstalHyprland.get_default().clients;
|
||||
const focusedClient = clients.filter(c =>
|
||||
c.address === address
|
||||
)[0];
|
||||
|
||||
// TODO
|
||||
if(focusedClient) {
|
||||
this._focusedClient = new Compositors.Client({
|
||||
address: address,
|
||||
class: focusedClient.class ?? "",
|
||||
initialClass: focusedClient.initialClass ?? "",
|
||||
mapped: focusedClient.mapped,
|
||||
position: [focusedClient.x, focusedClient.y],
|
||||
title: focusedClient.title ?? ""
|
||||
});
|
||||
|
||||
this.notify("focused-client");
|
||||
return;
|
||||
}
|
||||
|
||||
this._focusedClient = null;
|
||||
this.notify("focused-client");
|
||||
break;
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
return getScope();
|
||||
});
|
||||
}
|
||||
|
||||
vfunc_dispose(): void {
|
||||
this.#scope.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,8 +4,6 @@ import GObject, { getter, gtype, property, register } from "ags/gobject";
|
||||
import GLib from "gi://GLib?version=2.0";
|
||||
|
||||
|
||||
export default Compositors;
|
||||
|
||||
/** WIP modular implementation of a system that supports implementing
|
||||
* a variety of Wayland Compositors
|
||||
* @todo implement more general compositor info + a lot of stuff
|
||||
|
||||
Reference in New Issue
Block a user