From ac1ea53b407e1a891dbceb6f5f433cd05983c5cb Mon Sep 17 00:00:00 2001 From: Tomas Jasek Date: Wed, 8 Feb 2017 16:44:20 +0100 Subject: [PATCH 1/3] bspwm: update mock to reflect 0.9.2 Signed-off-by: Tomas Jasek --- spec/mocks/bspwm.rb | 766 ++++++++++++++++++++++---------------------- 1 file changed, 383 insertions(+), 383 deletions(-) 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 = < Date: Wed, 8 Feb 2017 16:45:19 +0100 Subject: [PATCH 2/3] bspwm: compare desktops based on id Signed-off-by: Tomas Jasek --- lib/barr/blocks/bspwm.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/barr/blocks/bspwm.rb b/lib/barr/blocks/bspwm.rb index 8024363..c2cf419 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) From 215b214f1a853599ac448cad1dd561f7199ed95c Mon Sep 17 00:00:00 2001 From: Tomas Jasek Date: Wed, 8 Feb 2017 17:01:41 +0100 Subject: [PATCH 3/3] bspwm: retrieve primary monitor name Signed-off-by: Tomas Jasek --- lib/barr/blocks/bspwm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/barr/blocks/bspwm.rb b/lib/barr/blocks/bspwm.rb index c2cf419..b1c9474 100644 --- a/lib/barr/blocks/bspwm.rb +++ b/lib/barr/blocks/bspwm.rb @@ -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