Fix some colour settings in swaybar #965
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
November 2, 2016 18:58
If these aren't defined in config, color settings without 'focused_' prefix are used as a fallback.
ddevault
reviewed
Nov 2, 2016
|
|
||
| bool has_binding_mode_border; | ||
| bool has_binding_mode_bg; | ||
| bool has_binding_mode_text; |
There was a problem hiding this comment.
Is there any way we could encode these into the char arrays? i.e. "inherit" or something.
mikkeloscar
reviewed
Nov 2, 2016
| json_object_object_add(colors, "binding_mode_border", json_object_new_string(bar->colors.binding_mode_border)); | ||
| } else { | ||
| json_object_object_add(colors, "binding_mode_border", json_object_new_string(bar->colors.urgent_workspace_border)); | ||
| } |
There was a problem hiding this comment.
Does i3 do this, or why would you fall back to urgent_workspace_border ?
There was a problem hiding this comment.
This commit removes has_* booleans from bar color struct. It also generalizes of functions in commands/bar/colors.c.
ddevault
reviewed
Nov 2, 2016
| // every color has 9 characters plus \0 | ||
| *name = malloc(10); | ||
| strcpy(*name, value); | ||
| } |
There was a problem hiding this comment.
How about just using strdup everywhere instead of this function?
|
Why not keep the static buffers? Is there any need for them to be dynamically allocated? |
|
Putting them on the heap is a bit cleaner imo |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should fix #932 - if binding_mode colours are not defined, use urgent_workspace colours as a fallback.
Three missing settings were also implemented: focused_(workspace|statusline|separator)
They provide different colours for swaybar on the focused output.