feat: ✨ added option to set a custom icon theme

README.md

@@ -78,6 +78,8 @@ iconSize=40
 #Full path to a css file, or 'default'.
 #See config/themes/default.css
 theme=default
+#An gtk icon theme name, or 'default'
+iconTheme=default
 
 [behavior]
 #Specify a list of keys to group windows on: class;instance;title;visibility

config/settings.ini

@@ -10,6 +10,8 @@ iconSize=40
 #Full path to a css file, or 'default'.
 #See config/themes/default.css
 theme=default
+#An gtk icon theme name, or 'default'
+iconTheme=default
 
 [behavior]
 #Specify a list of keys to group windows on: class;instance;title;visibility

src/config.ts

@@ -12,6 +12,7 @@ const defaults = {
     offsetY: 0,
     iconSize: 40,
     theme: "default",
+    iconTheme: "default",
   },
   behavior: {
     groupBy: ["instance", "visibility"] as WindowGrouping[],
@@ -129,6 +130,11 @@ class Config {
       "theme",
       `Full path to a css file, or 'default'.\nSee config/themes/default.css`
     )
+    ini.set_comment(
+      "appearance",
+      "iconTheme",
+      `An gtk icon theme name, or 'default'`
+    )
     ini.set_comment(
       "behavior",
       "groupBy",

src/dock-item.ts

@@ -5,6 +5,7 @@ import GdkPixbuf from "./types/GdkPixbuf-2.0"
 import GLib from "./types/GLib-2.0"
 import Gtk from "./types/Gtk-3.0"
 import Wnck from "./types/Wnck-3.0"
+import { getXProp, XPropType } from "./xutil"
 
 export class DockItem {
   name: string
@@ -134,28 +135,63 @@ export class DockItem {
   }
 
   updateIcon() {
-    const iconTheme = Gtk.IconTheme.get_default()
-    let iconName = this.window.get_class_instance_name() || "application"
+    let iconTheme = Gtk.IconTheme.get_default()
+    if (
+      config.settings.appearance.iconTheme &&
+      config.settings.appearance.iconTheme !== "default"
+    ) {
+      iconTheme = new Gtk.IconTheme()
+      iconTheme.set_custom_theme(config.settings.appearance.iconTheme)
+    }
+
+    const cleanup = (iconName: string) => {
+      if (iconName) {
+        return iconName.replace(/\s+/gu, "").toLowerCase()
+      }
+    }
+
+    const lookup: (string | undefined)[] = []
 
-    // Load custom icons from config
+    const groupIcon = cleanup(this.window.get_class_group_name())
+    const instanceIcon = cleanup(this.window.get_class_instance_name())
+
+    lookup.push(
+      getXProp(
+        this.window.get_xid(),
+        "_GTK_APPLICATION_ID",
+        XPropType.UTF8_STRING
+      ),
+      instanceIcon
+    )
+
+    const noGroupIcons = ["brave-browser", "chromium-browser", "chrome-browser"]
+    if (groupIcon && !noGroupIcons.includes(groupIcon)) {
+      lookup.push(groupIcon)
+    }
+
+    // // Load custom icons from config
     for (const [iconK, iconV] of Object.entries(config.settings.icons)) {
       if (
-        iconName.toLowerCase().includes(iconV.toLowerCase()) &&
-        iconTheme.has_icon(iconK)
+        iconTheme.has_icon(iconK) &&
+        lookup.some((x) => `${x}`.includes(iconV.toLowerCase()))
       ) {
-        iconName = iconK
-        break
+        lookup.unshift(iconK)
       }
     }
 
     let icon: GdkPixbuf.Pixbuf | null = this.window.get_icon()
 
-    if (iconTheme.has_icon(iconName)) {
-      icon = iconTheme.load_icon(
-        iconName,
-        config.settings.appearance.iconSize,
-        Gtk.IconLookupFlags.FORCE_SIZE
-      )
+    const iconNames = lookup.filter((x) => x) as string[]
+
+    const iconInfo = iconTheme.choose_icon(
+      iconNames,
+      config.settings.appearance.iconSize,
+      Gtk.IconLookupFlags.FORCE_SIZE
+    )
+
+    if (iconInfo) {
+      log(`[icon] ${iconInfo.get_filename()}`)
+      icon = iconInfo.load_icon()
     } else {
       icon = icon.copy()
       if (icon)

src/globals.d.ts

@@ -1,8 +1,10 @@
 import { Object } from "./types/GObject-2.0"
+import { byteArray } from "./types/Gjs"
 
 declare global {
   const ARGV: string[]
   const imports: {
+    byteArray: byteArray
     system: {
       gc: () => void
       exit: (exitCode) => void

src/xutil.ts

@@ -0,0 +1,28 @@
+import Gdk from "./types/Gdk-3.0"
+import GdkX11 from "./types/GdkX11-3.0"
+
+export enum XPropType {
+  "STRING",
+  "UTF8_STRING",
+  "CARDINAL",
+  "ATOM",
+}
+
+export function getXProp(xid: number, prop: string, type: XPropType) {
+  const window: Gdk.Window = GdkX11.X11Window.foreign_new_for_display(
+    Gdk.Display.get_default() as GdkX11.X11Display,
+    xid
+  )
+  if (window) {
+    const [found, _actualType, _actualFormat, data] = Gdk.property_get(
+      window,
+      Gdk.atom_intern(prop, false),
+      Gdk.Atom.intern(XPropType[type], false),
+      0,
+      2048,
+      0
+    )
+
+    if (found) return imports.byteArray.toString(data) as string
+  }
+}