use #rgba instead of #argb for colors definition (#79)

fixes #70

Co-authored-by: bretello <[email protected]>

Author: boredland

main.c

@@ -16,7 +16,7 @@
 #define STR(x) #x
 
 // sizeof already includes NULL byte
-#define INPUT_BUFFER_LENGTH (3 * sizeof(unsigned long) + sizeof(" #FF000000 #FFFFFFFF #FFFFFFFF\n"))
+#define INPUT_BUFFER_LENGTH (3 * sizeof(unsigned long) + sizeof(" #000000FF #FFFFFFFF #FFFFFFFF\n"))
 
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 
@@ -511,13 +511,13 @@ main(int argc, char **argv)
 		"  -M, --margin <px>                   Define anchor margin in pixels, defaults to " STR(WOB_DEFAULT_MARGIN) ". \n"
 		"  -O, --output <name>                 Define output to show bar on or '*' for all. If ommited, focused output is chosen.\n"
 		"                                      May be specified multiple times.\n"
-		"  --border-color <#argb>              Define border color\n"
-		"  --background-color <#argb>          Define background color\n"
-		"  --bar-color <#argb>                 Define bar color\n"
+		"  --border-color <#rgba>              Define border color\n"
+		"  --background-color <#rgba>          Define background color\n"
+		"  --bar-color <#rgba>                 Define bar color\n"
 		"  --overflow-mode <mode>              Change the overflow behavior. Valid options are `none`, `wrap` (default), and `nowrap`.\n"
-		"  --overflow-bar-color <#argb>        Define bar color when overflowed\n"
-		"  --overflow-border-color <#argb>     Define the border color when overflowed\n"
-		"  --overflow-background-color <#argb> Define the background color when overflowed\n"
+		"  --overflow-bar-color <#rgba>        Define bar color when overflowed\n"
+		"  --overflow-border-color <#rgba>     Define the border color when overflowed\n"
+		"  --overflow-background-color <#rgba> Define the background color when overflowed\n"
 		"\n";
 
 	struct wob app = {0};

parse.c

@@ -27,10 +27,10 @@ wob_parse_color(const char *restrict str, char **restrict str_end, struct wob_co
 	}
 
 	*color = (struct wob_color){
-		.a = (float) parts[0] / UINT8_MAX,
 		.r = (float) parts[1] / UINT8_MAX,
 		.g = (float) parts[2] / UINT8_MAX,
 		.b = (float) parts[3] / UINT8_MAX,
+		.a = (float) parts[0] / UINT8_MAX,
 	};
 
 	if (str_end) {

tests/wob_parse_input.c

@@ -22,7 +22,7 @@ main(int argc, char **argv)
 	}
 
 	printf("running 2\n");
-	input = "25 #FF000000\n";
+	input = "25 #000000FF\n";
 	result = wob_parse_input(input, &percentage, &background, &border, &bar);
 	if (result) {
 		return EXIT_FAILURE;

wob.1.scd

@@ -55,13 +55,13 @@ wob is a lightweight overlay volume/backlight/progress/anything bar for Wayland.
 	Define output to show bar on or '\*' for all. If ommited, focused output is chosen.
 	May be specified multiple times.
 
-*--border-color* <#AARRGGBB>
+*--border-color* <#RRGGBBAA>
 	Define border color, defaults to #FFFFFFFF.
 
-*--background-color* <#AARRGGBB>
-	Define background color, defaults to #FF000000.
+*--background-color* <#RRGGBBAA>
+	Define background color, defaults to #000000FF.
 
-*--bar-color* <#AARRGGBB>
+*--bar-color* <#RRGGBBAA>
 	Define bar color, defaults to #FFFFFFFF.
 
 *--overflow-mode <mode>*
@@ -86,7 +86,7 @@ or
 
 <value> <#background_color> <#border_color> <#bar_color>
 
-Where <value> is number in interval from 0 to *--max* and <#\*color> is color in #AARRGGBB format.
+Where <value> is number in interval from 0 to *--max* and <#\*color> is color in #RRGGBBAA format.
 
 # ENVIRONMENT