mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-07-05 00:06:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 090e5181d5 into d81ca73ea1

Browse source
This commit is contained in:
Pasha49 2026-06-16 00:10:56 +02:00 • committed by GitHub
commit 96a5b1c9f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 89 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/config/parse_config.h
View file

@ -344,6 +344,14 @@ typedef struct {
float globalcolor[4];
float overlaycolor[4];
float default_focuscolor[4];
float xkb_layout_focuscolors[8][4];
int32_t xkb_layout_focuscolors_count;
float default_bordercolor[4];
float xkb_layout_bordercolors[8][4];
int32_t xkb_layout_bordercolors_count;
int32_t log_level;
uint32_t capslock;
@ -1838,7 +1846,22 @@ bool parse_option(Config *config, char *key, char *value) {
return false;
} else {
convert_hex_to_rgba(config->bordercolor, color);
memcpy(config->default_bordercolor, config->bordercolor, sizeof(config->bordercolor));
}
} else if (strcmp(key, "xkb_layout_bordercolors") == 0) {
char *value_copy = strdup(value);
char *token = strtok(value_copy, ",");
config->xkb_layout_bordercolors_count = 0;
while (token != NULL && config->xkb_layout_bordercolors_count < 8) {
trim_whitespace(token);
int64_t color = parse_color(token);
if (color != -1) {
convert_hex_to_rgba(config->xkb_layout_bordercolors[config->xkb_layout_bordercolors_count], color);
config->xkb_layout_bordercolors_count++;
}
token = strtok(NULL, ",");
}
free(value_copy);
} else if (strcmp(key, "dropcolor") == 0) {
int64_t color = parse_color(value);
if (color == -1) {
@ -1871,7 +1894,22 @@ bool parse_option(Config *config, char *key, char *value) {
return false;
} else {
convert_hex_to_rgba(config->focuscolor, color);
memcpy(config->default_focuscolor, config->focuscolor, sizeof(config->focuscolor));
}
} else if (strcmp(key, "xkb_layout_focuscolors") == 0) {
char *value_copy = strdup(value);
char *token = strtok(value_copy, ",");
config->xkb_layout_focuscolors_count = 0;
while (token != NULL && config->xkb_layout_focuscolors_count < 8) {
trim_whitespace(token);
int64_t color = parse_color(token);
if (color != -1) {
convert_hex_to_rgba(config->xkb_layout_focuscolors[config->xkb_layout_focuscolors_count], color);
config->xkb_layout_focuscolors_count++;
}
token = strtok(NULL, ",");
}
free(value_copy);
} else if (strcmp(key, "maximizescreencolor") == 0) {
int64_t color = parse_color(value);
if (color == -1) {
@ -3653,6 +3691,9 @@ void set_value_default() {
config.overlaycolor[1] = 0xa5 / 255.0f;
config.overlaycolor[2] = 0x7c / 255.0f;
config.overlaycolor[3] = 1.0f;
memcpy(config.default_focuscolor, config.focuscolor, sizeof(config.focuscolor));
memcpy(config.default_bordercolor, config.bordercolor, sizeof(config.bordercolor));
}
void set_default_key_bindings(Config *config) {