aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/client/cairo.h8
-rw-r--r--swaybg/CMakeLists.txt4
-rw-r--r--swaybg/main.c109
-rw-r--r--swaylock/main.c3
-rw-r--r--wayland/CMakeLists.txt3
-rw-r--r--wayland/cairo.c105
6 files changed, 123 insertions, 109 deletions
diff --git a/include/client/cairo.h b/include/client/cairo.h
new file mode 100644
index 00000000..98ced907
--- /dev/null
+++ b/include/client/cairo.h
@@ -0,0 +1,8 @@
1#ifndef _SWAY_CAIRO_H
2#define _SWAY_CAIRO_H
3
4#include <gdk-pixbuf/gdk-pixbuf.h>
5
6cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(const GdkPixbuf *gdkbuf);
7
8#endif
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt
index 2588f9e7..4dc961ff 100644
--- a/swaybg/CMakeLists.txt
+++ b/swaybg/CMakeLists.txt
@@ -2,8 +2,8 @@ include_directories(
2 ${PROTOCOLS_INCLUDE_DIRS} 2 ${PROTOCOLS_INCLUDE_DIRS}
3 ${WAYLAND_CLIENT_INCLUDE_DIR} 3 ${WAYLAND_CLIENT_INCLUDE_DIR}
4 ${CAIRO_INCLUDE_DIRS} 4 ${CAIRO_INCLUDE_DIRS}
5 ${GDK_PIXBUF_INCLUDE_DIRS}
6 ${PANGO_INCLUDE_DIRS} 5 ${PANGO_INCLUDE_DIRS}
6 ${GDK_PIXBUF_INCLUDE_DIRS}
7) 7)
8 8
9add_executable(swaybg 9add_executable(swaybg
@@ -16,8 +16,8 @@ target_link_libraries(swaybg
16 ${WAYLAND_CLIENT_LIBRARIES} 16 ${WAYLAND_CLIENT_LIBRARIES}
17 ${WAYLAND_CURSOR_LIBRARIES} 17 ${WAYLAND_CURSOR_LIBRARIES}
18 ${CAIRO_LIBRARIES} 18 ${CAIRO_LIBRARIES}
19 ${GDK_PIXBUF_LIBRARIES}
20 ${PANGO_LIBRARIES} 19 ${PANGO_LIBRARIES}
20 ${GDK_PIXBUF_LIBRARIES}
21 m 21 m
22) 22)
23 23
diff --git a/swaybg/main.c b/swaybg/main.c
index f21d9e05..6b81d97c 100644
--- a/swaybg/main.c
+++ b/swaybg/main.c
@@ -4,9 +4,9 @@
4#include <wayland-client.h> 4#include <wayland-client.h>
5#include <time.h> 5#include <time.h>
6#include <string.h> 6#include <string.h>
7#include <gdk-pixbuf/gdk-pixbuf.h>
8#include "client/window.h" 7#include "client/window.h"
9#include "client/registry.h" 8#include "client/registry.h"
9#include "client/cairo.h"
10#include "log.h" 10#include "log.h"
11#include "list.h" 11#include "list.h"
12 12
@@ -22,111 +22,6 @@ enum scaling_mode {
22 SCALING_MODE_TILE, 22 SCALING_MODE_TILE,
23}; 23};
24 24
25
26#ifndef GDK_PIXBUF_CHECK_VERSION
27#define GDK_PIXBUF_CHECK_VERSION(major,minor,micro) \
28 (GDK_PIXBUF_MAJOR > (major) || \
29 (GDK_PIXBUF_MAJOR == (major) && GDK_PIXBUF_MINOR > (minor)) || \
30 (GDK_PIXBUF_MAJOR == (major) && GDK_PIXBUF_MINOR == (minor) && \
31 GDK_PIXBUF_MICRO >= (micro)))
32#endif
33
34cairo_surface_t* __gdk_cairo_image_surface_create_from_pixbuf(const GdkPixbuf *gdkbuf)
35{
36
37 int chan = gdk_pixbuf_get_n_channels(gdkbuf);
38 if (chan < 3) return NULL;
39
40#if GDK_PIXBUF_CHECK_VERSION(2,32,0)
41 const guint8* gdkpix = gdk_pixbuf_read_pixels(gdkbuf);
42#else
43 const guint8* gdkpix = gdk_pixbuf_get_pixels(gdkbuf);
44#endif
45 if (!gdkpix) {
46 return NULL;
47 }
48 gint w = gdk_pixbuf_get_width(gdkbuf);
49 gint h = gdk_pixbuf_get_height(gdkbuf);
50 int stride = gdk_pixbuf_get_rowstride(gdkbuf);
51
52 cairo_format_t fmt = (chan == 3) ? CAIRO_FORMAT_RGB24 : CAIRO_FORMAT_ARGB32;
53 cairo_surface_t * cs = cairo_image_surface_create (fmt, w, h);
54 cairo_surface_flush (cs);
55 if ( !cs || cairo_surface_status(cs) != CAIRO_STATUS_SUCCESS) {
56 return NULL;
57 }
58
59 int cstride = cairo_image_surface_get_stride(cs);
60 unsigned char * cpix = cairo_image_surface_get_data(cs);
61
62 if (chan == 3) {
63 int i;
64 for (i = h; i; --i) {
65 const guint8 *gp = gdkpix;
66 unsigned char *cp = cpix;
67 const guint8* end = gp + 3*w;
68 while (gp < end) {
69#if G_BYTE_ORDER == G_LITTLE_ENDIAN
70 cp[0] = gp[2];
71 cp[1] = gp[1];
72 cp[2] = gp[0];
73#else
74 cp[1] = gp[0];
75 cp[2] = gp[1];
76 cp[3] = gp[2];
77#endif
78 gp += 3;
79 cp += 4;
80 }
81 gdkpix += stride;
82 cpix += cstride;
83 }
84 } else {
85 /* premul-color = alpha/255 * color/255 * 255 = (alpha*color)/255
86 * (z/255) = z/256 * 256/255 = z/256 (1 + 1/255)
87 * = z/256 + (z/256)/255 = (z + z/255)/256
88 * # recurse once
89 * = (z + (z + z/255)/256)/256
90 * = (z + z/256 + z/256/255) / 256
91 * # only use 16bit uint operations, loose some precision,
92 * # result is floored.
93 * -> (z + z>>8)>>8
94 * # add 0x80/255 = 0.5 to convert floor to round
95 * => (z+0x80 + (z+0x80)>>8 ) >> 8
96 * ------
97 * tested as equal to lround(z/255.0) for uint z in [0..0xfe02]
98 */
99#define PREMUL_ALPHA(x,a,b,z) G_STMT_START { z = a * b + 0x80; x = (z + (z >> 8)) >> 8; } G_STMT_END
100 int i;
101 for (i = h; i; --i) {
102 const guint8 *gp = gdkpix;
103 unsigned char *cp = cpix;
104 const guint8* end = gp + 4*w;
105 guint z1, z2, z3;
106 while (gp < end) {
107#if G_BYTE_ORDER == G_LITTLE_ENDIAN
108 PREMUL_ALPHA(cp[0], gp[2], gp[3], z1);
109 PREMUL_ALPHA(cp[1], gp[1], gp[3], z2);
110 PREMUL_ALPHA(cp[2], gp[0], gp[3], z3);
111 cp[3] = gp[3];
112#else
113 PREMUL_ALPHA(cp[1], gp[0], gp[3], z1);
114 PREMUL_ALPHA(cp[2], gp[1], gp[3], z2);
115 PREMUL_ALPHA(cp[3], gp[2], gp[3], z3);
116 cp[0] = gp[3];
117#endif
118 gp += 4;
119 cp += 4;
120 }
121 gdkpix += stride;
122 cpix += cstride;
123 }
124#undef PREMUL_ALPHA
125 }
126 cairo_surface_mark_dirty(cs);
127 return cs;
128}
129
130void sway_terminate(void) { 25void sway_terminate(void) {
131 int i; 26 int i;
132 for (i = 0; i < surfaces->length; ++i) { 27 for (i = 0; i < surfaces->length; ++i) {
@@ -167,7 +62,7 @@ int main(int argc, const char **argv) {
167 if (!pixbuf) { 62 if (!pixbuf) {
168 sway_abort("Failed to load background image."); 63 sway_abort("Failed to load background image.");
169 } 64 }
170 cairo_surface_t *image = __gdk_cairo_image_surface_create_from_pixbuf(pixbuf); 65 cairo_surface_t *image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf);
171 g_object_unref(pixbuf); 66 g_object_unref(pixbuf);
172 if (!image) { 67 if (!image) {
173 sway_abort("Failed to read background image."); 68 sway_abort("Failed to read background image.");
diff --git a/swaylock/main.c b/swaylock/main.c
index 37513b4d..4f77dfec 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -1,5 +1,8 @@
1#include "wayland-desktop-shell-client-protocol.h"
1#include <stdio.h> 2#include <stdio.h>
2#include <stdlib.h> 3#include <stdlib.h>
4#include "client/window.h"
5#include "client/registry.h"
3#include "log.h" 6#include "log.h"
4 7
5void sway_terminate(void) { 8void sway_terminate(void) {
diff --git a/wayland/CMakeLists.txt b/wayland/CMakeLists.txt
index 5633dd6e..8e19fc03 100644
--- a/wayland/CMakeLists.txt
+++ b/wayland/CMakeLists.txt
@@ -1,6 +1,7 @@
1include_directories( 1include_directories(
2 ${PROTOCOLS_INCLUDE_DIRS} 2 ${PROTOCOLS_INCLUDE_DIRS}
3 ${PANGO_INCLUDE_DIRS} 3 ${PANGO_INCLUDE_DIRS}
4 ${GDK_PIXBUF_INCLUDE_DIRS}
4) 5)
5 6
6add_library(sway-wayland 7add_library(sway-wayland
@@ -8,10 +9,12 @@ add_library(sway-wayland
8 pango.c 9 pango.c
9 registry.c 10 registry.c
10 window.c 11 window.c
12 cairo.c
11 ) 13 )
12 14
13target_link_libraries(sway-wayland 15target_link_libraries(sway-wayland
14 sway-common 16 sway-common
15 sway-protocols 17 sway-protocols
16 ${PANGO_LIBRARIES} 18 ${PANGO_LIBRARIES}
19 ${GDK_PIXBUF_LIBRARIES}
17 ) 20 )
diff --git a/wayland/cairo.c b/wayland/cairo.c
new file mode 100644
index 00000000..10a15f40
--- /dev/null
+++ b/wayland/cairo.c
@@ -0,0 +1,105 @@
1#include <gdk-pixbuf/gdk-pixbuf.h>
2#include <cairo/cairo.h>
3#include "client/cairo.h"
4
5#ifndef GDK_PIXBUF_CHECK_VERSION
6#define GDK_PIXBUF_CHECK_VERSION(major,minor,micro) \
7 (GDK_PIXBUF_MAJOR > (major) || \
8 (GDK_PIXBUF_MAJOR == (major) && GDK_PIXBUF_MINOR > (minor)) || \
9 (GDK_PIXBUF_MAJOR == (major) && GDK_PIXBUF_MINOR == (minor) && \
10 GDK_PIXBUF_MICRO >= (micro)))
11#endif
12
13cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(const GdkPixbuf *gdkbuf) {
14 int chan = gdk_pixbuf_get_n_channels(gdkbuf);
15 if (chan < 3) return NULL;
16
17#if GDK_PIXBUF_CHECK_VERSION(2,32,0)
18 const guint8* gdkpix = gdk_pixbuf_read_pixels(gdkbuf);
19#else
20 const guint8* gdkpix = gdk_pixbuf_get_pixels(gdkbuf);
21#endif
22 if (!gdkpix) {
23 return NULL;
24 }
25 gint w = gdk_pixbuf_get_width(gdkbuf);
26 gint h = gdk_pixbuf_get_height(gdkbuf);
27 int stride = gdk_pixbuf_get_rowstride(gdkbuf);
28
29 cairo_format_t fmt = (chan == 3) ? CAIRO_FORMAT_RGB24 : CAIRO_FORMAT_ARGB32;
30 cairo_surface_t * cs = cairo_image_surface_create (fmt, w, h);
31 cairo_surface_flush (cs);
32 if ( !cs || cairo_surface_status(cs) != CAIRO_STATUS_SUCCESS) {
33 return NULL;
34 }
35
36 int cstride = cairo_image_surface_get_stride(cs);
37 unsigned char * cpix = cairo_image_surface_get_data(cs);
38
39 if (chan == 3) {
40 int i;
41 for (i = h; i; --i) {
42 const guint8 *gp = gdkpix;
43 unsigned char *cp = cpix;
44 const guint8* end = gp + 3*w;
45 while (gp < end) {
46#if G_BYTE_ORDER == G_LITTLE_ENDIAN
47 cp[0] = gp[2];
48 cp[1] = gp[1];
49 cp[2] = gp[0];
50#else
51 cp[1] = gp[0];
52 cp[2] = gp[1];
53 cp[3] = gp[2];
54#endif
55 gp += 3;
56 cp += 4;
57 }
58 gdkpix += stride;
59 cpix += cstride;
60 }
61 } else {
62 /* premul-color = alpha/255 * color/255 * 255 = (alpha*color)/255
63 * (z/255) = z/256 * 256/255 = z/256 (1 + 1/255)
64 * = z/256 + (z/256)/255 = (z + z/255)/256
65 * # recurse once
66 * = (z + (z + z/255)/256)/256
67 * = (z + z/256 + z/256/255) / 256
68 * # only use 16bit uint operations, loose some precision,
69 * # result is floored.
70 * -> (z + z>>8)>>8
71 * # add 0x80/255 = 0.5 to convert floor to round
72 * => (z+0x80 + (z+0x80)>>8 ) >> 8
73 * ------
74 * tested as equal to lround(z/255.0) for uint z in [0..0xfe02]
75 */
76#define PREMUL_ALPHA(x,a,b,z) G_STMT_START { z = a * b + 0x80; x = (z + (z >> 8)) >> 8; } G_STMT_END
77 int i;
78 for (i = h; i; --i) {
79 const guint8 *gp = gdkpix;
80 unsigned char *cp = cpix;
81 const guint8* end = gp + 4*w;
82 guint z1, z2, z3;
83 while (gp < end) {
84#if G_BYTE_ORDER == G_LITTLE_ENDIAN
85 PREMUL_ALPHA(cp[0], gp[2], gp[3], z1);
86 PREMUL_ALPHA(cp[1], gp[1], gp[3], z2);
87 PREMUL_ALPHA(cp[2], gp[0], gp[3], z3);
88 cp[3] = gp[3];
89#else
90 PREMUL_ALPHA(cp[1], gp[0], gp[3], z1);
91 PREMUL_ALPHA(cp[2], gp[1], gp[3], z2);
92 PREMUL_ALPHA(cp[3], gp[2], gp[3], z3);
93 cp[0] = gp[3];
94#endif
95 gp += 4;
96 cp += 4;
97 }
98 gdkpix += stride;
99 cpix += cstride;
100 }
101#undef PREMUL_ALPHA
102 }
103 cairo_surface_mark_dirty(cs);
104 return cs;
105}