[taffybar] Use new system for specifying custom icons in workspaces

dotfiles/config/taffybar/taffybar

@@ -1 +1 @@
-Subproject commit e6f0bf2e08300e6dc5405131549fc21a6e9af7f0
+Subproject commit b20fd99f934fbfdb5cfc021d01a0c4c4c189af29

dotfiles/config/taffybar/taffybar.hs

@@ -32,6 +32,7 @@ import                  System.Taffybar.Information.EWMHDesktopInfo
 import           System.Taffybar.Information.Memory
 import           System.Taffybar.Information.X11DesktopInfo
 import           System.Taffybar.SimpleConfig
+import           System.Taffybar.Util
 import           System.Taffybar.Widget
 import           System.Taffybar.Widget.Generic.PollingGraph
 import           System.Taffybar.Widget.Generic.PollingLabel
@@ -87,6 +88,10 @@ workspaceNamesLabelSetter workspace =
   fromMaybe "" . lookup (workspaceIdx workspace) <$>
             liftX11Def [] getFullWorkspaceNames
 
+enableLogger logger level = do
+  logger <- getLogger logger
+  saveGlobalLogger $ setLevel level logger
+
 logDebug = do
   logger <- getLogger "System.Taffybar.Widget.Generic.AutoSizeImage"
   saveGlobalLogger $ setLevel DEBUG logger
@@ -102,25 +107,27 @@ logDebug = do
 main = do
   homeDirectory <- getHomeDirectory
   -- logDebug
+  -- enableLogger "System.Taffybar.Widget.Util" DEBUG
+  -- enableLogger "System.Taffybar.Information.XDG.DesktopEntry" DEBUG
+  -- enableLogger "System.Taffybar.WindowIcon" DEBUG
   let resourcesDirectory = homeDirectory </> ".lib" </> "resources"
       inResourcesDirectory file = resourcesDirectory </> file
       highContrastDirectory =
         "/" </> "usr" </> "share" </> "icons" </> "HighContrast" </> "256x256"
       inHighContrastDirectory file = highContrastDirectory </> file
-      makeIcon = return . IIFilePath . inResourcesDirectory
+      getIconFileName w@WindowData {windowTitle = title, windowClass = klass}
-      myGetIconInfo w@WindowData {windowTitle = title, windowClass = klass}
+        -- | "URxvt" `isInfixOf` klass = Just "urxvt.png"
-        | "URxvt" `isInfixOf` klass = makeIcon "urxvt.png"
+        -- | "Termite" `isInfixOf` klass = Just "urxvt.png"
-        | "Termite" `isInfixOf` klass = makeIcon "urxvt.png"
+        -- | "Kodi" `isInfixOf` klass = Just "kodi.png"r
-        | "Kodi" `isInfixOf` klass = makeIcon "kodi.png"
         | "@gmail.com" `isInfixOf` title &&
             "chrome" `isInfixOf` klass && "Gmail" `isInfixOf` title =
-          makeIcon "gmail.png"
+          Just "gmail.png"
-        | otherwise = do
+        | otherwise = Nothing
-          res <- defaultGetIconInfo w
+      myIcons =
-          return $
+        addCustomIconsAndFallback
-            case res of
+          (fmap inResourcesDirectory . getIconFileName)
-              IINone -> IIFilePath $ inResourcesDirectory "exe-icon.png"
+          (inResourcesDirectory "exe-icon.png")
-              _ -> res
+          (getWindowIconPixbufFromClass <|||> getWindowIconPixbufFromEWMH)
       cpu = pollingGraphNew cpuCfg 0.5 cpuCallback
       mem = pollingGraphNew memCfg 1 memCallback
       layout = layoutNew defaultLayoutConfig
@@ -130,22 +137,25 @@ main = do
         { underlineHeight = 3
         , underlinePadding = 2
         , minWSWidgetSize = Nothing
-        , minIcons = 1
+        , minIcons = 3
-        , getIconInfo = myGetIconInfo
+        , getWindowIconPixbuf = myIcons
         -- , windowIconSize = 31
         , widgetGap = 0
-        , showWorkspaceFn = hideEmpty
+        , showWorkspaceFn = const True
         , updateRateLimitMicroseconds = 100000
         , labelSetter = workspaceNamesLabelSetter
         }
       workspaces = workspacesNew myWorkspacesConfig
-      baseConfig = defaultSimpleTaffyConfig
+      baseConfig =
+        defaultSimpleTaffyConfig
         { startWidgets =
-            workspaces : map (>>= buildContentsBox) [ layout, windows ]
+            workspaces : map (>>= buildContentsBox) [layout, windows]
-        , endWidgets = map (>>= buildContentsBox)
+        , endWidgets =
-          [ textClockNew Nothing "%a %b %_d %r" 1
+            map
-          , textBatteryNew "$percentage$% ($time$)"
+              (>>= buildContentsBox)
+              [ textBatteryNew "$percentage$%"
               , batteryIconNew
+              , textClockNew Nothing "%a %b %_d %r" 1
               , sniTrayNew
           -- , github
               , cpu
@@ -156,17 +166,16 @@ main = do
               , mpris2New
               ]
         , barPosition = Top
-        , barPadding = 5
+        , barPadding = 10
-        , barHeight = 50
+        , barHeight = 53
-        , widgetSpacing = 0
         }
-      simpleTaffyConfig =
+      simpleTaffyConfig = baseConfig
-        baseConfig
         -- { endWidgets = []
         -- , startWidgets = [flip widgetSetClass "Workspaces" =<< workspaces]
         -- }
-  startTaffybar $ withBatteryRefresh $ withLogServer $ withToggleServer $
+  startTaffybar $
-                toTaffyConfig simpleTaffyConfig
+    withBatteryRefresh $
+    withLogServer $ withToggleServer $ toTaffyConfig simpleTaffyConfig
 
 -- Local Variables:
 -- flycheck-ghc-args: ("-Wno-missing-signatures")