scaled-scene-buffer: restructure source files

- Rename `scaled_scene_buffer` to `scaled_buffer`. This makes it clear
  that `scaled_{font,img,icon}_buffers` are implementations of it.
- Move the files from `src/common` to `src/scaled-buffer` as
  `scaled_icon_buffer` heavily depends on `server` and `view` etc.

src/common/meson.build

@@ -14,10 +14,6 @@ labwc_sources += files(
   'nodename.c',
   'parse-bool.c',
   'parse-double.c',
-  'scaled-font-buffer.c',
-  'scaled-icon-buffer.c',
-  'scaled-img-buffer.c',
-  'scaled-scene-buffer.c',
   'scene-helpers.c',
   'set.c',
   'surface-helpers.c',

src/desktop.c

@@ -350,7 +350,7 @@ get_cursor_context(struct server *server)
 				return ret;
 			case LAB_NODE_DESC_NODE:
 			case LAB_NODE_DESC_TREE:
-			case LAB_NODE_DESC_SCALED_SCENE_BUFFER:
+			case LAB_NODE_DESC_SCALED_BUFFER:
 				break;
 			}
 		}

src/menu/menu.c

@@ -20,19 +20,19 @@
 #include "common/lab-scene-rect.h"
 #include "common/list.h"
 #include "common/mem.h"
-#include "common/scaled-font-buffer.h"
-#include "common/scaled-icon-buffer.h"
 #include "common/scene-helpers.h"
 #include "common/spawn.h"
 #include "common/string-helpers.h"
 #include "common/xml.h"
 #include "config/rcxml.h"
 #include "labwc.h"
-#include "output.h"
-#include "workspaces.h"
-#include "view.h"
 #include "node.h"
+#include "output.h"
+#include "scaled-buffer/scaled-font-buffer.h"
+#include "scaled-buffer/scaled-icon-buffer.h"
 #include "theme.h"
+#include "view.h"
+#include "workspaces.h"
 
 #define PIPEMENU_MAX_BUF_SIZE 1048576  /* 1 MiB */
 #define PIPEMENU_TIMEOUT_IN_MS 4000    /* 4 seconds */

src/meson.build

@@ -56,4 +56,5 @@ subdir('input')
 subdir('menu')
 subdir('osd')
 subdir('protocols')
+subdir('scaled-buffer')
 subdir('ssd')

src/node.c

@@ -80,11 +80,11 @@ node_ssd_part_from_node(struct wlr_scene_node *wlr_scene_node)
 	return (struct ssd_part *)node_descriptor->data;
 }
 
-struct scaled_scene_buffer *
-node_scaled_scene_buffer_from_node(struct wlr_scene_node *wlr_scene_node)
+struct scaled_buffer *
+node_scaled_buffer_from_node(struct wlr_scene_node *wlr_scene_node)
 {
 	assert(wlr_scene_node->data);
 	struct node_descriptor *node_descriptor = wlr_scene_node->data;
-	assert(node_descriptor->type == LAB_NODE_DESC_SCALED_SCENE_BUFFER);
-	return (struct scaled_scene_buffer *)node_descriptor->data;
+	assert(node_descriptor->type == LAB_NODE_DESC_SCALED_BUFFER);
+	return (struct scaled_buffer *)node_descriptor->data;
 }

src/osd/osd-classic.c

@@ -7,8 +7,6 @@
 #include "common/buf.h"
 #include "common/font.h"
 #include "common/lab-scene-rect.h"
-#include "common/scaled-font-buffer.h"
-#include "common/scaled-icon-buffer.h"
 #include "common/scene-helpers.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
@@ -16,6 +14,8 @@
 #include "node.h"
 #include "osd.h"
 #include "output.h"
+#include "scaled-buffer/scaled-font-buffer.h"
+#include "scaled-buffer/scaled-icon-buffer.h"
 #include "theme.h"
 #include "view.h"
 #include "window-rules.h"

src/osd/osd-thumbnail.c

@@ -8,11 +8,11 @@
 #include "common/array.h"
 #include "common/box.h"
 #include "common/lab-scene-rect.h"
-#include "common/scaled-font-buffer.h"
-#include "common/scaled-icon-buffer.h"
 #include "labwc.h"
 #include "osd.h"
 #include "output.h"
+#include "scaled-buffer/scaled-font-buffer.h"
+#include "scaled-buffer/scaled-icon-buffer.h"
 #include "theme.h"
 #include "view.h"
 

