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

---
 meson.build         | 6 ++++--
 meson_options.txt   | 4 +++-
 modules/meson.build | 6 +++++-
 plugin.c            | 8 ++++++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index ebcec99..6bf4e21 100644
--- a/meson.build
+++ b/meson.build
@@ -139,6 +139,7 @@ yambar = executable(
     plugin_cpu_enabled ? '-DPLUGIN_ENABLED_CPU' : [],
     plugin_disk_io_enabled ? '-DPLUGIN_ENABLED_DISK_IO' : [],
     plugin_dwl_enabled ? '-DPLUGIN_ENABLED_DWL' : [],
+    plugin_mem_enabled ? '-DPLUGIN_ENABLED_MEM' : [],
     plugin_mpd_enabled ? '-DPLUGIN_ENABLED_MPD' : [],
     plugin_pipewire_enabled ? '-DPLUGIN_ENABLED_PIPEWIRE' : [],
     plugin_pulse_enabled ? '-DPLUGIN_ENABLED_PULSE' : [],
@@ -184,9 +185,10 @@ summary(
     'Backlight': plugin_backlight_enabled,
     'Battery': plugin_battery_enabled,
     'Clock': plugin_clock_enabled,
-    'CPU': plugin_cpu_enabled,
-    'Disk I/O': plugin_disk_io_enabled,
+    'CPU monitoring': plugin_cpu_enabled,
+    'Disk I/O monitoring': plugin_disk_io_enabled,
     'DWL (dwm for Wayland)': plugin_dwl_enabled,
+    'Memory monitoring': plugin_mem_enabled,
     'Music Player Daemon (MPD)': plugin_mpd_enabled,
     'Pipewire': plugin_pipewire_enabled,
     'PulseAudio': plugin_pulse_enabled,
diff --git a/meson_options.txt b/meson_options.txt
index ad1f130..4c287ab 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,11 +15,13 @@ option('plugin-battery', type: 'feature', value: 'auto',
 option('plugin-clock', type: 'feature', value: 'auto',
        description: 'Clock support')
 option('plugin-cpu', type: 'feature', value: 'auto',
-       description: 'CPU support')
+       description: 'CPU monitoring support')
 option('plugin-disk-io', type: 'feature', value: 'auto',
        description: 'Disk I/O support')
 option('plugin-dwl', type: 'feature', value: 'auto',
        description: 'DWL (dwm for wayland) support')
+option('plugin-mem', type: 'feature', value: 'auto',
+       description: 'Memory monitoring support')
 option('plugin-mpd', type: 'feature', value: 'auto',
        description: 'Music Player Daemon (MPD) support')
 option('plugin-pipewire', type: 'feature', value: 'auto',
diff --git a/modules/meson.build b/modules/meson.build
index aedc343..c9d4aa3 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -19,6 +19,7 @@ plugin_battery_enabled = udev_battery.found()
 plugin_clock_enabled = get_option('plugin-clock').allowed()
 plugin_cpu_enabled = get_option('plugin-cpu').allowed()
 plugin_disk_io_enabled = get_option('plugin-disk-io').allowed()
+plugin_mem_enabled = get_option('plugin-mem').allowed()
 
 mpd = dependency('libmpdclient', required: get_option('plugin-mpd'))
 plugin_mpd_enabled = mpd.found()
@@ -33,7 +34,6 @@ plugin_dwl_enabled = get_option('plugin-dwl').allowed()
 
 # Module name -> (source-list, dep-list)
 mod_data = {
-  'mem': [[], []],
   'i3': [['i3-common.c', 'i3-common.h'], [dynlist, json]],
   'label': [[], []],
   'network': [[], []],
@@ -70,6 +70,10 @@ if plugin_dwl_enabled
   mod_data += {'dwl': [[], [dynlist]]}
 endif
 
+if plugin_mem_enabled
+  mod_data += {'mem': [[], []]}
+endif
+
 if plugin_mpd_enabled
   mod_data += {'mpd': [[], [mpd]]}
 endif
diff --git a/plugin.c b/plugin.c
index 0828e7e..f61a334 100644
--- a/plugin.c
+++ b/plugin.c
@@ -56,6 +56,9 @@ EXTERN_MODULE(dwl);
 EXTERN_MODULE(foreign_toplevel);
 EXTERN_MODULE(i3);
 EXTERN_MODULE(label);
+#if defined(PLUGIN_ENABLED_MEM)
+EXTERN_MODULE(mem);
+#endif
 #if defined(PLUGIN_ENABLED_MPD)
 EXTERN_MODULE(mpd);
 #endif
@@ -72,7 +75,6 @@ EXTERN_MODULE(sway_xkb);
 EXTERN_MODULE(script);
 EXTERN_MODULE(xkb);
 EXTERN_MODULE(xwindow);
-EXTERN_MODULE(mem);
 
 EXTERN_PARTICLE(empty);
 EXTERN_PARTICLE(list);
@@ -162,6 +164,9 @@ init(void)
 #endif
     REGISTER_CORE_MODULE(i3, i3);
     REGISTER_CORE_MODULE(label, label);
+#if defined(PLUGIN_ENABLED_MEM)
+    REGISTER_CORE_MODULE(mem, mem);
+#endif
 #if defined(PLUGIN_ENABLED_MPD)
     REGISTER_CORE_MODULE(mpd, mpd);
 #endif
@@ -184,7 +189,6 @@ init(void)
 #if defined(HAVE_PLUGIN_xwindow)
     REGISTER_CORE_MODULE(xwindow, xwindow);
 #endif
-    REGISTER_CORE_MODULE(mem, mem);
 
     REGISTER_CORE_PARTICLE(empty, empty);
     REGISTER_CORE_PARTICLE(list, list);