Put each module in its own subdirectory

CMakeLists.txt

@@ -51,17 +51,17 @@ add_executable(f00bar
   particles/ramp.c particles/ramp.h
   particles/string.c particles/string.h
 
-  modules/alsa.c modules/alsa.h
-  modules/backlight.c modules/backlight.h
-  modules/battery.c modules/battery.h
-  modules/clock.c modules/clock.h
-  modules/i3.c modules/i3.h
-  modules/label.c modules/label.h
-  modules/mpd.c modules/mpd.h
-  modules/network.c modules/network.h
-  modules/removables.c modules/removables.h
-  modules/xkb.c modules/xkb.h
-  modules/xwindow.c modules/xwindow.h
+  modules/alsa/alsa.c modules/alsa/alsa.h
+  modules/backlight/backlight.c modules/backlight/backlight.h
+  modules/battery/battery.c modules/battery/battery.h
+  modules/clock/clock.c modules/clock/clock.h
+  modules/i3/i3.c modules/i3/i3.h
+  modules/label/label.c modules/label/label.h
+  modules/mpd/mpd.c modules/mpd/mpd.h
+  modules/network/network.c modules/network/network.h
+  modules/removables/removables.c modules/removables/removables.h
+  modules/xkb/xkb.c modules/xkb/xkb.h
+  modules/xwindow/xwindow.c modules/xwindow/xwindow.h
   )
 
 target_compile_definitions(f00bar PRIVATE _GNU_SOURCE)

config.c

@@ -21,17 +21,17 @@
 #include "particles/string.h"
 
 #include "module.h"
-#include "modules/alsa.h"
-#include "modules/backlight.h"
-#include "modules/battery.h"
-#include "modules/clock.h"
-#include "modules/i3.h"
-#include "modules/label.h"
-#include "modules/mpd.h"
-#include "modules/network.h"
-#include "modules/removables.h"
-#include "modules/xkb.h"
-#include "modules/xwindow.h"
+#include "modules/alsa/alsa.h"
+#include "modules/backlight/backlight.h"
+#include "modules/battery/battery.h"
+#include "modules/clock/clock.h"
+#include "modules/i3/i3.h"
+#include "modules/label/label.h"
+#include "modules/mpd/mpd.h"
+#include "modules/network/network.h"
+#include "modules/removables/removables.h"
+#include "modules/xkb/xkb.h"
+#include "modules/xwindow/xwindow.h"
 
 #include "config-verify.h"
 

modules/alsa/alsa.c

@@ -7,9 +7,9 @@
 
 #define LOG_MODULE "alsa"
 #define LOG_ENABLE_DBG 0
-#include "../log.h"
-#include "../bar.h"
-#include "../tllist.h"
+#include "../../log.h"
+#include "../../bar.h"
+#include "../../tllist.h"
 
 struct private {
     char *card;

modules/alsa/alsa.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_alsa(
     const char *card, const char *mixer, struct particle *label);

modules/backlight/backlight.c

@@ -13,8 +13,8 @@
 #include <libudev.h>
 
 #define LOG_MODULE "battery"
-#include "../log.h"
-#include "../bar.h"
+#include "../../log.h"
+#include "../../bar.h"
 
 struct private {
     struct particle *label;

modules/backlight/backlight.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_backlight(const char *device, struct particle *label);

modules/battery/battery.c

@@ -14,8 +14,8 @@
 #include <libudev.h>
 
 #define LOG_MODULE "battery"
-#include "../log.h"
-#include "../bar.h"
+#include "../../log.h"
+#include "../../bar.h"
 
 enum state { STATE_FULL, STATE_CHARGING, STATE_DISCHARGING };
 

modules/battery/battery.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_battery(
     const char *battery, struct particle *label, int poll_interval_secs);

modules/clock/clock.c

@@ -6,7 +6,7 @@
 
 #include <poll.h>
 
-#include "../bar.h"
+#include "../../bar.h"
 
 struct private {
     struct particle *label;

modules/clock/clock.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_clock(
     struct particle *label, const char *date_format, const char *time_format);

modules/i3/i3.c

@@ -19,10 +19,10 @@
 
 #define LOG_MODULE "i3"
 #define LOG_ENABLE_DBG 0
-#include "../log.h"
-#include "../bar.h"
+#include "../../log.h"
+#include "../../bar.h"
 
-#include "../particles/dynlist.h"
+#include "../../particles/dynlist.h"
 
 struct ws_content {
     char *name;

modules/i3/i3.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 /* Maps workspace name to a content particle. */
 struct i3_workspaces {

modules/label/label.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_label(struct particle *label);

modules/mpd/mpd.c

@@ -16,8 +16,8 @@
 
 #define LOG_MODULE "mpd"
 #define LOG_ENABLE_DBG 0
-#include "../log.h"
-#include "../bar.h"
+#include "../../log.h"
+#include "../../bar.h"
 
 enum state {
     STATE_OFFLINE = 1000,

modules/mpd/mpd.h

@@ -2,8 +2,8 @@
 
 #include <stdint.h>
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_mpd(
     const char *host, uint16_t port, struct particle *label);

modules/network/network.c

@@ -16,10 +16,10 @@
 
 #define LOG_MODULE "network"
 #define LOG_ENABLE_DBG 0
-#include "../log.h"
-#include "../module.h"
-#include "../bar.h"
-#include "../tllist.h"
+#include "../../log.h"
+#include "../../module.h"
+#include "../../bar.h"
+#include "../../tllist.h"
 
 struct af_addr {
     int family;
@@ -141,6 +141,8 @@ netlink_connect(void)
         .nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR,
     };
 
+    LOG_WARN("nl_pid_value = 0x%08x", addr.nl_pid);
+
     if (bind(sock, (const struct sockaddr *)&addr, sizeof(addr)) == -1) {
         LOG_ERRNO("failed to bind netlink socket");
         close(sock);

modules/network/network.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_network(const char *iface, struct particle *label);

modules/removables/removables.c

@@ -16,10 +16,10 @@
 
 #define LOG_MODULE "removables"
 #define LOG_ENABLE_DBG 0
-#include "../log.h"
-#include "../bar.h"
-#include "../tllist.h"
-#include "../particles/dynlist.h"
+#include "../../log.h"
+#include "../../bar.h"
+#include "../../tllist.h"
+#include "../../particles/dynlist.h"
 
 typedef tll(char *) mount_point_list_t;
 

modules/removables/removables.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_removables(
     struct particle *label, int left_spacing, int right_spacing);

modules/xkb/xkb.c

@@ -11,9 +11,9 @@
 #include <xcb/xkb.h>
 
 #define LOG_MODULE "xkb"
-#include "../log.h"
-#include "../bar.h"
-#include "../xcb.h"
+#include "../../log.h"
+#include "../../bar.h"
+#include "../../xcb.h"
 
 struct layout {
     char *name;

modules/xkb/xkb.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_xkb(struct particle *label);

modules/xwindow/xwindow.c

@@ -15,9 +15,9 @@
 #include <xcb/xcb_event.h>
 
 #define LOG_MODULE "xkb"
-#include "../log.h"
-#include "../bar.h"
-#include "../xcb.h"
+#include "../../log.h"
+#include "../../bar.h"
+#include "../../xcb.h"
 
 struct private {
     /* Accessed from bar thread only */

modules/xwindow/xwindow.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../module.h"
-#include "../particle.h"
+#include "../../module.h"
+#include "../../particle.h"
 
 struct module *module_xwindow(struct particle *label);