mirror of
https://github.com/swaywm/sway.git
synced 2026-04-17 06:46:32 -04:00
Finds paths to icon files using libsfdo. Libsfdo is currently an
optional compile time dependency. This means the former code paths are all retained and new ones are wrapped in #if HAVE_LIBSFDO. Behavior should be identical now between the two code paths. Later commits will add the handling of icons specified as absolute paths which both former swaybar code and libsfdo have thus far avoided.
This commit is contained in:
parent
3a21b8c6f1
commit
aeeb99c5a3
14 changed files with 220 additions and 93 deletions
|
|
@ -16,6 +16,10 @@ struct swaybar_tray;
|
|||
struct swaybar_workspace;
|
||||
struct loop;
|
||||
|
||||
#if HAVE_LIBSFDO
|
||||
struct sfdo;
|
||||
#endif
|
||||
|
||||
struct swaybar {
|
||||
char *id;
|
||||
char *mode;
|
||||
|
|
@ -50,6 +54,10 @@ struct swaybar {
|
|||
struct swaybar_tray *tray;
|
||||
#endif
|
||||
|
||||
#if HAVE_LIBSFDO
|
||||
struct sfdo *sfdo;
|
||||
#endif
|
||||
|
||||
bool running;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@
|
|||
#include "util.h"
|
||||
#include <pango/pangocairo.h>
|
||||
|
||||
#if HAVE_LIBSFDO
|
||||
#include "sfdo.h"
|
||||
#endif
|
||||
|
||||
struct box_colors {
|
||||
uint32_t border;
|
||||
uint32_t background;
|
||||
|
|
@ -68,13 +72,20 @@ struct swaybar_config {
|
|||
struct box_colors binding_mode;
|
||||
} colors;
|
||||
|
||||
#if HAVE_TRAY
|
||||
#if HAVE_TRAY || HAVE_LIBSFDO
|
||||
char *icon_theme;
|
||||
#endif
|
||||
|
||||
#if HAVE_TRAY
|
||||
struct wl_list tray_bindings; // struct tray_binding::link
|
||||
bool tray_hidden;
|
||||
list_t *tray_outputs; // char *
|
||||
int tray_padding;
|
||||
#endif
|
||||
|
||||
#if HAVE_LIBSFDO
|
||||
struct sfdo *sfdo;
|
||||
#endif
|
||||
};
|
||||
|
||||
#if HAVE_TRAY
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue