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.

1 files changed, 7 insertions, 7 deletions

diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index 1cdd7c6d..55cf1c5e 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -260,14 +260,14 @@ static void apply_container_state(struct sway_container *container,
  * Apply a transaction to the "current" state of the tree.
  */
 static void transaction_apply(struct sway_transaction *transaction) {
-        wlr_log(WLR_DEBUG, "Applying transaction %p", transaction);
+        sway_log(SWAY_DEBUG, "Applying transaction %p", transaction);
         if (debug.txn_timings) {
                 struct timespec now;
                 clock_gettime(CLOCK_MONOTONIC, &now);
                 struct timespec *commit = &transaction->commit_time;
                 float ms = (now.tv_sec - commit->tv_sec) * 1000 +
                         (now.tv_nsec - commit->tv_nsec) / 1000000.0;
-                wlr_log(WLR_DEBUG, "Transaction %p: %.1fms waiting "
+                sway_log(SWAY_DEBUG, "Transaction %p: %.1fms waiting "
                                 "(%.1f frames if 60Hz)", transaction, ms, ms / (1000.0f / 60));
         }
 
@@ -363,7 +363,7 @@ static void transaction_progress_queue(void) {
 
 static int handle_timeout(void *data) {
         struct sway_transaction *transaction = data;
-        wlr_log(WLR_DEBUG, "Transaction %p timed out (%zi waiting)",
+        sway_log(SWAY_DEBUG, "Transaction %p timed out (%zi waiting)",
                         transaction, transaction->num_waiting);
         transaction->num_waiting = 0;
         transaction_progress_queue();
@@ -398,7 +398,7 @@ static bool should_configure(struct sway_node *node,
 }
 
 static void transaction_commit(struct sway_transaction *transaction) {
-        wlr_log(WLR_DEBUG, "Transaction %p committing with %i instructions",
+        sway_log(SWAY_DEBUG, "Transaction %p committing with %i instructions",
                         transaction, transaction->instructions->length);
         transaction->num_waiting = 0;
         for (int i = 0; i < transaction->instructions->length; ++i) {
@@ -449,7 +449,7 @@ static void transaction_commit(struct sway_transaction *transaction) {
                         wl_event_source_timer_update(transaction->timer,
                                         server.txn_timeout_ms);
                 } else {
-                        wlr_log(WLR_ERROR, "Unable to create transaction timer (%s). "
+                        sway_log(SWAY_ERROR, "Unable to create transaction timer (%s). "
                                         "Some imperfect frames might be rendered.",
                                         strerror(errno));
                         transaction->num_waiting = 0;
@@ -472,7 +472,7 @@ static void set_instruction_ready(
                 struct timespec *start = &transaction->commit_time;
                 float ms = (now.tv_sec - start->tv_sec) * 1000 +
                         (now.tv_nsec - start->tv_nsec) / 1000000.0;
-                wlr_log(WLR_DEBUG, "Transaction %p: %zi/%zi ready in %.1fms (%s)",
+                sway_log(SWAY_DEBUG, "Transaction %p: %zi/%zi ready in %.1fms (%s)",
                                 transaction,
                                 transaction->num_configures - transaction->num_waiting + 1,
                                 transaction->num_configures, ms,
@@ -481,7 +481,7 @@ static void set_instruction_ready(
 
         // If the transaction has timed out then its num_waiting will be 0 already.
         if (transaction->num_waiting > 0 && --transaction->num_waiting == 0) {
-                wlr_log(WLR_DEBUG, "Transaction %p is ready", transaction);
+                sway_log(SWAY_DEBUG, "Transaction %p is ready", transaction);
                 wl_event_source_timer_update(transaction->timer, 0);
         }