src/osd/osd.c

@@ -6,13 +6,13 @@
 #include <wlr/util/box.h>
 #include "common/array.h"
 #include "common/lab-scene-rect.h"
-#include "common/scaled-font-buffer.h"
-#include "common/scaled-icon-buffer.h"
 #include "common/scene-helpers.h"
 #include "config/rcxml.h"
 #include "labwc.h"
 #include "node.h"
 #include "output.h"
+#include "scaled-buffer/scaled-font-buffer.h"
+#include "scaled-buffer/scaled-icon-buffer.h"
 #include "theme.h"
 #include "view.h"
 #include "window-rules.h"

src/scaled-buffer/meson.build

@@ -0,0 +1,6 @@
+labwc_sources += files(
+  'scaled-font-buffer.c',
+  'scaled-icon-buffer.c',
+  'scaled-img-buffer.c',
+  'scaled-buffer.c',
+)

src/scaled-buffer/scaled-buffer.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #define _POSIX_C_SOURCE 200809L
-#include "common/scaled-scene-buffer.h"
+#include "scaled-buffer/scaled-buffer.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <wayland-server-core.h>
@@ -15,14 +15,14 @@
 #include "node.h"
 
 /*
- * This holds all the scaled_scene_buffers from all the implementers.
+ * This holds all the scaled_buffers from all the implementers.
  * This is used to share visually duplicated buffers found via impl->equal().
  */
 static struct wl_list all_scaled_buffers = WL_LIST_INIT(&all_scaled_buffers);
 
 /* Internal API */
 static void
