diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-07-30 23:28:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-30 23:28:02 -0400 |
| commit | 44a4905466599155fb7203a585dfca1ce1720b33 (patch) | |
| tree | a7acb9aab8520040d49be04184d70984a66b95e7 /include | |
| parent | 2e4ece65da7e2afe5da1d3347c88bda48b1efa90 (diff) | |
| parent | 98aa59fdda5fcc9a589e93f7c6ef40d3eaee3972 (diff) | |
Merge pull request #805 from zandrmartin/swaybg-solid-color
implement solid color rendering for swaybg
Diffstat (limited to 'include')
| -rw-r--r-- | include/bar/config.h | 6 | ||||
| -rw-r--r-- | include/config.h | 2 | ||||
| -rw-r--r-- | include/util.h | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/bar/config.h b/include/bar/config.h index c957caa7..934116ca 100644 --- a/include/bar/config.h +++ b/include/bar/config.h @@ -5,6 +5,7 @@ #include <stdbool.h> #include "list.h" +#include "util.h" /** * Colors for a box with background, border and text colors. @@ -48,11 +49,6 @@ struct config { }; /** - * Parse colors defined as hex string to uint32_t. - */ -uint32_t parse_color(const char *color); - -/** * Parse position top|bottom|left|right. */ uint32_t parse_position(const char *position); diff --git a/include/config.h b/include/config.h index 5e1c123e..56deaf01 100644 --- a/include/config.h +++ b/include/config.h @@ -81,7 +81,7 @@ struct output_config { int enabled; int width, height; int x, y; - int scale; + int scale; char *background; char *background_option; }; diff --git a/include/util.h b/include/util.h index 6f21bff0..e33a08f7 100644 --- a/include/util.h +++ b/include/util.h @@ -44,4 +44,10 @@ int get_modifier_names(const char **names, uint32_t modifier_masks); */ pid_t get_parent_pid(pid_t pid); +/** + * Given a string that represents an RGB(A) color, return a uint32_t + * version of the color. + */ +uint32_t parse_color(const char *color); + #endif |