diff options
author | Manuel Stoeckl <code@mstoeckl.com> | 2023-11-23 08:40:41 -0500 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2023-11-23 20:42:04 +0100 |
commit | e633fe0b4081f249e9708f95da972138c86838ca (patch) | |
tree | 383c7ca2d555353875787b8825c64ef5eb581b9f | |
parent | common: rename load_background_image to load_image (diff) | |
download | sway-e633fe0b4081f249e9708f95da972138c86838ca.tar.gz sway-e633fe0b4081f249e9708f95da972138c86838ca.tar.zst sway-e633fe0b4081f249e9708f95da972138c86838ca.zip |
common: move load_image to swaybar
swaynag, swaymsg, and sway do not use this function and are
unlikely to in the future.
-rw-r--r-- | common/meson.build | 2 | ||||
-rw-r--r-- | include/swaybar/image.h (renamed from include/background-image.h) | 4 | ||||
-rw-r--r-- | swaybar/image.c (renamed from common/background-image.c) | 2 | ||||
-rw-r--r-- | swaybar/meson.build | 1 | ||||
-rw-r--r-- | swaybar/tray/item.c | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/common/meson.build b/common/meson.build index 3756075a..c0ce1f68 100644 --- a/common/meson.build +++ b/common/meson.build | |||
@@ -1,7 +1,6 @@ | |||
1 | lib_sway_common = static_library( | 1 | lib_sway_common = static_library( |
2 | 'sway-common', | 2 | 'sway-common', |
3 | files( | 3 | files( |
4 | 'background-image.c', | ||
5 | 'cairo.c', | 4 | 'cairo.c', |
6 | 'gesture.c', | 5 | 'gesture.c', |
7 | 'ipc-client.c', | 6 | 'ipc-client.c', |
@@ -14,7 +13,6 @@ lib_sway_common = static_library( | |||
14 | ), | 13 | ), |
15 | dependencies: [ | 14 | dependencies: [ |
16 | cairo, | 15 | cairo, |
17 | gdk_pixbuf, | ||
18 | pango, | 16 | pango, |
19 | pangocairo, | 17 | pangocairo, |
20 | wayland_client.partial_dependency(compile_args: true) | 18 | wayland_client.partial_dependency(compile_args: true) |
diff --git a/include/background-image.h b/include/swaybar/image.h index 67c27c84..53a210dd 100644 --- a/include/background-image.h +++ b/include/swaybar/image.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _SWAY_BACKGROUND_IMAGE_H | 1 | #ifndef _SWAYBAR_IMAGE_H |
2 | #define _SWAY_BACKGROUND_IMAGE_H | 2 | #define _SWAYBAR_IMAGE_H |
3 | #include <cairo.h> | 3 | #include <cairo.h> |
4 | 4 | ||
5 | cairo_surface_t *load_image(const char *path); | 5 | cairo_surface_t *load_image(const char *path); |
diff --git a/common/background-image.c b/swaybar/image.c index 2df10dd2..ed24b9f9 100644 --- a/common/background-image.c +++ b/swaybar/image.c | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <assert.h> | 1 | #include <assert.h> |
2 | #include "background-image.h" | ||
3 | #include "config.h" | 2 | #include "config.h" |
4 | #include "log.h" | 3 | #include "log.h" |
4 | #include "swaybar/image.h" | ||
5 | 5 | ||
6 | #if HAVE_GDK_PIXBUF | 6 | #if HAVE_GDK_PIXBUF |
7 | #include <gdk-pixbuf/gdk-pixbuf.h> | 7 | #include <gdk-pixbuf/gdk-pixbuf.h> |
diff --git a/swaybar/meson.build b/swaybar/meson.build index e5f1811e..34bbdeea 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build | |||
@@ -26,6 +26,7 @@ executable( | |||
26 | 'bar.c', | 26 | 'bar.c', |
27 | 'config.c', | 27 | 'config.c', |
28 | 'i3bar.c', | 28 | 'i3bar.c', |
29 | 'image.c', | ||
29 | 'input.c', | 30 | 'input.c', |
30 | 'ipc.c', | 31 | 'ipc.c', |
31 | 'main.c', | 32 | 'main.c', |
diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c index c7938a35..d5fe50b1 100644 --- a/swaybar/tray/item.c +++ b/swaybar/tray/item.c | |||
@@ -7,12 +7,12 @@ | |||
7 | #include <string.h> | 7 | #include <string.h> |
8 | #include "swaybar/bar.h" | 8 | #include "swaybar/bar.h" |
9 | #include "swaybar/config.h" | 9 | #include "swaybar/config.h" |
10 | #include "swaybar/image.h" | ||
10 | #include "swaybar/input.h" | 11 | #include "swaybar/input.h" |
11 | #include "swaybar/tray/host.h" | 12 | #include "swaybar/tray/host.h" |
12 | #include "swaybar/tray/icon.h" | 13 | #include "swaybar/tray/icon.h" |
13 | #include "swaybar/tray/item.h" | 14 | #include "swaybar/tray/item.h" |
14 | #include "swaybar/tray/tray.h" | 15 | #include "swaybar/tray/tray.h" |
15 | #include "background-image.h" | ||
16 | #include "cairo_util.h" | 16 | #include "cairo_util.h" |
17 | #include "list.h" | 17 | #include "list.h" |
18 | #include "log.h" | 18 | #include "log.h" |