From b6450446a8814c12160bf69a4d173d04b387189d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Wed, 14 Dec 2022 09:53:24 +0100
Subject: [PATCH] =?UTF-8?q?meson:=20make=20=E2=80=98sway-xkb=E2=80=99=20pl?=
 =?UTF-8?q?ugin=20compile=20time=20optional?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 meson.build         |  2 ++
 meson_options.txt   | 10 ++++++----
 modules/meson.build | 12 ++++++++----
 plugin.c            |  8 ++++++--
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/meson.build b/meson.build
index fd4eb67..3223683 100644
--- a/meson.build
+++ b/meson.build
@@ -148,6 +148,7 @@ yambar = executable(
     plugin_pulse_enabled ? '-DPLUGIN_ENABLED_PULSE' : [],
     plugin_removables_enabled ? '-DPLUGIN_ENABLED_REMOVABLES' : [],
     plugin_script_enabled ? '-DPLUGIN_ENABLED_SCRIPT' : [],
+    plugin_sway_xkb_enabled ? '-DPLUGIN_ENABLED_SWAY_XKB' : [],
   ],
   build_rpath: '$ORIGIN/modules:$ORIGIN/decorations:$ORIGIN/particles',
   export_dynamic: true,
@@ -202,6 +203,7 @@ summary(
     'PulseAudio': plugin_pulse_enabled,
     'Removables monitoring': plugin_removables_enabled,
     'Script': plugin_script_enabled,
+    'Sway XKB keyboard': plugin_sway_xkb_enabled,
   },
   section: 'Optional modules',
   bool_yn: true
diff --git a/meson_options.txt b/meson_options.txt
index 918f207..6c85875 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -30,11 +30,13 @@ option('plugin-label', type: 'feature', value: 'auto',
        description: 'Label support')
 option('plugin-network', type: 'feature', value: 'auto',
        description: 'Network monitoring support')
-option('plugin-removables', type: 'feature', value: 'auto',
-       description: 'Removables (USB sticks, CD-ROM etc) monitoring support')
-option('plugin-script', type: 'feature', value: 'auto',
-       description: 'Script support')
 option('plugin-pipewire', type: 'feature', value: 'auto',
        description: 'Pipewire support')
 option('plugin-pulse', type: 'feature', value: 'auto',
        description: 'PulseAudio support')
+option('plugin-removables', type: 'feature', value: 'auto',
+       description: 'Removables (USB sticks, CD-ROM etc) monitoring support')
+option('plugin-script', type: 'feature', value: 'auto',
+       description: 'Script support')
+option('plugin-sway-xkb', type: 'feature', value: 'auto',
+       description: 'keyboard support for Sway')
diff --git a/modules/meson.build b/modules/meson.build
index 5f34d00..9964b00 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -2,7 +2,6 @@ module_sdk = declare_dependency(dependencies: [pixman, threads, tllist, fcft])
 
 modules = []
 
-json = dependency('json-c')
 xcb_xkb = dependency('xcb-xkb', required: get_option('backend-x11'))
 
 # Optional deps
@@ -42,10 +41,11 @@ plugin_removables_enabled = udev_removables.found()
 
 plugin_script_enabled = get_option('plugin-script').allowed()
 
+json_sway_xkb = dependency('json-c', required: get_option('plugin-sway-xkb'))
+plugin_sway_xkb_enabled = json_sway_xkb.found()
+
 # Module name -> (source-list, dep-list)
-mod_data = {
-  'sway-xkb': [['i3-common.c', 'i3-common.h'], [dynlist, json]],
-}
+mod_data = {}
 
 if plugin_alsa_enabled
   mod_data += {'alsa': [[], [m, alsa]]}
@@ -111,6 +111,10 @@ if plugin_script_enabled
   mod_data += {'script': [[], []]}
 endif
 
+if plugin_sway_xkb_enabled
+  mod_data += {'sway-xkb': [['i3-common.c', 'i3-common.h'], [dynlist, json_sway_xkb]]}
+endif
+
 if backend_x11
   mod_data += {
     'xkb': [[], [xcb_stuff, xcb_xkb]],
diff --git a/plugin.c b/plugin.c
index c6efc40..79936cd 100644
--- a/plugin.c
+++ b/plugin.c
@@ -81,8 +81,10 @@ EXTERN_MODULE(removables);
 #if defined(PLUGIN_ENABLED_SCRIPT)
 EXTERN_MODULE(script);
 #endif
-EXTERN_MODULE(river);
+#if defined(PLUGIN_ENABLED_SWAY_XKB)
 EXTERN_MODULE(sway_xkb);
+#endif
+EXTERN_MODULE(river);
 EXTERN_MODULE(xkb);
 EXTERN_MODULE(xwindow);
 
@@ -199,10 +201,12 @@ init(void)
 #if defined(PLUGIN_ENABLED_SCRIPT)
     REGISTER_CORE_MODULE(script, script);
 #endif
+#if defined(PLUGIN_ENABLED_SWAY_XKB)
+    REGISTER_CORE_MODULE(sway-xkb, sway_xkb);
+#endif
 #if defined(HAVE_PLUGIN_river)
     REGISTER_CORE_MODULE(river, river);
 #endif
-    REGISTER_CORE_MODULE(sway-xkb, sway_xkb);
 #if defined(HAVE_PLUGIN_xkb)
     REGISTER_CORE_MODULE(xkb, xkb);
 #endif