change tabs to spaces
This commit is contained in:
Sascha Kruse
parent
2b383b0079
commit
48d95288a9
188
dunst.c
188
dunst.c
@ -891,15 +891,15 @@ dunst_ini_get_boolean(const char *value) {
|
|||||||
case 't':
|
case 't':
|
||||||
case 'T':
|
case 'T':
|
||||||
case '1':
|
case '1':
|
||||||
return True;
|
return True;
|
||||||
case 'n':
|
case 'n':
|
||||||
case 'N':
|
case 'N':
|
||||||
case 'f':
|
case 'f':
|
||||||
case 'F':
|
case 'F':
|
||||||
case '0':
|
case '0':
|
||||||
return False;
|
return False;
|
||||||
default:
|
default:
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -909,11 +909,11 @@ dunst_rules_find_or_create(const char *section) {
|
|||||||
rule_t *current_rule = rules, *last_rule;
|
rule_t *current_rule = rules, *last_rule;
|
||||||
|
|
||||||
while (current_rule && strcmp(current_rule->name, section) != 0) {
|
while (current_rule && strcmp(current_rule->name, section) != 0) {
|
||||||
current_rule = current_rule->next;
|
current_rule = current_rule->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (current_rule) {
|
if (current_rule) {
|
||||||
return current_rule;
|
return current_rule;
|
||||||
}
|
}
|
||||||
|
|
||||||
dunst_printf(DEBUG, "adding rule %s\n", section);
|
dunst_printf(DEBUG, "adding rule %s\n", section);
|
||||||
@ -923,14 +923,14 @@ dunst_rules_find_or_create(const char *section) {
|
|||||||
|
|
||||||
last_rule = rules;
|
last_rule = rules;
|
||||||
while (last_rule && last_rule->next) {
|
while (last_rule && last_rule->next) {
|
||||||
last_rule = last_rule->next;
|
last_rule = last_rule->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (last_rule == NULL) {
|
if (last_rule == NULL) {
|
||||||
last_rule = current_rule;
|
last_rule = current_rule;
|
||||||
rules = last_rule;
|
rules = last_rule;
|
||||||
} else {
|
} else {
|
||||||
last_rule->next = current_rule;
|
last_rule->next = current_rule;
|
||||||
}
|
}
|
||||||
|
|
||||||
return current_rule;
|
return current_rule;
|
||||||
@ -942,110 +942,110 @@ dunst_ini_get_string(const char *value) {
|
|||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
if (value[0] == '"')
|
if (value[0] == '"')
|
||||||
s = strdup(value + 1);
|
s = strdup(value + 1);
|
||||||
else
|
else
|
||||||
s = strdup(value);
|
s = strdup(value);
|
||||||
|
|
||||||
if (s[strlen(s) - 1] == '"')
|
if (s[strlen(s) - 1] == '"')
|
||||||
s[strlen(s) - 1] = '\0';
|
s[strlen(s) - 1] = '\0';
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
dunst_ini_handle(void *user_data, const char *section,
|
dunst_ini_handle(void *user_data, const char *section,
|
||||||
const char *name, const char *value) {
|
const char *name, const char *value) {
|
||||||
|
|
||||||
if (strcmp(section, "global") == 0) {
|
if (strcmp(section, "global") == 0) {
|
||||||
if (strcmp(name, "font") == 0)
|
if (strcmp(name, "font") == 0)
|
||||||
font = dunst_ini_get_string(value);
|
font = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "format") == 0)
|
else if (strcmp(name, "format") == 0)
|
||||||
format = dunst_ini_get_string(value);
|
format = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "sort") == 0)
|
else if (strcmp(name, "sort") == 0)
|
||||||
sort = dunst_ini_get_boolean(value);
|
sort = dunst_ini_get_boolean(value);
|
||||||
else if (strcmp(name, "indicate_hidden") == 0)
|
else if (strcmp(name, "indicate_hidden") == 0)
|
||||||
indicate_hidden = dunst_ini_get_boolean(value);
|
indicate_hidden = dunst_ini_get_boolean(value);
|
||||||
else if (strcmp(name, "key") == 0)
|
else if (strcmp(name, "key") == 0)
|
||||||
key_string = dunst_ini_get_string(value);
|
key_string = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "history_key") == 0)
|
else if (strcmp(name, "history_key") == 0)
|
||||||
history_key_string = dunst_ini_get_string(value);
|
history_key_string = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "geometry") == 0) {
|
else if (strcmp(name, "geometry") == 0) {
|
||||||
geom = dunst_ini_get_string(value);
|
geom = dunst_ini_get_string(value);
|
||||||
geometry.mask = XParseGeometry(geom,
|
geometry.mask = XParseGeometry(geom,
|
||||||
&geometry.x, &geometry.y,
|
&geometry.x, &geometry.y,
|
||||||
&geometry.w, &geometry.h);
|
&geometry.w, &geometry.h);
|
||||||
} else if (strcmp(name, "modifier") == 0) {
|
} else if (strcmp(name, "modifier") == 0) {
|
||||||
char *mod = dunst_ini_get_string(value);
|
char *mod = dunst_ini_get_string(value);
|
||||||
|
|
||||||
if (mod == NULL) {
|
if (mod == NULL) {
|
||||||
mask = 0;
|
mask = 0;
|
||||||
} else if (!strcmp(mod, "ctrl")) {
|
} else if (!strcmp(mod, "ctrl")) {
|
||||||
mask = ControlMask;
|
mask = ControlMask;
|
||||||
} else if (!strcmp(mod, "mod4")) {
|
} else if (!strcmp(mod, "mod4")) {
|
||||||
mask = Mod4Mask;
|
mask = Mod4Mask;
|
||||||
} else if (!strcmp(mod, "mod3")) {
|
} else if (!strcmp(mod, "mod3")) {
|
||||||
mask = Mod3Mask;
|
mask = Mod3Mask;
|
||||||
} else if (!strcmp(mod, "mod2")) {
|
} else if (!strcmp(mod, "mod2")) {
|
||||||
mask = Mod2Mask;
|
mask = Mod2Mask;
|
||||||
} else if (!strcmp(mod, "mod1")) {
|
} else if (!strcmp(mod, "mod1")) {
|
||||||
mask = Mod1Mask;
|
mask = Mod1Mask;
|
||||||
} else {
|
} else {
|
||||||
mask = 0;
|
mask = 0;
|
||||||
}
|
}
|
||||||
free (mod);
|
free (mod);
|
||||||
}
|
}
|
||||||
} else if (strcmp(section, "urgency_low") == 0) {
|
} else if (strcmp(section, "urgency_low") == 0) {
|
||||||
if (strcmp(name, "background") == 0)
|
if (strcmp(name, "background") == 0)
|
||||||
lowbgcolor = dunst_ini_get_string(value);
|
lowbgcolor = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "foreground") == 0)
|
else if (strcmp(name, "foreground") == 0)
|
||||||
lowfgcolor = dunst_ini_get_string(value);
|
lowfgcolor = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "timeout") == 0)
|
else if (strcmp(name, "timeout") == 0)
|
||||||
timeouts[LOW] = atoi(value);
|
timeouts[LOW] = atoi(value);
|
||||||
} else if (strcmp(section, "urgency_normal") == 0) {
|
} else if (strcmp(section, "urgency_normal") == 0) {
|
||||||
if (strcmp(name, "background") == 0)
|
if (strcmp(name, "background") == 0)
|
||||||
normbgcolor = dunst_ini_get_string(value);
|
normbgcolor = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "foreground") == 0)
|
else if (strcmp(name, "foreground") == 0)
|
||||||
normfgcolor = dunst_ini_get_string(value);
|
normfgcolor = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "timeout") == 0)
|
else if (strcmp(name, "timeout") == 0)
|
||||||
timeouts[NORM] = atoi(value);
|
timeouts[NORM] = atoi(value);
|
||||||
} else if (strcmp(section, "urgency_critical") == 0) {
|
} else if (strcmp(section, "urgency_critical") == 0) {
|
||||||
if (strcmp(name, "background") == 0)
|
if (strcmp(name, "background") == 0)
|
||||||
critbgcolor = dunst_ini_get_string(value);
|
critbgcolor = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "foreground") == 0)
|
else if (strcmp(name, "foreground") == 0)
|
||||||
critfgcolor = dunst_ini_get_string(value);
|
critfgcolor = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "timeout") == 0)
|
else if (strcmp(name, "timeout") == 0)
|
||||||
timeouts[CRIT] = atoi(value);
|
timeouts[CRIT] = atoi(value);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
rule_t *current_rule = dunst_rules_find_or_create(section);
|
rule_t *current_rule = dunst_rules_find_or_create(section);
|
||||||
|
|
||||||
if (strcmp(name, "appname") == 0)
|
if (strcmp(name, "appname") == 0)
|
||||||
current_rule->appname = dunst_ini_get_string(value);
|
current_rule->appname = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "summary") == 0)
|
else if (strcmp(name, "summary") == 0)
|
||||||
current_rule->summary = dunst_ini_get_string(value);
|
current_rule->summary = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "body") == 0)
|
else if (strcmp(name, "body") == 0)
|
||||||
current_rule->body = dunst_ini_get_string(value);
|
current_rule->body = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "icon") == 0)
|
else if (strcmp(name, "icon") == 0)
|
||||||
current_rule->icon = dunst_ini_get_string(value);
|
current_rule->icon = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "timeout") == 0)
|
else if (strcmp(name, "timeout") == 0)
|
||||||
current_rule->timeout = atoi(value);
|
current_rule->timeout = atoi(value);
|
||||||
else if (strcmp(name, "urgency") == 0) {
|
else if (strcmp(name, "urgency") == 0) {
|
||||||
const char *urg = value;
|
const char *urg = value;
|
||||||
|
|
||||||
if (strcmp(urg, "low") == 0)
|
if (strcmp(urg, "low") == 0)
|
||||||
current_rule->urgency = LOW;
|
current_rule->urgency = LOW;
|
||||||
else if (strcmp(urg, "normal") == 0)
|
else if (strcmp(urg, "normal") == 0)
|
||||||
current_rule->urgency = NORM;
|
current_rule->urgency = NORM;
|
||||||
else if (strcmp(urg, "critical") == 0)
|
else if (strcmp(urg, "critical") == 0)
|
||||||
current_rule->urgency = CRIT;
|
current_rule->urgency = CRIT;
|
||||||
else
|
else
|
||||||
fprintf(stderr, "unknown urgency: %s, ignoring\n", urg);
|
fprintf(stderr, "unknown urgency: %s, ignoring\n", urg);
|
||||||
} else if (strcmp(name, "foreground") == 0)
|
} else if (strcmp(name, "foreground") == 0)
|
||||||
current_rule->fg = dunst_ini_get_string(value);
|
current_rule->fg = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "background") == 0)
|
else if (strcmp(name, "background") == 0)
|
||||||
current_rule->bg = dunst_ini_get_string(value);
|
current_rule->bg = dunst_ini_get_string(value);
|
||||||
else if (strcmp(name, "format") == 0)
|
else if (strcmp(name, "format") == 0)
|
||||||
current_rule->format = dunst_ini_get_string(value);
|
current_rule->format = dunst_ini_get_string(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user