From 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Sun, 20 Jan 2019 13:51:12 -0500 Subject: Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag. --- include/log.h | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) (limited to 'include/log.h') diff --git a/include/log.h b/include/log.h index 6fb2f277..adf431ab 100644 --- a/include/log.h +++ b/include/log.h @@ -1,7 +1,18 @@ #ifndef _SWAY_LOG_H #define _SWAY_LOG_H + #include -#include +#include +#include +#include + +typedef enum { + SWAY_SILENT = 0, + SWAY_ERROR = 1, + SWAY_INFO = 2, + SWAY_DEBUG = 3, + SWAY_LOG_IMPORTANCE_LAST, +} sway_log_importance_t; #ifdef __GNUC__ #define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end))) @@ -9,14 +20,35 @@ #define ATTRIB_PRINTF(start, end) #endif +void error_handler(int sig); + +typedef void (*terminate_callback_t)(int exit_code); + +// Will log all messages less than or equal to `verbosity` +// The `terminate` callback is called by `sway_abort` +void sway_log_init(sway_log_importance_t verbosity, terminate_callback_t terminate); + +void _sway_log(sway_log_importance_t verbosity, const char *format, ...) ATTRIB_PRINTF(2, 3); +void _sway_vlog(sway_log_importance_t verbosity, const char *format, va_list args) ATTRIB_PRINTF(2, 0); void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2); +bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3); + +// TODO: get meson to precompute this, for better reproducibility/less overhead +const char *_sway_strip_path(const char *filepath); + +#define sway_log(verb, fmt, ...) \ + _sway_log(verb, "[%s:%d] " fmt, _sway_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) + +#define sway_vlog(verb, fmt, args) \ + _sway_vlog(verb, "[%s:%d] " fmt, _sway_strip_path(__FILE__), __LINE__, args) + +#define sway_log_errno(verb, fmt, ...) \ + sway_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno)) + #define sway_abort(FMT, ...) \ - _sway_abort("[%s:%d] " FMT, _wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) + _sway_abort("[%s:%d] " FMT, _sway_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) -bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3); #define sway_assert(COND, FMT, ...) \ - _sway_assert(COND, "[%s:%d] %s:" FMT, _wlr_strip_path(__FILE__), __LINE__, __func__, ##__VA_ARGS__) - -void error_handler(int sig); + _sway_assert(COND, "[%s:%d] %s:" FMT, _sway_strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__) #endif -- cgit v1.2.3-54-g00ecf