mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-04 06:46:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix icon.c and tray/tray.c rendering

Browse source
This commit is contained in:
Calvin Lee 2018-04-03 20:39:04 -06:00
parent a568637a45
commit 339149807f
5 changed files with 70 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

102
swaybar/tray/icon.c
View file

@ -16,50 +16,6 @@
#include "stringop.h"
#include "log.h"
/* Finds all themes that the given theme inherits */
static list_t *find_inherits(const char *theme_dir) {
const char inherits[] = "Inherits";
const char index_name[] = "/index.theme";
list_t *themes = create_list();
FILE *index = NULL;
char *path = malloc(strlen(theme_dir) + sizeof(index_name));
if (!path) {
goto fail;
}
if (!themes) {
goto fail;
}
strcpy(path, theme_dir);
strcat(path, index_name);
index = fopen(path, "r");
if (!index) {
goto fail;
}
char *buf = NULL;
size_t n = 0;
while (!feof(index) && getline(&buf, &n, index) != -1) {
if (n <= sizeof(inherits) + 1) {
continue;
}
if (strncmp(inherits, buf, sizeof(inherits) - 1) == 0) {
char *themestr = buf + sizeof(inherits);
themes = split_string(themestr, ",");
break;
}
}
free(buf);
fail:
free(path);
if (index) {
fclose(index);
}
return themes;
}
static bool isdir(const char *path) {
struct stat statbuf;
if (stat(path, &statbuf) != -1) {
@ -161,6 +117,64 @@ fail:
return NULL;
}
/* Finds all themes that the given theme inherits */
static list_t *find_inherits(const char *theme_dir) {
const char inherits[] = "Inherits";
const char index_name[] = "/index.theme";
list_t *themes = create_list();
FILE *index = NULL;
char *path = malloc(strlen(theme_dir) + sizeof(index_name));
if (!path) {
goto fail;
}
if (!themes) {
goto fail;
}
strcpy(path, theme_dir);
strcat(path, index_name);
index = fopen(path, "r");
if (!index) {
goto fail;
}
char *buf = NULL;
char *themestr = NULL;
size_t n = 0;
while (!feof(index) && getline(&buf, &n, index) != -1) {
if (n <= sizeof(inherits) + 1) {
continue;
}
if (strncmp(inherits, buf, sizeof(inherits) - 1) == 0) {
themestr = buf + sizeof(inherits);
int len = strlen(themestr);
if (themestr[len-1] == '\n') {
themestr[len-1] = '\0';
}
break;
}
}
if (themestr) {
char *token = strtok(themestr, ",");
while(token) {
char *dir = find_theme_dir(token);
if (dir) {
list_add(themes,dir);
}
token = strtok(NULL, ",");
}
}
free(buf);
fail:
free(path);
if (index) {
fclose(index);
}
return themes;
}
/**
* Returns all theme dirs needed to be looked in for an icon.
* Does not check for duplicates