#164 broadcast change messages with descriptions

.iwyu.mappings

@@ -0,0 +1,4 @@
+[
+{ symbol: [ va_start, private, <stdarg.h>, public] },
+{ symbol: [ va_end,   private, <stdarg.h>, public] }
+]

GNUmakefile

@@ -62,11 +62,9 @@ man: doc/way-displays.1.pandoc
 iwyu: override CC = $(IWYU) -Xiwyu --check_also="inc/*h"
 iwyu: override CXX = $(IWYU) -Xiwyu --check_also="inc/marshalling.h"
 iwyu: clean $(SRC_O) $(TST_O) $(EXAMPLE_O)
-IWYU = include-what-you-use -Xiwyu --no_fwd_decls -Xiwyu --error=1 -Xiwyu --verbose=3
+IWYU = include-what-you-use -Xiwyu --no_fwd_decls -Xiwyu --error=1 -Xiwyu --verbose=3 -Xiwyu --mapping_file=.iwyu.mappings
 
 cppcheck: $(SRC_C) $(SRC_CXX) $(INC_H) $(EXAMPLE_C) $(TST_H) $(TST_C)
-	# TODO: add --check-level=exhaustive when cppcheck ~2.14 is availble for CI
-	# cppcheck --enable=warning,unusedFunction,performance,portability --check-level=exhaustive --suppressions-list=bld/cppcheck.supp --error-exitcode=1 $(^)
 	cppcheck --enable=warning,unusedFunction,performance,portability --suppressions-list=bld/cppcheck.supp --error-exitcode=1 $(^)
 
 %-vg: VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all --errors-for-leak-kinds=all --gen-suppressions=all --suppressions=bld/vg.supp

bld/cppcheck.supp

