mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only strip comments at the start of a line

Browse source 
This is necessary because i3 config files use CSS notation for colors
(i.e. #rrggbb).
This commit is contained in:
Drew DeVault 2015-11-29 14:02:58 -05:00
parent ef91764bc7
commit 5a369b3132
2 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/stringop.c
View file

@ -10,7 +10,6 @@
const char whitespace[] = " \f\n\r\t\v"; const char whitespace[] = " \f\n\r\t\v";
/* Note: This returns 8 characters for trimmed_start per tab character. */
char *strip_whitespace(char *_str) { char *strip_whitespace(char *_str) {
if (*_str == '\0') if (*_str == '\0')
return _str; return _str;
@ -29,25 +28,6 @@ char *strip_whitespace(char *_str) {
return str; return str;
} }
char *strip_comments(char *str) {
int in_string = 0, in_character = 0;
int i = 0;
while (str[i] != '\0') {
if (str[i] == '"' && !in_character) {
in_string = !in_string;
} else if (str[i] == '\'' && !in_string) {
in_character = !in_character;
} else if (!in_character && !in_string) {
if (str[i] == '#') {
str[i] = '\0';
break;
}
}
++i;
}
return str;
}
void strip_quotes(char *str) { void strip_quotes(char *str) {
bool in_str = false; bool in_str = false;
bool in_chr = false; bool in_chr = false;

8
sway/config.c
View file

@ -207,7 +207,10 @@ bool read_config(FILE *file, bool is_active) {
while (!feof(file)) { while (!feof(file)) {
line = read_line(file); line = read_line(file);
line_number++; line_number++;
line = strip_comments(line); line = strip_whitespace(line);
if (line[0] == '#') {
continue;
}
struct cmd_results *res = config_command(line); struct cmd_results *res = config_command(line);
switch(res->status) { switch(res->status) {
case CMD_FAILURE: case CMD_FAILURE:
@ -261,8 +264,7 @@ bool read_config(FILE *file, bool is_active) {
return success; return success;
} }
int output_name_cmp(const void *item, const void *data) int output_name_cmp(const void *item, const void *data) {
{
const struct output_config *output = item; const struct output_config *output = item;
const char *name = data; const char *name = data;