diff options
author | Calvin Lee <cyrus296@gmail.com> | 2017-06-07 16:45:28 -0700 |
---|---|---|
committer | Calvin Lee <cyrus296@gmail.com> | 2017-06-07 17:49:16 -0700 |
commit | 843ad38b3c427adb0bf319e9613d9813c8d9246c (patch) | |
tree | e02a5b06e2b6923371fd53724791c147c18a1fa4 /wayland | |
parent | Merge pull request #1232 from johalun/master-freebsd (diff) | |
download | sway-843ad38b3c427adb0bf319e9613d9813c8d9246c.tar.gz sway-843ad38b3c427adb0bf319e9613d9813c8d9246c.tar.zst sway-843ad38b3c427adb0bf319e9613d9813c8d9246c.zip |
Implement Tray Icons
This commit implements the StatusNotifierItem protocol, and enables
swaybar to show tray icons. It also uses `xembedsniproxy` in order to
communicate with xembed applications.
The tray is completely optional, and can be disabled on compile time
with the `enable-tray` option. Or on runtime with the bar config option
`tray_output none`.
Overview of changes:
In swaybar very little is changed outside the tray subfolder except
that all events are now polled in `event_loop.c`, this creates no
functional difference.
Six bar configuration options were added, these are detailed in
sway-bar(5)
The tray subfolder is where all protocol implementation takes place and
is organised as follows:
tray/sni_watcher.c:
This file contains the StatusNotifierWatcher. It keeps track of
items and hosts and reports when they come or go.
tray/tray.c
This file contains the StatusNotifierHost. It keeps track of
sway's version of the items and represents the tray itself.
tray/sni.c
This file contains the StatusNotifierItem struct and all
communication with individual items.
tray/icon.c
This file implements the icon theme protocol. It allows for
finding icons by name, rather than by pixmap.
tray/dbus.c
This file allows for asynchronous DBus communication.
See #986 #343
Diffstat (limited to 'wayland')
-rw-r--r-- | wayland/cairo.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/wayland/cairo.c b/wayland/cairo.c index ba439d9d..193205b1 100644 --- a/wayland/cairo.c +++ b/wayland/cairo.c | |||
@@ -8,6 +8,25 @@ void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { | |||
8 | (color >> (0*8) & 0xFF) / 255.0); | 8 | (color >> (0*8) & 0xFF) / 255.0); |
9 | } | 9 | } |
10 | 10 | ||
11 | cairo_surface_t *cairo_image_surface_scale(cairo_surface_t *image, int width, int height) { | ||
12 | int image_width = cairo_image_surface_get_width(image); | ||
13 | int image_height = cairo_image_surface_get_height(image); | ||
14 | |||
15 | cairo_surface_t *new = | ||
16 | cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); | ||
17 | |||
18 | cairo_t *cairo = cairo_create(new); | ||
19 | |||
20 | cairo_scale(cairo, (double) width / image_width, (double) height / image_height); | ||
21 | |||
22 | cairo_set_source_surface(cairo, image, 0, 0); | ||
23 | cairo_paint(cairo); | ||
24 | |||
25 | cairo_destroy(cairo); | ||
26 | |||
27 | return new; | ||
28 | } | ||
29 | |||
11 | #ifdef WITH_GDK_PIXBUF | 30 | #ifdef WITH_GDK_PIXBUF |
12 | #include <gdk-pixbuf/gdk-pixbuf.h> | 31 | #include <gdk-pixbuf/gdk-pixbuf.h> |
13 | 32 | ||