labnag: rename options for color

diff --git a/clients/labnag.c b/clients/labnag.c
index bea25dd1224ca9614ca9f5b6b3e9d5a04e479ca2..23e0be1f21a6b2ea0f08461a4be4a5dc1c2dbdf4 100644 (file)
--- a/clients/labnag.c
+++ b/clients/labnag.c
@@ -45,7 +45,7 @@ struct conf {
        uint32_t details_background;
        uint32_t background;
        uint32_t text;
-       uint32_t border;
+       uint32_t button_border;
        uint32_t border_bottom;
 
        /* Sizing */
@@ -429,7 +429,7 @@ render_button(cairo_t *cairo, struct nag *nag, struct button *button, int *x)
        button->width = text_width + padding * 2;
        button->height = text_height + padding * 2;
 
-       cairo_set_source_u32(cairo, nag->conf->border);
+       cairo_set_source_u32(cairo, nag->conf->button_border);
        cairo_rectangle(cairo, button->x - border, button->y - border,
                        button->width + border * 2, button->height + border * 2);
        cairo_fill(cairo);
@@ -1255,7 +1255,7 @@ conf_init(struct conf *conf)
        conf->background = 0x323232FF;
        conf->text = 0xFFFFFFFF;
        conf->button_text = 0xFFFFFFFF;
-       conf->border = 0x222222FF;
+       conf->button_border = 0x222222FF;
        conf->border_bottom = 0x444444FF;
        conf->bar_border_thickness = 2;
        conf->message_padding = 8;
@@ -1270,7 +1270,7 @@ conf_init(struct conf *conf)
        conf->background = 0x900000FF;
        conf->text = 0xFFFFFFFF;
        conf->button_text = 0xFFFFFFFF;
-       conf->border = 0xD92424FF;
+       conf->button_border = 0xD92424FF;
        conf->border_bottom = 0x470909FF;
 }
 
