Rename osd.{h,c} to cycle.{h,c}

diff --git a/include/osd.h b/include/cycle.h
similarity index 97%
rename from include/osd.h
rename to include/cycle.h
index 2ecaa2029774ff3c9047f01cf616b29c9b08a311..f27405a5942df964651ceba6a52c8010748a619c 100644 (file)
--- a/include/osd.h
+++ b/include/cycle.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef LABWC_OSD_H
-#define LABWC_OSD_H
+#ifndef LABWC_CYCLE_H
+#define LABWC_CYCLE_H
 
 #include <stdbool.h>
 #include <wayland-server-core.h>
@@ -98,4 +98,4 @@ struct osd_impl {
 extern struct osd_impl osd_classic_impl;
 extern struct osd_impl osd_thumbnail_impl;
 
-#endif // LABWC_OSD_H
+#endif // LABWC_CYCLE_H

diff --git a/src/action.c b/src/action.c
index a351160d455a9dd55e47d12b7bf428aa830cf144..02c90eca9cc413efade153c1528e4e3d476e4315 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -18,12 +18,12 @@
 #include "common/spawn.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
+#include "cycle.h"
 #include "debug.h"
 #include "input/keyboard.h"
 #include "labwc.h"
 #include "magnifier.h"
 #include "menu/menu.h"
-#include "osd.h"
 #include "output.h"
 #include "output-virtual.h"
 #include "regions.h"

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 264c65a83c9e32397688f14a0e2eadf971da076e..0f4b8c47b8787bb332ec34138e612e3137db5961 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -29,8 +29,8 @@
 #include "config/tablet.h"
 #include "config/tablet-tool.h"
 #include "config/touch.h"
+#include "cycle.h"
 #include "labwc.h"
-#include "osd.h"
 #include "regions.h"
 #include "ssd.h"
 #include "translate.h"

diff --git a/src/osd/osd.c b/src/cycle/cycle.c
similarity index 99%
rename from src/osd/osd.c
rename to src/cycle/cycle.c
index 149f8d4284ee9bc40103276e4dc924894a292696..350b5f3f7eb8331b0f909482ab7519b5ca8030cb 100644 (file)
--- a/src/osd/osd.c
+++ b/src/cycle/cycle.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include "osd.h"
+#include "cycle.h"
 #include <assert.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/box.h>

diff --git a/src/osd/meson.build b/src/cycle/meson.build
similarity index 86%
rename from src/osd/meson.build
rename to src/cycle/meson.build
index 17b4bf513cd1db0a974bc349e1f976c274e3011d..07e9f7aaa457b1e2f2d4b03099a0d520a047415d 100644 (file)
--- a/src/osd/meson.build
+++ b/src/cycle/meson.build
@@ -1,5 +1,5 @@
 labwc_sources += files(
-  'osd.c',
+  'cycle.c',
   'osd-classic.c',
   'osd-field.c',
   'osd-thumbnail.c',

diff --git a/src/osd/osd-classic.c b/src/cycle/osd-classic.c
similarity index 99%
rename from src/osd/osd-classic.c
rename to src/cycle/osd-classic.c
index 0c80bd799ab3b7d567a98ac032d241b4871018aa..e02f8ed177cb778539c76e3956c324d4afcc0114 100644 (file)
--- a/src/osd/osd-classic.c
+++ b/src/cycle/osd-classic.c
@@ -11,9 +11,9 @@
 #include "common/list.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
+#include "cycle.h"
 #include "labwc.h"
 #include "node.h"
-#include "osd.h"
 #include "output.h"
 #include "scaled-buffer/scaled-font-buffer.h"
 #include "scaled-buffer/scaled-icon-buffer.h"

diff --git a/src/osd/osd-field.c b/src/cycle/osd-field.c
similarity index 99%
rename from src/osd/osd-field.c
rename to src/cycle/osd-field.c
index c84cce46e801e05feaacb78ff66f28d020eff830..4497573ea007a80cf7c5b953004ec2177f1fc647 100644 (file)
--- a/src/osd/osd-field.c
+++ b/src/cycle/osd-field.c
@@ -5,11 +5,11 @@
 #include "common/buf.h"
 #include "common/mem.h"
 #include "config/rcxml.h"
+#include "cycle.h"
 #include "view.h"
 #include "workspaces.h"
 #include "labwc.h"
 #include "desktop-entry.h"
-#include "osd.h"
 #include "output.h"
 
 /* includes '%', terminating 's' and NULL byte, 8 is enough for %-9999s */

diff --git a/src/osd/osd-thumbnail.c b/src/cycle/osd-thumbnail.c
similarity index 99%
rename from src/osd/osd-thumbnail.c
rename to src/cycle/osd-thumbnail.c
index 6861089601689290abf9a5cc4c2da0b0e26226d8..724fc62a64f03682d7e03f24d98e2ae315ddcf87 100644 (file)
--- a/src/osd/osd-thumbnail.c
+++ b/src/cycle/osd-thumbnail.c
@@ -10,9 +10,9 @@
 #include "common/buf.h"
 #include "common/lab-scene-rect.h"
 #include "common/list.h"
+#include "cycle.h"
 #include "labwc.h"
 #include "node.h"
-#include "osd.h"
 #include "output.h"
 #include "scaled-buffer/scaled-font-buffer.h"
 #include "scaled-buffer/scaled-icon-buffer.h"

diff --git a/src/input/cursor.c b/src/input/cursor.c
index bf46f175bc3e7875d89b6bc47db25e1346a37235..2660ef6dacdf6694a0438e77aecf64fa475e2bdd 100644 (file)
--- a/src/input/cursor.c
+++ b/src/input/cursor.c
@@ -21,6 +21,7 @@
 #include "common/mem.h"
 #include "config/mousebind.h"
 #include "config/rcxml.h"
+#include "cycle.h"
 #include "dnd.h"
 #include "idle.h"
 #include "input/gestures.h"
@@ -30,7 +31,6 @@
 #include "labwc.h"
 #include "layers.h"
 #include "menu/menu.h"
-#include "osd.h"
 #include "output.h"
 #include "resistance.h"
 #include "resize-outlines.h"

diff --git a/src/input/keyboard.c b/src/input/keyboard.c
index f6b0114c196c7a4837dcfeee758f7296698cfa1b..ab47dd4c5b9b64ca12912e0d74f0876d98bf1103 100644 (file)
--- a/src/input/keyboard.c
+++ b/src/input/keyboard.c
@@ -11,12 +11,12 @@
 #include "common/macros.h"
 #include "config/keybind.h"
 #include "config/rcxml.h"
+#include "cycle.h"
 #include "idle.h"
 #include "input/ime.h"
 #include "input/key-state.h"
 #include "labwc.h"
 #include "menu/menu.h"
-#include "osd.h"
 #include "session-lock.h"
 #include "view.h"
 #include "workspaces.h"

diff --git a/src/meson.build b/src/meson.build
index 330b5daf5f41d7b5a7b31f390df4596976994f80..a9afdc4f48abb6a4d0f5402f0c84817b933d3b6a 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -49,12 +49,12 @@ endif
 
 subdir('common')
 subdir('config')
+subdir('cycle')
 subdir('decorations')
 subdir('foreign-toplevel')
 subdir('img')
 subdir('input')
 subdir('menu')
-subdir('osd')
 subdir('protocols')
 subdir('scaled-buffer')
 subdir('ssd')

diff --git a/src/view.c b/src/view.c
index 250ac1ab731a9a0090f01709af1e0a02862e3507..acb1ec0bc1e1fb09c1746da45d46ec7708f31045 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -15,11 +15,11 @@
 #include "common/match.h"
 #include "common/mem.h"
 #include "config/rcxml.h"
+#include "cycle.h"
 #include "foreign-toplevel/foreign.h"
 #include "input/keyboard.h"
 #include "labwc.h"
 #include "menu/menu.h"
-#include "osd.h"
 #include "output.h"
 #include "placement.h"
 #include "regions.h"