-_cache_entry_destroy(struct scaled_scene_buffer_cache_entry *cache_entry, bool drop_buffer)
+_cache_entry_destroy(struct scaled_buffer_cache_entry *cache_entry, bool drop_buffer)
 {
 	wl_list_remove(&cache_entry->link);
 	if (cache_entry->buffer) {
@@ -35,10 +35,10 @@ _cache_entry_destroy(struct scaled_scene_buffer_cache_entry *cache_entry, bool d
 	free(cache_entry);
 }
 
-static struct scaled_scene_buffer_cache_entry *
-find_cache_for_scale(struct scaled_scene_buffer *scene_buffer, double scale)
+static struct scaled_buffer_cache_entry *
+find_cache_for_scale(struct scaled_buffer *scene_buffer, double scale)
 {
-	struct scaled_scene_buffer_cache_entry *cache_entry;
+	struct scaled_buffer_cache_entry *cache_entry;
 	wl_list_for_each(cache_entry, &scene_buffer->cache, link) {
 		if (cache_entry->scale == scale) {
 			return cache_entry;
@@ -48,12 +48,12 @@ find_cache_for_scale(struct scaled_scene_buffer *scene_buffer, double scale)
 }
 
 static void
-_update_buffer(struct scaled_scene_buffer *self, double scale)
+_update_buffer(struct scaled_buffer *self, double scale)
 {
 	self->active_scale = scale;
 
 	/* Search for cached buffer of specified scale */
-	struct scaled_scene_buffer_cache_entry *cache_entry =
+	struct scaled_buffer_cache_entry *cache_entry =
 		find_cache_for_scale(self, scale);
 	if (cache_entry) {
 		/* LRU cache, recently used in front */
@@ -71,8 +71,8 @@ _update_buffer(struct scaled_scene_buffer *self, double scale)
 	struct wlr_buffer *wlr_buffer = NULL;
 
 	if (self->impl->equal) {
-		/* Search from other cached scaled-scene-buffers */
-		struct scaled_scene_buffer *scene_buffer;
+		/* Search from other cached scaled-buffers */
+		struct scaled_buffer *scene_buffer;
 		wl_list_for_each(scene_buffer, &all_scaled_buffers, link) {
 			if (scene_buffer == self) {
 				continue;
@@ -146,8 +146,8 @@ _update_buffer(struct scaled_scene_buffer *self, double scale)
 static void
 _handle_node_destroy(struct wl_listener *listener, void *data)
 {
-	struct scaled_scene_buffer_cache_entry *cache_entry, *cache_entry_tmp;
-	struct scaled_scene_buffer *self = wl_container_of(listener, self, destroy);
+	struct scaled_buffer_cache_entry *cache_entry, *cache_entry_tmp;
+	struct scaled_buffer *self = wl_container_of(listener, self, destroy);
 
 	wl_list_remove(&self->destroy.link);
 	wl_list_remove(&self->outputs_update.link);
@@ -167,7 +167,7 @@ _handle_node_destroy(struct wl_listener *listener, void *data)
 static void
 _handle_outputs_update(struct wl_listener *listener, void *data)
 {
-	struct scaled_scene_buffer *self =
+	struct scaled_buffer *self =
 		wl_container_of(listener, self, outputs_update);
 
 	double max_scale = 0;
@@ -181,16 +181,16 @@ _handle_outputs_update(struct wl_listener *listener, void *data)
 }
 
 /* Public API */
-struct scaled_scene_buffer *
-scaled_scene_buffer_create(struct wlr_scene_tree *parent,
-		const struct scaled_scene_buffer_impl *impl,
+struct scaled_buffer *
+scaled_buffer_create(struct wlr_scene_tree *parent,
+		const struct scaled_buffer_impl *impl,
 		bool drop_buffer)
 {
 	assert(parent);
 	assert(impl);
 	assert(impl->create_buffer);
 
-	struct scaled_scene_buffer *self = znew(*self);
+	struct scaled_buffer *self = znew(*self);
 	self->scene_buffer = wlr_scene_buffer_create(parent, NULL);
 	if (!self->scene_buffer) {
 		wlr_log(WLR_ERROR, "Failed to create scene buffer");
@@ -198,7 +198,7 @@ scaled_scene_buffer_create(struct wlr_scene_tree *parent,
 		return NULL;
 	}
 	node_descriptor_create(&self->scene_buffer->node,
-		LAB_NODE_DESC_SCALED_SCENE_BUFFER, self);
+		LAB_NODE_DESC_SCALED_BUFFER, self);
 
 	self->impl = impl;
 	/*
@@ -223,14 +223,14 @@ scaled_scene_buffer_create(struct wlr_scene_tree *parent,
 }
 
 void
-scaled_scene_buffer_request_update(struct scaled_scene_buffer *self,
+scaled_buffer_request_update(struct scaled_buffer *self,
 		int width, int height)
 {
 	assert(self);
 	assert(width >= 0);
 	assert(height >= 0);
 
-	struct scaled_scene_buffer_cache_entry *cache_entry, *cache_entry_tmp;
+	struct scaled_buffer_cache_entry *cache_entry, *cache_entry_tmp;
 	wl_list_for_each_safe(cache_entry, cache_entry_tmp, &self->cache, link) {
 		_cache_entry_destroy(cache_entry, self->drop_buffer);
 	}
@@ -256,9 +256,9 @@ scaled_scene_buffer_request_update(struct scaled_scene_buffer *self,
 }
 
 void
-scaled_scene_buffer_invalidate_sharing(void)
+scaled_buffer_invalidate_sharing(void)
 {
-	struct scaled_scene_buffer *scene_buffer, *tmp;
+	struct scaled_buffer *scene_buffer, *tmp;
 	wl_list_for_each_safe(scene_buffer, tmp, &all_scaled_buffers, link) {
 		wl_list_remove(&scene_buffer->link);
 		wl_list_init(&scene_buffer->link);

src/scaled-buffer/scaled-font-buffer.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #define _POSIX_C_SOURCE 200809L
-#include "common/scaled-font-buffer.h"
+#include "scaled-buffer/scaled-font-buffer.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -10,11 +10,11 @@
 #include "common/font.h"
 #include "common/graphic-helpers.h"
 #include "common/mem.h"
-#include "common/scaled-scene-buffer.h"
 #include "common/string-helpers.h"
+#include "scaled-buffer/scaled-buffer.h"
 
 static struct lab_data_buffer *
-_create_buffer(struct scaled_scene_buffer *scaled_buffer, double scale)
+_create_buffer(struct scaled_buffer *scaled_buffer, double scale)
 {
 	struct lab_data_buffer *buffer = NULL;
 	struct scaled_font_buffer *self = scaled_buffer->data;
@@ -39,7 +39,7 @@ _create_buffer(struct scaled_scene_buffer *scaled_buffer, double scale)
 }
 
 static void
-_destroy(struct scaled_scene_buffer *scaled_buffer)
+_destroy(struct scaled_buffer *scaled_buffer)
 {
 	struct scaled_font_buffer *self = scaled_buffer->data;
 	scaled_buffer->data = NULL;
@@ -51,8 +51,8 @@ _destroy(struct scaled_scene_buffer *scaled_buffer)
 }
 
 static bool
-_equal(struct scaled_scene_buffer *scaled_buffer_a,
-	struct scaled_scene_buffer *scaled_buffer_b)
+_equal(struct scaled_buffer *scaled_buffer_a,
+	struct scaled_buffer *scaled_buffer_b)
 {
 	struct scaled_font_buffer *a = scaled_buffer_a->data;
 	struct scaled_font_buffer *b = scaled_buffer_b->data;
@@ -69,7 +69,7 @@ _equal(struct scaled_scene_buffer *scaled_buffer_a,
 		&& a->bg_pattern == b->bg_pattern;
 }
 
-static const struct scaled_scene_buffer_impl impl = {
+static const struct scaled_buffer_impl impl = {
 	.create_buffer = _create_buffer,
 	.destroy = _destroy,
 	.equal = _equal,
@@ -81,7 +81,7 @@ scaled_font_buffer_create(struct wlr_scene_tree *parent)
 {
 	assert(parent);
 	struct scaled_font_buffer *self = znew(*self);
-	struct scaled_scene_buffer *scaled_buffer = scaled_scene_buffer_create(
+	struct scaled_buffer *scaled_buffer = scaled_buffer_create(
 		parent, &impl, /* drop_buffer */ true);
 	if (!scaled_buffer) {
 		free(self);
@@ -138,7 +138,7 @@ scaled_font_buffer_update(struct scaled_font_buffer *self, const char *text,
 		&self->width, &computed_height);
 	self->height = (self->fixed_height > 0) ?
 		self->fixed_height : computed_height;
-	scaled_scene_buffer_request_update(self->scaled_buffer,
+	scaled_buffer_request_update(self->scaled_buffer,
 		self->width, self->height);
 }
 
@@ -152,6 +152,6 @@ scaled_font_buffer_set_max_width(struct scaled_font_buffer *self, int max_width)
 		&self->width, &computed_height);
 	self->height = (self->fixed_height > 0) ?
 		self->fixed_height : computed_height;
-	scaled_scene_buffer_request_update(self->scaled_buffer,
+	scaled_buffer_request_update(self->scaled_buffer,
 		self->width, self->height);
 }

src/scaled-buffer/scaled-icon-buffer.c

@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #define _POSIX_C_SOURCE 200809L
-#include "common/scaled-icon-buffer.h"
+#include "scaled-buffer/scaled-icon-buffer.h"
 #include <assert.h>
 #include <string.h>
 #include <wlr/util/log.h>
 #include "buffer.h"
 #include "common/macros.h"
 #include "common/mem.h"
-#include "common/scaled-scene-buffer.h"
 #include "common/string-helpers.h"
 #include "config.h"
 #include "config/rcxml.h"
 #include "desktop-entry.h"
 #include "img/img.h"
 #include "node.h"
+#include "scaled-buffer/scaled-buffer.h"
 #include "view.h"
 #include "window-rules.h"
 
@@ -97,7 +97,7 @@ load_server_icon(struct scaled_icon_buffer *self, int icon_size, double scale)
 #endif /* HAVE_LIBSFDO */
 
 static struct lab_data_buffer *
-_create_buffer(struct scaled_scene_buffer *scaled_buffer, double scale)
+_create_buffer(struct scaled_buffer *scaled_buffer, double scale)
 {
 #if HAVE_LIBSFDO
 	struct scaled_icon_buffer *self = scaled_buffer->data;
@@ -168,7 +168,7 @@ set_icon_buffers(struct scaled_icon_buffer *self, struct wl_array *buffers)
 }
 
 static void
-_destroy(struct scaled_scene_buffer *scaled_buffer)
+_destroy(struct scaled_buffer *scaled_buffer)
 {
 	struct scaled_icon_buffer *self = scaled_buffer->data;
 	if (self->view) {
@@ -194,8 +194,8 @@ icon_buffers_equal(struct wl_array *a, struct wl_array *b)
 }
 
 static bool
-_equal(struct scaled_scene_buffer *scaled_buffer_a,
-	struct scaled_scene_buffer *scaled_buffer_b)
+_equal(struct scaled_buffer *scaled_buffer_a,
+	struct scaled_buffer *scaled_buffer_b)
 {
 	struct scaled_icon_buffer *a = scaled_buffer_a->data;
 	struct scaled_icon_buffer *b = scaled_buffer_b->data;
@@ -209,7 +209,7 @@ _equal(struct scaled_scene_buffer *scaled_buffer_a,
 		&& a->height == b->height;
 }
 
-static struct scaled_scene_buffer_impl impl = {
+static struct scaled_buffer_impl impl = {
 	.create_buffer = _create_buffer,
 	.destroy = _destroy,
 	.equal = _equal,
@@ -222,7 +222,7 @@ scaled_icon_buffer_create(struct wlr_scene_tree *parent, struct server *server,
 	assert(parent);
 	assert(width >= 0 && height >= 0);
 
-	struct scaled_scene_buffer *scaled_buffer = scaled_scene_buffer_create(
+	struct scaled_buffer *scaled_buffer = scaled_buffer_create(
 		parent, &impl, /* drop_buffer */ true);
 	struct scaled_icon_buffer *self = znew(*self);
 	self->scaled_buffer = scaled_buffer;
@@ -256,7 +256,7 @@ handle_view_set_icon(struct wl_listener *listener, void *data)
 	}
 
 	set_icon_buffers(self, &self->view->icon.buffers);
-	scaled_scene_buffer_request_update(self->scaled_buffer,
+	scaled_buffer_request_update(self->scaled_buffer,
 		self->width, self->height);
 }
 
@@ -272,7 +272,7 @@ handle_view_new_title(struct wl_listener *listener, void *data)
 		return;
 	}
 	self->view_icon_prefer_client = prefer_client;
-	scaled_scene_buffer_request_update(self->scaled_buffer,
+	scaled_buffer_request_update(self->scaled_buffer,
 		self->width, self->height);
 }
 
@@ -290,7 +290,7 @@ handle_view_new_app_id(struct wl_listener *listener, void *data)
 	xstrdup_replace(self->view_app_id, app_id);
 	self->view_icon_prefer_client = window_rules_get_property(
 		self->view, "iconPreferClient") == LAB_PROP_TRUE;
-	scaled_scene_buffer_request_update(self->scaled_buffer,
+	scaled_buffer_request_update(self->scaled_buffer,
 		self->width, self->height);
 }
 
@@ -348,14 +348,14 @@ scaled_icon_buffer_set_icon_name(struct scaled_icon_buffer *self,
 		return;
 	}
 	xstrdup_replace(self->icon_name, icon_name);
-	scaled_scene_buffer_request_update(self->scaled_buffer, self->width, self->height);
+	scaled_buffer_request_update(self->scaled_buffer, self->width, self->height);
 }
 
 struct scaled_icon_buffer *
 scaled_icon_buffer_from_node(struct wlr_scene_node *node)
 {
-	struct scaled_scene_buffer *scaled_buffer =
-		node_scaled_scene_buffer_from_node(node);
+	struct scaled_buffer *scaled_buffer =
+		node_scaled_buffer_from_node(node);
 	assert(scaled_buffer->impl == &impl);
 	return scaled_buffer->data;
 }

src/scaled-buffer/scaled-img-buffer.c

@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #define _POSIX_C_SOURCE 200809L
-#include "common/scaled-img-buffer.h"
+#include "scaled-buffer/scaled-img-buffer.h"
 #include <assert.h>
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_scene.h>
 #include "buffer.h"
 #include "common/mem.h"
-#include "common/scaled-scene-buffer.h"
 #include "img/img.h"
 #include "node.h"
+#include "scaled-buffer/scaled-buffer.h"
 
 static struct lab_data_buffer *
-_create_buffer(struct scaled_scene_buffer *scaled_buffer, double scale)
+_create_buffer(struct scaled_buffer *scaled_buffer, double scale)
 {
 	struct scaled_img_buffer *self = scaled_buffer->data;
 	struct lab_data_buffer *buffer = lab_img_render(self->img,
@@ -20,7 +20,7 @@ _create_buffer(struct scaled_scene_buffer *scaled_buffer, double scale)
 }
 
 static void
-_destroy(struct scaled_scene_buffer *scaled_buffer)
+_destroy(struct scaled_buffer *scaled_buffer)
 {
 	struct scaled_img_buffer *self = scaled_buffer->data;
 	lab_img_destroy(self->img);
@@ -28,8 +28,8 @@ _destroy(struct scaled_scene_buffer *scaled_buffer)
 }
 
 static bool
-_equal(struct scaled_scene_buffer *scaled_buffer_a,
-	struct scaled_scene_buffer *scaled_buffer_b)
+_equal(struct scaled_buffer *scaled_buffer_a,
+	struct scaled_buffer *scaled_buffer_b)
 {
 	struct scaled_img_buffer *a = scaled_buffer_a->data;
 	struct scaled_img_buffer *b = scaled_buffer_b->data;
@@ -39,7 +39,7 @@ _equal(struct scaled_scene_buffer *scaled_buffer_a,
 		&& a->height == b->height;
 }
 
-static struct scaled_scene_buffer_impl impl = {
+static struct scaled_buffer_impl impl = {
 	.create_buffer = _create_buffer,
 	.destroy = _destroy,
 	.equal = _equal,
@@ -53,7 +53,7 @@ scaled_img_buffer_create(struct wlr_scene_tree *parent, struct lab_img *img,
 	assert(img);
 	assert(width >= 0 && height >= 0);
 
-	struct scaled_scene_buffer *scaled_buffer = scaled_scene_buffer_create(
+	struct scaled_buffer *scaled_buffer = scaled_buffer_create(
 		parent, &impl, /* drop_buffer */ true);
 	struct scaled_img_buffer *self = znew(*self);
 	self->scaled_buffer = scaled_buffer;
@@ -64,7 +64,7 @@ scaled_img_buffer_create(struct wlr_scene_tree *parent, struct lab_img *img,
 
 	scaled_buffer->data = self;
 
-	scaled_scene_buffer_request_update(scaled_buffer, width, height);
+	scaled_buffer_request_update(scaled_buffer, width, height);
 
 	return self;
 }
@@ -72,8 +72,8 @@ scaled_img_buffer_create(struct wlr_scene_tree *parent, struct lab_img *img,
 struct scaled_img_buffer *
 scaled_img_buffer_from_node(struct wlr_scene_node *node)
 {
-	struct scaled_scene_buffer *scaled_buffer =
-		node_scaled_scene_buffer_from_node(node);
+	struct scaled_buffer *scaled_buffer =
+		node_scaled_buffer_from_node(node);
 	assert(scaled_buffer->impl == &impl);
 	return scaled_buffer->data;
 }

src/server.c

@@ -48,7 +48,6 @@
 #include "drm-lease-v1-protocol.h"
 #include "action.h"
 #include "common/macros.h"
-#include "common/scaled-scene-buffer.h"
 #include "config/rcxml.h"
 #include "config/session.h"
 #include "decorations.h"
@@ -64,6 +63,7 @@
 #include "output-virtual.h"
 #include "regions.h"
 #include "resize-indicator.h"
+#include "scaled-buffer/scaled-buffer.h"
 #include "session-lock.h"
 #include "theme.h"
 #include "view.h"
@@ -80,7 +80,7 @@
 static void
 reload_config_and_theme(struct server *server)
 {
-	scaled_scene_buffer_invalidate_sharing();
+	scaled_buffer_invalidate_sharing();
 	rcxml_finish();
 	rcxml_read(rc.config_file);
 	theme_finish(server->theme);

src/ssd/resize-indicator.c

@@ -4,11 +4,11 @@
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include "common/macros.h"
-#include "common/scaled-font-buffer.h"
 #include "config/rcxml.h"
 #include "labwc.h"
 #include "resize-indicator.h"
 #include "resize-outlines.h"
+#include "scaled-buffer/scaled-font-buffer.h"
 #include "theme.h"
 #include "view.h"
 

src/ssd/ssd-part.c

@@ -4,9 +4,9 @@
 #include "config/rcxml.h"
 #include "common/list.h"
 #include "common/mem.h"
-#include "common/scaled-icon-buffer.h"
-#include "common/scaled-img-buffer.h"
 #include "node.h"
+#include "scaled-buffer/scaled-icon-buffer.h"
+#include "scaled-buffer/scaled-img-buffer.h"
 #include "ssd-internal.h"
 
 /* Internal helpers */

src/ssd/ssd-titlebar.c

@@ -6,9 +6,6 @@
 #include <wlr/render/pixman.h>
 #include "buffer.h"
 #include "common/mem.h"
-#include "common/scaled-font-buffer.h"
-#include "common/scaled-icon-buffer.h"
-#include "common/scaled-img-buffer.h"
 #include "common/scene-helpers.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
@@ -16,6 +13,9 @@
 #include "img/img.h"
 #include "labwc.h"
 #include "node.h"
+#include "scaled-buffer/scaled-font-buffer.h"
+#include "scaled-buffer/scaled-icon-buffer.h"
+#include "scaled-buffer/scaled-img-buffer.h"
 #include "ssd-internal.h"
 #include "theme.h"
 #include "view.h"