9 files changed, 44 insertions, 268 deletions

diff --git a/common/background-image.c b/common/background-image.c
deleted file mode 100644
index 994a0805..00000000
--- a/common/background-image.c
+++ /dev/null
@@ -1,220 +0,0 @@
-#include <assert.h>
-#include "background-image.h"
-#include "cairo_util.h"
-#include "log.h"
-#if HAVE_GDK_PIXBUF
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#endif
-
-enum background_mode parse_background_mode(const char *mode) {
-        if (strcmp(mode, "stretch") == 0) {
-                return BACKGROUND_MODE_STRETCH;
-        } else if (strcmp(mode, "fill") == 0) {
-                return BACKGROUND_MODE_FILL;
-        } else if (strcmp(mode, "fit") == 0) {
-                return BACKGROUND_MODE_FIT;
-        } else if (strcmp(mode, "center") == 0) {
-                return BACKGROUND_MODE_CENTER;
-        } else if (strcmp(mode, "tile") == 0) {
-                return BACKGROUND_MODE_TILE;
-        } else if (strcmp(mode, "solid_color") == 0) {
-                return BACKGROUND_MODE_SOLID_COLOR;
-        }
-        sway_log(SWAY_ERROR, "Unsupported background mode: %s", mode);
-        return BACKGROUND_MODE_INVALID;
-}
-
-#if HAVE_GDK_PIXBUF
-static cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(
-                const GdkPixbuf *gdkbuf) {
-        int chan = gdk_pixbuf_get_n_channels(gdkbuf);
-        if (chan < 3) {
-                return NULL;
-        }
-
-        const guint8* gdkpix = gdk_pixbuf_read_pixels(gdkbuf);
-        if (!gdkpix) {
-                return NULL;
-        }
-        gint w = gdk_pixbuf_get_width(gdkbuf);
-        gint h = gdk_pixbuf_get_height(gdkbuf);
-        int stride = gdk_pixbuf_get_rowstride(gdkbuf);
-
-        cairo_format_t fmt = (chan == 3) ? CAIRO_FORMAT_RGB24 : CAIRO_FORMAT_ARGB32;
-        cairo_surface_t * cs = cairo_image_surface_create (fmt, w, h);
-        cairo_surface_flush (cs);
-        if ( !cs || cairo_surface_status(cs) != CAIRO_STATUS_SUCCESS) {
-                return NULL;
-        }
-
-        int cstride = cairo_image_surface_get_stride(cs);
-        unsigned char * cpix = cairo_image_surface_get_data(cs);
-
-        if (chan == 3) {
-                int i;
-                for (i = h; i; --i) {
-                        const guint8 *gp = gdkpix;
-                        unsigned char *cp = cpix;
-                        const guint8* end = gp + 3*w;
-                        while (gp < end) {
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                                cp[0] = gp[2];
-                                cp[1] = gp[1];
-                                cp[2] = gp[0];
-#else
-                                cp[1] = gp[0];
-                                cp[2] = gp[1];
-                                cp[3] = gp[2];
-#endif
-                                gp += 3;
-                                cp += 4;
-                        }
-                        gdkpix += stride;
-                        cpix += cstride;
-                }
-        } else {
-                /* premul-color = alpha/255 * color/255 * 255 = (alpha*color)/255
-                 * (z/255) = z/256 * 256/255     = z/256 (1 + 1/255)
-                 *         = z/256 + (z/256)/255 = (z + z/255)/256
-                 *         # recurse once
-                 *         = (z + (z + z/255)/256)/256
-                 *         = (z + z/256 + z/256/255) / 256
-                 *         # only use 16bit uint operations, loose some precision,
-                 *         # result is floored.
-                 *       ->  (z + z>>8)>>8
-                 *         # add 0x80/255 = 0.5 to convert floor to round
-                 *       =>  (z+0x80 + (z+0x80)>>8 ) >> 8
-                 * ------
-                 * tested as equal to lround(z/255.0) for uint z in [0..0xfe02]
-                 */
-#define PREMUL_ALPHA(x,a,b,z) \
-                G_STMT_START { z = a * b + 0x80; x = (z + (z >> 8)) >> 8; } \
-                G_STMT_END
-                int i;
-                for (i = h; i; --i) {
-                        const guint8 *gp = gdkpix;
-                        unsigned char *cp = cpix;
-                        const guint8* end = gp + 4*w;
-                        guint z1, z2, z3;
-                        while (gp < end) {
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                                PREMUL_ALPHA(cp[0], gp[2], gp[3], z1);
-                                PREMUL_ALPHA(cp[1], gp[1], gp[3], z2);
-                                PREMUL_ALPHA(cp[2], gp[0], gp[3], z3);
-                                cp[3] = gp[3];
-#else
-                                PREMUL_ALPHA(cp[1], gp[0], gp[3], z1);
-                                PREMUL_ALPHA(cp[2], gp[1], gp[3], z2);
-                                PREMUL_ALPHA(cp[3], gp[2], gp[3], z3);
-                                cp[0] = gp[3];
-#endif
-                                gp += 4;
-                                cp += 4;
-                        }
-                        gdkpix += stride;
-                        cpix += cstride;
-                }
-#undef PREMUL_ALPHA
-        }
-        cairo_surface_mark_dirty(cs);
-        return cs;
-}
-#endif // HAVE_GDK_PIXBUF
-
-cairo_surface_t *load_background_image(const char *path) {
-        cairo_surface_t *image;
-#if HAVE_GDK_PIXBUF
-        GError *err = NULL;
-        GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, &err);
-        if (!pixbuf) {
-                sway_log(SWAY_ERROR, "Failed to load background image (%s).",
-                                err->message);
-                return NULL;
-        }
-        image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf);
-        g_object_unref(pixbuf);
-#else
-        image = cairo_image_surface_create_from_png(path);
-#endif // HAVE_GDK_PIXBUF
-        if (!image) {
-                sway_log(SWAY_ERROR, "Failed to read background image.");
-                return NULL;
-        }
-        if (cairo_surface_status(image) != CAIRO_STATUS_SUCCESS) {
-                sway_log(SWAY_ERROR, "Failed to read background image: %s."
-#if !HAVE_GDK_PIXBUF
-                                "\nSway was compiled without gdk_pixbuf support, so only"
-                                "\nPNG images can be loaded. This is the likely cause."
-#endif // !HAVE_GDK_PIXBUF
-                                , cairo_status_to_string(cairo_surface_status(image)));
-                return NULL;
-        }
-        return image;
-}
-
-void render_background_image(cairo_t *cairo, cairo_surface_t *image,
-                enum background_mode mode, int buffer_width, int buffer_height) {
-        double width = cairo_image_surface_get_width(image);
-        double height = cairo_image_surface_get_height(image);
-
-        cairo_save(cairo);
-        switch (mode) {
-        case BACKGROUND_MODE_STRETCH:
-                cairo_scale(cairo,
-                                (double)buffer_width / width,
-                                (double)buffer_height / height);
-                cairo_set_source_surface(cairo, image, 0, 0);
-                break;
-        case BACKGROUND_MODE_FILL: {
-                double window_ratio = (double)buffer_width / buffer_height;
-                double bg_ratio = width / height;
-
-                if (window_ratio > bg_ratio) {
-                        double scale = (double)buffer_width / width;
-                        cairo_scale(cairo, scale, scale);
-                        cairo_set_source_surface(cairo, image,
-                                        0, (double)buffer_height / 2 / scale - height / 2);
-                } else {
-                        double scale = (double)buffer_height / height;
-                        cairo_scale(cairo, scale, scale);
-                        cairo_set_source_surface(cairo, image,
-                                        (double)buffer_width / 2 / scale - width / 2, 0);
-                }
-                break;
-        }
-        case BACKGROUND_MODE_FIT: {
-                double window_ratio = (double)buffer_width / buffer_height;
-                double bg_ratio = width / height;
-
-                if (window_ratio > bg_ratio) {
-                        double scale = (double)buffer_height / height;
-                        cairo_scale(cairo, scale, scale);
-                        cairo_set_source_surface(cairo, image,
-                                        (double)buffer_width / 2 / scale - width / 2, 0);
-                } else {
-                        double scale = (double)buffer_width / width;
-                        cairo_scale(cairo, scale, scale);
-                        cairo_set_source_surface(cairo, image,
-                                        0, (double)buffer_height / 2 / scale - height / 2);
-                }
-                break;
-        }
-        case BACKGROUND_MODE_CENTER:
-                cairo_set_source_surface(cairo, image,
-                                (double)buffer_width / 2 - width / 2,
-                                (double)buffer_height / 2 - height / 2);
-                break;
-        case BACKGROUND_MODE_TILE: {
-                cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image);
-                cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
-                cairo_set_source(cairo, pattern);
-                break;
-        }
-        case BACKGROUND_MODE_SOLID_COLOR:
-        case BACKGROUND_MODE_INVALID:
-                assert(0);
-                break;
-        }
-        cairo_paint(cairo);
-        cairo_restore(cairo);
-}
diff --git a/common/gesture.c b/common/gesture.c
index 8c2efe99..272aa837 100644
--- a/common/gesture.c
+++ b/common/gesture.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "gesture.h"
 
 #include <math.h>
