diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-23 20:27:56 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-07-23 20:31:11 -0400 |
commit | f4b882475eee7a81c206c7825616cc4656b2f60b (patch) | |
tree | 38e6ebf81b235424f105dcbcbb194e5e9eac70c0 /swaybar/ipc.c | |
parent | Implement pid->workspace tracking (diff) | |
parent | Merge pull request #2342 from RyanDwyer/update-cursor (diff) | |
download | sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.gz sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.zst sway-f4b882475eee7a81c206c7825616cc4656b2f60b.zip |
Merge branch 'master' into pid-workspaces
Diffstat (limited to 'swaybar/ipc.c')
-rw-r--r-- | swaybar/ipc.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 959fa095..c2d05920 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c | |||
@@ -115,6 +115,18 @@ static void ipc_parse_colors( | |||
115 | config->colors.inactive_workspace.text = parse_color( | 115 | config->colors.inactive_workspace.text = parse_color( |
116 | json_object_get_string(inactive_workspace_text)); | 116 | json_object_get_string(inactive_workspace_text)); |
117 | } | 117 | } |
118 | if (urgent_workspace_border) { | ||
119 | config->colors.urgent_workspace.border = parse_color( | ||
120 | json_object_get_string(urgent_workspace_border)); | ||
121 | } | ||
122 | if (urgent_workspace_bg) { | ||
123 | config->colors.urgent_workspace.background = parse_color( | ||
124 | json_object_get_string(urgent_workspace_bg)); | ||
125 | } | ||
126 | if (urgent_workspace_text) { | ||
127 | config->colors.urgent_workspace.text = parse_color( | ||
128 | json_object_get_string(urgent_workspace_text)); | ||
129 | } | ||
118 | if (binding_mode_border) { | 130 | if (binding_mode_border) { |
119 | config->colors.binding_mode.border = parse_color( | 131 | config->colors.binding_mode.border = parse_color( |
120 | json_object_get_string(binding_mode_border)); | 132 | json_object_get_string(binding_mode_border)); |
@@ -327,7 +339,7 @@ bool handle_ipc_readable(struct swaybar *bar) { | |||
327 | json_object *result = json_tokener_parse(resp->payload); | 339 | json_object *result = json_tokener_parse(resp->payload); |
328 | if (!result) { | 340 | if (!result) { |
329 | free_ipc_response(resp); | 341 | free_ipc_response(resp); |
330 | wlr_log(L_ERROR, "failed to parse payload as json"); | 342 | wlr_log(WLR_ERROR, "failed to parse payload as json"); |
331 | return false; | 343 | return false; |
332 | } | 344 | } |
333 | json_object *json_change, *json_pango_markup; | 345 | json_object *json_change, *json_pango_markup; |
@@ -340,7 +352,7 @@ bool handle_ipc_readable(struct swaybar *bar) { | |||
340 | bar->config->mode = strdup(change); | 352 | bar->config->mode = strdup(change); |
341 | } | 353 | } |
342 | } else { | 354 | } else { |
343 | wlr_log(L_ERROR, "failed to parse response"); | 355 | wlr_log(WLR_ERROR, "failed to parse response"); |
344 | json_object_put(result); | 356 | json_object_put(result); |
345 | free_ipc_response(resp); | 357 | free_ipc_response(resp); |
346 | return false; | 358 | return false; |