@@ -1342,9 +1342,9 @@ nag_parse_options(int argc, char **argv, struct nag *nag,
 {
        enum type_options {
                TO_COLOR_BACKGROUND = 256,
-               TO_COLOR_BORDER,
+               TO_COLOR_BUTTON_BORDER,
                TO_COLOR_BORDER_BOTTOM,
-               TO_COLOR_BUTTON,
+               TO_COLOR_BUTTON_BG,
                TO_COLOR_DETAILS,
                TO_COLOR_TEXT,
                TO_COLOR_BUTTON_TEXT,
@@ -1373,16 +1373,16 @@ nag_parse_options(int argc, char **argv, struct nag *nag,
                {"timeout", required_argument, NULL, 't'},
                {"version", no_argument, NULL, 'v'},
 
-               {"background", required_argument, NULL, TO_COLOR_BACKGROUND},
-               {"border", required_argument, NULL, TO_COLOR_BORDER},
-               {"border-bottom", required_argument, NULL, TO_COLOR_BORDER_BOTTOM},
-               {"button-background", required_argument, NULL, TO_COLOR_BUTTON},
-               {"text", required_argument, NULL, TO_COLOR_TEXT},
-               {"button-text", required_argument, NULL, TO_COLOR_BUTTON_TEXT},
+               {"background-color", required_argument, NULL, TO_COLOR_BACKGROUND},
+               {"button-border-color", required_argument, NULL, TO_COLOR_BUTTON_BORDER},
+               {"border-bottom-color", required_argument, NULL, TO_COLOR_BORDER_BOTTOM},
+               {"button-background-color", required_argument, NULL, TO_COLOR_BUTTON_BG},
+               {"text-color", required_argument, NULL, TO_COLOR_TEXT},
+               {"button-text-color", required_argument, NULL, TO_COLOR_BUTTON_TEXT},
                {"border-bottom-size", required_argument, NULL, TO_THICK_BAR_BORDER},
                {"message-padding", required_argument, NULL, TO_PADDING_MESSAGE},
                {"details-border-size", required_argument, NULL, TO_THICK_DET_BORDER},
-               {"details-background", required_argument, NULL, TO_COLOR_DETAILS},
+               {"details-background-color", required_argument, NULL, TO_COLOR_DETAILS},
                {"button-border-size", required_argument, NULL, TO_THICK_BTN_BORDER},
                {"button-gap", required_argument, NULL, TO_GAP_BTN},
                {"button-dismiss-gap", required_argument, NULL, TO_GAP_BTN_DISMISS},
@@ -1413,21 +1413,23 @@ nag_parse_options(int argc, char **argv, struct nag *nag,
                "  -v, --version                   Show the version number and quit.\n"
                "\n"
                "The following appearance options can also be given:\n"
-               "  --background RRGGBB[AA]         Background color.\n"
-               "  --border RRGGBB[AA]             Border color.\n"
-               "  --border-bottom RRGGBB[AA]      Bottom border color.\n"
-               "  --button-background RRGGBB[AA]  Button background color.\n"
-               "  --text RRGGBB[AA]               Text color.\n"
-               "  --button-text RRGGBB[AA]        Button text color.\n"
-               "  --border-bottom-size size       Thickness of the bar border.\n"
-               "  --message-padding padding       Padding for the message.\n"
-               "  --details-border-size size      Thickness for the details border.\n"
-               "  --details-background RRGGBB[AA] Details background color.\n"
-               "  --button-border-size size       Thickness for the button border.\n"
-               "  --button-gap gap                Size of the gap between buttons\n"
-               "  --button-dismiss-gap gap        Size of the gap for dismiss button.\n"
-               "  --button-margin-right margin    Margin from dismiss button to edge.\n"
-               "  --button-padding padding        Padding for the button text.\n";
+               "  --background-color RRGGBB[AA]    Background color.\n"
+               "  --button-border-color RRGGBB[AA] Button border color.\n"
+               "  --border-bottom-color RRGGBB[AA] Bottom border color.\n"
+               "  --button-background-color RRGGBB[AA]\n"
+               "                                   Button background color.\n"
+               "  --text-color RRGGBB[AA]          Text color.\n"
+               "  --button-text-color RRGGBB[AA]   Button text color.\n"
+               "  --border-bottom-size size        Thickness of the bar border.\n"
+               "  --message-padding padding        Padding for the message.\n"
+               "  --details-border-size size       Thickness for the details border.\n"
+               "  --details-background-color RRGGBB[AA]\n"
+               "                                   Details background color.\n"
+               "  --button-border-size size        Thickness for the button border.\n"
+               "  --button-gap gap                 Size of the gap between buttons\n"
+               "  --button-dismiss-gap gap         Size of the gap for dismiss button.\n"
+               "  --button-margin-right margin     Margin from dismiss button to edge.\n"
+               "  --button-padding padding         Padding for the button text.\n";
 
        optind = 1;
        while (1) {
@@ -1522,8 +1524,8 @@ nag_parse_options(int argc, char **argv, struct nag *nag,
                                fprintf(stderr, "Invalid background color: %s\n", optarg);
                        }
                        break;
-               case TO_COLOR_BORDER: /* Border color */
-                       if (!parse_color(optarg, &conf->border)) {
+               case TO_COLOR_BUTTON_BORDER: /* Border color */
+                       if (!parse_color(optarg, &conf->button_border)) {
                                fprintf(stderr, "Invalid border color: %s\n", optarg);
                        }
                        break;
@@ -1532,7 +1534,7 @@ nag_parse_options(int argc, char **argv, struct nag *nag,
                                fprintf(stderr, "Invalid border bottom color: %s\n", optarg);
                        }
                        break;
-               case TO_COLOR_BUTTON: /* Button background color */
+               case TO_COLOR_BUTTON_BG: /* Button background color */
                        if (!parse_color(optarg, &conf->button_background)) {
                                fprintf(stderr, "Invalid button background color: %s\n", optarg);
                        }

diff --git a/docs/labnag.1.scd b/docs/labnag.1.scd
index 8ff5fe180ec7a4b7d8c5f11a026e82f723ccc960..c8aa4d094274087dc423ecdcb09088e2f355fdaf 100644 (file)
--- a/docs/labnag.1.scd
+++ b/docs/labnag.1.scd
@@ -62,22 +62,22 @@ _labnag_ [options...]
 
 # APPEARANCE OPTIONS
 
-*--background* <RRGGBB[AA]>
+*--background-color* <RRGGBB[AA]>
        Set the color of the background.
 
-*--border* <RRGGBB[AA]>
-       Set the color of the border.
+*--button-border-color* <RRGGBB[AA]>
+       Set the color of the button border.
 
-*--border-bottom* <RRGGBB[AA]>
+*--border-bottom-color* <RRGGBB[AA]>
        Set the color of the bottom border.
 
-*--button-background* <RRGGBB[AA]>
+*--button-background-color* <RRGGBB[AA]>
        Set the color for the background for buttons.
 
-*--text* <RRGGBB[AA]>
+*--text-color* <RRGGBB[AA]>
        Set the text color.
 
-*--button-text* <RRGGBB[AA]>
+*--button-text-color* <RRGGBB[AA]>
        Set the button text color.
 
 *--border-bottom-size* <size>
@@ -86,7 +86,7 @@ _labnag_ [options...]
 *--message-padding* <padding>
        Set the padding for the message.
 
-*--details-background* <RRGGBB[AA]>
+*--details-background-color* <RRGGBB[AA]>
        Set the color for the background for details.
 
 *--details-border-size* <size>
@@ -126,11 +126,11 @@ labnag \\
  -Z "Hibernate" "systemctl hibernate"\\
  -Z " Suspend " "systemctl suspend"\\
  -Z " Cancel  "\\
- --background 00ffff\\
- --button-background 00ffff\\
- --border 00ccccaa\\
- --text 000000\\
- --button-text 000000\\
+ --background-color 00ffff\\
+ --button-background-color 00ffff\\
+ --button-border-color 00ccccaa\\
+ --text-color 000000\\
+ --button-text-color 000000\\
  --button-gap 8\\
  --button-margin-right 0\\
  --button-padding 5\\

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 52cd96382bfb9186569e2c35372997a9776d8689..d389c4cfaf3d1698afa0644ae7b9c00546221ed4 100644 (file)
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -283,12 +283,12 @@ this is for compatibility with Openbox.
                --message '%m' \\
                --button-dismiss '%n' \\
                --button-dismiss '%y' \\
-               --background '%b' \\
-               --text '%t' \\
-               --border '%t' \\
-               --border-bottom '%t' \\
-               --button-background '%b' \\
-               --button-text '%t' \\
+               --background-color '%b' \\
+               --text-color '%t' \\
+               --button-border-color '%t' \\
+               --border-bottom-color '%t' \\
+               --button-background-color '%b' \\
+               --button-text-color '%t' \\
                --border-bottom-size 1 \\
                --button-border-size 3 \\
                --timeout 0

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 9bf38941ee7a2762dd4b372d5110c14d656f1cd2..1353b3c22aad0616983633fa9c338dbec9138de5 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -1634,12 +1634,12 @@ post_processing(void)
                                "--message '%m' "
                                "--button-dismiss '%n' "
                                "--button-dismiss '%y' "
-                               "--background '%b' "
-                               "--text '%t' "
-                               "--border '%t' "
-                               "--border-bottom '%t' "
-                               "--button-background '%b' "
-                               "--button-text '%t' "
+                               "--background-color '%b' "
+                               "--text-color '%t' "
+                               "--button-border-color '%t' "
+                               "--border-bottom-color '%t' "
+                               "--button-background-color '%b' "
+                               "--button-text-color '%t' "
                                "--border-bottom-size 1 "
                                "--button-border-size 3 "
                                "--timeout 0");