@@ -12,23 +11,6 @@
 
 const uint8_t GESTURE_FINGERS_ANY = 0;
 
-// Helper to easily allocate and format string
-static char *strformat(const char *format, ...) {
-        va_list args;
-        va_start(args, format);
-        int length = vsnprintf(NULL, 0, format, args) + 1;
-        va_end(args);
-
-        char *result = malloc(length);
-        if (result) {
-                va_start(args, format);
-                vsnprintf(result, length, format, args);
-                va_end(args);
-        }
-
-        return result;
-}
-
 char *gesture_parse(const char *input, struct gesture *output) {
         // Clear output in case of failure
         output->type = GESTURE_TYPE_NONE;
@@ -38,7 +20,7 @@ char *gesture_parse(const char *input, struct gesture *output) {
         // Split input type, fingers and directions
         list_t *split = split_string(input, ":");
         if (split->length < 1 || split->length > 3) {
-                return strformat(
+                return format_str(
                                 "expected <gesture>[:<fingers>][:direction], got %s",
                                 input);
         }
@@ -51,8 +33,8 @@ char *gesture_parse(const char *input, struct gesture *output) {
         } else if (strcmp(split->items[0], "swipe") == 0) {
                 output->type = GESTURE_TYPE_SWIPE;
         } else {
-                return strformat("expected hold|pinch|swipe, got %s",
-                                split->items[0]);
+                return format_str("expected hold|pinch|swipe, got %s",
+                                (const char *)split->items[0]);
         }
 
         // Parse optional arguments
@@ -67,7 +49,7 @@ char *gesture_parse(const char *input, struct gesture *output) {
                         next = split->length == 3 ? split->items[2] : NULL;
                 } else if (split->length == 3) {
                         // Fail here if argument can only be finger count
-                        return strformat("expected 1-9, got %s", next);
+                        return format_str("expected 1-9, got %s", next);
                 }
 
                 // If there is an argument left, try to parse as direction
@@ -95,7 +77,7 @@ char *gesture_parse(const char *input, struct gesture *output) {
                                 } else if (strcmp(item, "counterclockwise") == 0) {
                                         output->directions |= GESTURE_DIRECTION_COUNTERCLOCKWISE;
                                 } else {
-                                        return strformat("expected direction, got %s", item);
+                                        return format_str("expected direction, got %s", item);
                                 }
                         }
                         list_free_items_and_destroy(directions);
@@ -163,7 +145,7 @@ static char *gesture_directions_to_string(uint32_t directions) {
                         if (!result) {
                                 result = strdup(name);
                         } else {
-                                char *new = strformat("%s+%s", result, name);
+                                char *new = format_str("%s+%s", result, name);
                                 free(result);
                                 result = new;
                         }
@@ -179,7 +161,7 @@ static char *gesture_directions_to_string(uint32_t directions) {
 
 char *gesture_to_string(struct gesture *gesture) {
         char *directions = gesture_directions_to_string(gesture->directions);
-        char *result = strformat("%s:%u:%s",
+        char *result = format_str("%s:%u:%s",
                 gesture_type_string(gesture->type),
                 gesture->fingers, directions);
         free(directions);
diff --git a/common/ipc-client.c b/common/ipc-client.c
index d30212d2..a0be2b2d 100644
--- a/common/ipc-client.c
+++ b/common/ipc-client.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/common/log.c b/common/log.c
index 483420e7..3eacdb34 100644
--- a/common/log.c
+++ b/common/log.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200112L
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/common/loop.c b/common/loop.c
index 80fe18ea..b99c6d55 100644
--- a/common/loop.c
+++ b/common/loop.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200112L
 #include <limits.h>
 #include <string.h>
 #include <stdbool.h>
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 @@
 lib_sway_common = static_library(
         'sway-common',
         files(
-                'background-image.c',
                 'cairo.c',
                 'gesture.c',
                 'ipc-client.c',
@@ -14,7 +13,6 @@ lib_sway_common = static_library(
         ),
         dependencies: [
                 cairo,
-                gdk_pixbuf,
                 pango,
                 pangocairo,
                 wayland_client.partial_dependency(compile_args: true)
diff --git a/common/pango.c b/common/pango.c
index e04bf80f..288569b3 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -84,18 +84,11 @@ void get_text_size(cairo_t *cairo, const PangoFontDescription *desc, int *width,
                 int *baseline, double scale, bool markup, const char *fmt, ...) {
         va_list args;
         va_start(args, fmt);
-        // Add one since vsnprintf excludes null terminator.
-        int length = vsnprintf(NULL, 0, fmt, args) + 1;
+        char *buf = vformat_str(fmt, args);
         va_end(args);
-
-        char *buf = malloc(length);
         if (buf == NULL) {
-                sway_log(SWAY_ERROR, "Failed to allocate memory");
                 return;
         }
-        va_start(args, fmt);
-        vsnprintf(buf, length, fmt, args);
-        va_end(args);
 
         PangoLayout *layout = get_pango_layout(cairo, desc, buf, scale, markup);
         pango_cairo_update_layout(cairo, layout);
@@ -104,6 +97,7 @@ void get_text_size(cairo_t *cairo, const PangoFontDescription *desc, int *width,
                 *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE;
         }
         g_object_unref(layout);
+
         free(buf);
 }
 
@@ -125,18 +119,11 @@ void render_text(cairo_t *cairo, const PangoFontDescription *desc,
                 double scale, bool markup, const char *fmt, ...) {
         va_list args;
         va_start(args, fmt);
-        // Add one since vsnprintf excludes null terminator.
-        int length = vsnprintf(NULL, 0, fmt, args) + 1;
+        char *buf = vformat_str(fmt, args);
         va_end(args);
-
-        char *buf = malloc(length);
         if (buf == NULL) {
-                sway_log(SWAY_ERROR, "Failed to allocate memory");
                 return;
         }
-        va_start(args, fmt);
-        vsnprintf(buf, length, fmt, args);
-        va_end(args);
 
         PangoLayout *layout = get_pango_layout(cairo, desc, buf, scale, markup);
         cairo_font_options_t *fo = cairo_font_options_create();
@@ -146,5 +133,6 @@ void render_text(cairo_t *cairo, const PangoFontDescription *desc,
         pango_cairo_update_layout(cairo, layout);
         pango_cairo_show_layout(cairo, layout);
         g_object_unref(layout);
+
         free(buf);
 }
diff --git a/common/stringop.c b/common/stringop.c
index 7fb3fe12..16d04917 100644
--- a/common/stringop.c
+++ b/common/stringop.c
@@ -1,5 +1,5 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -328,3 +328,35 @@ bool expand_path(char **path) {
         wordfree(&p);
         return true;
 }
+
+char *vformat_str(const char *fmt, va_list args) {
+        char *str = NULL;
+        va_list args_copy;
+        va_copy(args_copy, args);
+
+        int len = vsnprintf(NULL, 0, fmt, args);
+        if (len < 0) {
+                sway_log_errno(SWAY_ERROR, "vsnprintf(\"%s\") failed", fmt);
+                goto out;
+        }
+
+        str = malloc(len + 1);
+        if (str == NULL) {
+                sway_log_errno(SWAY_ERROR, "malloc() failed");
+                goto out;
+        }
+
+        vsnprintf(str, len + 1, fmt, args_copy);
+
+out:
+        va_end(args_copy);
+        return str;
+}
+
+char *format_str(const char *fmt, ...) {
+        va_list args;
+        va_start(args, fmt);
+        char *str = vformat_str(fmt, args);
+        va_end(args);
+        return str;
+}
diff --git a/common/util.c b/common/util.c
index 5d4c0673..7c492bcb 100644
--- a/common/util.c
+++ b/common/util.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <fcntl.h>
 #include <math.h>