@@ -1,3 +1,8 @@
 unusedFunction:lib/col/*c
-unusedFunction:tst/wrap-log.c
 unusedFunction:pro/*h
+
+unusedFunction:tst/asserts.h
+unusedFunction:tst/wrap-*.c
+
+# TODO use --check-level=exhaustive once available in CI
+normalCheckLevelMaxBranches

bld/vg.supp

@@ -24,6 +24,17 @@
    fun:main
 }
 
+{
+   wacom DB new
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:*alloc
+   ...
+   fun:libwacom_database_new
+   ...
+   obj:/usr/lib/libinput.so.10.13.0
+}
+
 {
    g_object_new_valist - from evdev
    Memcheck:Leak
@@ -39,7 +50,7 @@
    match-leak-kinds: reachable
    ...
    fun:evdev_device_create
-   fun:device_added
+   fun:device_added*
 }
 
 {

examples/poke-server.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <sys/un.h>
-#include <unistd.h>
 
 #include "process.h"
 #include "sockets.h"

inc/cfg.h

@@ -136,11 +136,11 @@ bool cfg_equal_user_transform_name(const void *value, const void *data);
 
 bool cfg_equal_user_transform(const void *value, const void *data);
 
-void cfg_user_scale_free(void *user_scale);
+void cfg_user_scale_free(const void *user_scale);
 
-void cfg_user_mode_free(void *user_mode);
+void cfg_user_mode_free(const void *user_mode);
 
-void cfg_user_transform_free(void *user_transform);
+void cfg_user_transform_free(const void *user_transform);
 
 void cfg_destroy(void);
 

inc/displ.h

@@ -4,18 +4,29 @@
 #include <stdint.h>
 
 // IWYU pragma: begin_keep
-#include "wlr-output-management-unstable-v1.h"
 #include "xdg-output-unstable-v1.h"
 // IWYU pragma: end_keep
 
-enum ConfigState {
+#include "cfg.h"
+#include "head.h"
+
+enum DisplState {
 	IDLE = 0,
 	SUCCEEDED,
 	OUTSTANDING,
 	CANCELLED,
 	FAILED,
 };
 
+struct DisplDelta {
+	enum CfgElement element; // 0 for many changes, VRR_OFF indicates toggle
+
+	// only when element set
+	struct Head *head;
+
+	char *human;
+};
+
 struct Displ {
 	// global
 	struct wl_registry *registry;
@@ -34,11 +45,16 @@ struct Displ {
 	uint32_t zxdg_output_manager_version;
 	char *zxdg_output_manager_interface;
 
-	enum ConfigState config_state;
+	enum DisplState state;
+	struct DisplDelta delta;
 };
 
 void displ_init(void);
 
+void displ_delta_init(enum CfgElement element, struct Head *head);
+
+void displ_delta_destroy(void);
+
 void displ_destroy(void);
 
 #endif // DISPL_H

inc/fs.h

@@ -6,7 +6,7 @@
 
 bool mkdir_p(char *path, mode_t mode);
 
-bool file_write(const char *path, const char *contents);
+bool file_write(const char *path, const char *contents, const char *mode);
 
 #endif // FS_H
 

inc/global.h

@@ -7,7 +7,4 @@ extern struct Lid *lid;
 
 extern struct SList *cfg_file_paths;
 
-extern struct Head *head_changing_mode;
-extern struct Head *head_changing_adaptive_sync;
-
 #endif // GLOBAL_H

inc/head.h

@@ -96,7 +96,7 @@ bool head_current_adaptive_sync_not_desired(const void *head);
 
 void head_release_mode(struct Head *head, struct Mode *mode);
 
-void head_free(void *head);
+void head_free(const void *head);
 
 void heads_release_head(struct Head *head);
 

inc/info.h

@@ -5,11 +5,14 @@
 #include <stddef.h>
 
 #include "cfg.h"
+#include "displ.h"
 #include "head.h"
 #include "slist.h"
 #include "log.h"
 #include "mode.h"
 
+#define LEN_HUMAN 1024 * 64
+
 enum InfoEvent {
 	ARRIVED,
 	DEPARTED,
@@ -35,5 +38,14 @@ void info_user_mode_string(struct UserMode *user_mode, char *buf, size_t nbuf);
 
 void info_mode_string(struct Mode *mode, char *buf, size_t nbuf);
 
+// LEN_HUMAN, consumer frees
+char *delta_human(const enum DisplState state, const struct SList * const heads);
+
+// LEN_HUMAN, consumer frees
+char *delta_human_mode(const enum DisplState state, const struct Head * const head);
+
+// LEN_HUMAN, consumer frees
+char *delta_human_adaptive_sync(const enum DisplState state, const struct Head * const head);
+
 #endif // INFO_H
 

inc/ipc.h

@@ -24,8 +24,8 @@ struct IpcOperation {
 	int socket_client;
 	bool done;
 	int rc;
-	bool send_logs;		// not for bad or colliding requests
 	bool send_state;	// not for bad requests
+	struct SList *log_cap_lines;
 };
 
 struct IpcRequest {
@@ -64,7 +64,7 @@ struct SList *ipc_receive_responses(int socket_client, char **yaml);
 
 void ipc_request_free(struct IpcRequest *request);
 
-void ipc_response_free(void *response);
+void ipc_response_free(const void *response);
 
 void ipc_operation_free(struct IpcOperation *operation);
 

inc/log.h

@@ -17,14 +17,16 @@ struct LogCapLine {
 	char *line;
 	enum LogThreshold threshold;
 };
-extern struct SList *log_cap_lines;
+
 
 void log_set_threshold(enum LogThreshold threshold, bool cli);
 
 void log_set_times(bool times);
 
+
 void log_(enum LogThreshold threshold, const char *__restrict __format, ...);
 
+
 void log_debug(const char *__restrict __format, ...);
 
 void log_info(const char *__restrict __format, ...);
@@ -37,20 +39,20 @@ void log_error(const char *__restrict __format, ...);
 
 void log_error_errno(const char *__restrict __format, ...);
 
+
 void log_suppress_start(void);
 
 void log_suppress_stop(void);
 
-void log_capture_start(void);
 
-void log_capture_stop(void);
+// caller must call stop and free lines
+void log_cap_lines_start(struct SList **log_cap_lines);
 
-void log_capture_clear(void);
+void log_cap_lines_stop(struct SList **log_cap_lines);
 
-// NULL plays back log_cap_lines
-void log_capture_playback(struct SList *lines);
+void log_cap_lines_free(struct SList **log_cap_lines);
 
-void log_cap_line_free(void *log_cap_line);
+void log_cap_lines_playback(struct SList *log_cap_lines);
 
 #endif // LOG_H
 

inc/mode.h

@@ -5,7 +5,6 @@
 #include <stdint.h>
 
 #include "cfg.h"
-#include "global.h"
 #include "slist.h"
 #include "wlr-output-management-unstable-v1.h"
 
@@ -48,9 +47,9 @@ struct SList *modes_res_refresh(struct SList *modes);
 
 struct Mode *mode_init(struct Head *head, struct zwlr_output_mode_v1 *zwlr_mode, int32_t width, int32_t height, int32_t refresh_mhz, bool preferred);
 
-void mode_free(void *mode);
+void mode_free(const void *mode);
 
-void mode_res_refresh_free(void *mode);
+void mode_res_refresh_free(const void *mode);
 
 struct Mode *mode_user_mode(struct SList *modes, struct SList *modes_failed, struct UserMode *user_mode);
 

inc/process.h

@@ -3,13 +3,15 @@
 
 #include <sys/types.h>
 
+#include "stable.h"
+
 char *pid_path(void);
 
 pid_t pid_active_server(void);
 
 void pid_file_create(void);
 
-void spawn_sh_cmd(const char * const command);
+void spawn_sh_cmd(const char * const command, const struct STable * const env);
 
 // exit; caller should return afterwards
 void wd_exit(int __status);

inc/sockets.h

@@ -1,6 +1,7 @@
 #ifndef SOCKETS_H
 #define SOCKETS_H
 
+#include <stddef.h>
 #include <sys/types.h>
 #include <sys/un.h>
 

lib/col/.source

@@ -1 +1 @@
-git@github.com:alex-courtis/alex-c-collections.git v1.1.1
+git@github.com:alex-courtis/alex-c-collections.git v1.4.1

lib/col/inc/fn.h

@@ -0,0 +1,33 @@
+#ifndef FN_H
+#define FN_H
+
+#include <stdbool.h>
+
+//
+// a is generally the value from the collection, b is user supplied
+//
+typedef bool (*fn_equals)(const void* const a, const void* const b);
+
+// true if both NULL or strcmp(a, b) == 0
+bool fn_comp_equals_strcmp(const void* const a, const void* const b);
+
+// true if both NULL or strstr(a, b)
+bool fn_comp_equals_strstr(const void* const a, const void* const b);
+
+//
+// a < b
+//
+typedef bool (*fn_less_than)(const void* const a, const void* const b);
+
+//
+// arbitrary test
+//
+typedef bool (*fn_test)(const void* const val);
+
+//
+// free
+//
+typedef void (*fn_free_val)(const void* const val);
+
+#endif // FN_H
+

lib/col/inc/itable.h

@@ -1,9 +1,12 @@
 #ifndef ITABLE_H
 #define ITABLE_H
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#include "fn.h"
+
 /*
  * Array backed integer indexed table.
  * Entries preserve insertion order.
@@ -31,8 +34,8 @@ const struct ITable *itable_init(const size_t initial, const size_t grow);
 // free table
 void itable_free(const void* const tab);
 
-// free table and vals, null free_val uses free()
-void itable_free_vals(const struct ITable* const tab, void (*free_val)(const void* const val));
+// free table and vals, null fn_free_val uses free()
+void itable_free_vals(const struct ITable* const tab, fn_free_val);
 
 // free iter
 void itable_iter_free(const struct ITableIter* const iter);
@@ -50,9 +53,6 @@ const struct ITableIter *itable_iter(const struct ITable* const tab);
 // next iterator value, NULL at end of list
 const struct ITableIter *itable_next(const struct ITableIter* const iter);
 
-// number of entries with val
-size_t itable_size(const struct ITable* const tab);
-
 /*
  * Mutate
  */
@@ -63,5 +63,32 @@ const void *itable_put(const struct ITable* const tab, const uint64_t key, const
 // remove key, return old val if present
 const void *itable_remove(const struct ITable* const tab, const uint64_t key);
 
+/*
+ * Comparison
+ */
+
+// same length, keys and vals equal in order, NULL equal compares pointers
+bool itable_equal(const struct ITable* const a, const struct ITable* const b, fn_equals);
+
+/*
+ * Conversion
+ */
+
+// ordered uint64_t* key pointers to table, caller frees list only
+struct SList *itable_keys_slist(const struct ITable* const tab);
+
+// ordered val pointers to table, caller frees list only
+struct SList *itable_vals_slist(const struct ITable* const tab);
+
+/*
+ * Info
+ */
+
+// number of entries with val
+size_t itable_size(const struct ITable* const tab);
+
+// current capacity: initial + n * grow
+size_t itable_capacity(const struct ITable* const tab);
+
 #endif // ITABLE_H