diff --git a/lib/barr/blocks/bspwm.rb b/lib/barr/blocks/bspwm.rb index 8024363..b1c9474 100644 --- a/lib/barr/blocks/bspwm.rb +++ b/lib/barr/blocks/bspwm.rb @@ -22,9 +22,9 @@ def update! bsp_tree["monitors"].each do |monitor| next if monitor["name"] != @monitor - focused = monitor["focusedDesktopName"] + focused = monitor["focusedDesktopId"] monitor["desktops"].each do |desktop| - if desktop["name"] == focused + if desktop["id"] == focused op << focused_desktop(desktop) else op << unfocused_desktop(desktop) @@ -61,7 +61,7 @@ def unfocused_desktop desktop end def first_monitor - bsp_tree["primaryMonitorName"] + bsp_tree["monitors"].find {|monitor| monitor["id"] == bsp_tree["primaryMonitorId"]}["name"] end def sys_cmd diff --git a/spec/mocks/bspwm.rb b/spec/mocks/bspwm.rb index 4e1ec37..3755386 100644 --- a/spec/mocks/bspwm.rb +++ b/spec/mocks/bspwm.rb @@ -1,8 +1,8 @@ $bsp_json = <