From d2f3c14d1f208a11242949e767e4ff1b4d838134 Mon Sep 17 00:00:00 2001
From: Federico Angelilli <code@fedang.net>
Date: Tue, 9 Jul 2024 20:11:00 +0200
Subject: Various refactor

---
 src/display.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/display.c')

diff --git a/src/display.c b/src/display.c
index a34e609..0e2754a 100644
--- a/src/display.c
+++ b/src/display.c
@@ -14,7 +14,7 @@ void display_init(display_t *display)
     display->connection = xcb_connect(NULL, &preferred_screen);
     assert(display->connection != NULL && !xcb_connection_has_error(display->connection));
 
-    log_value_debug("Xcb connection established",
+    log_value_debug("Connected to xcb"
                     "i:preferred_screen", preferred_screen);
 
     xcb_screen_iterator_t iter = xcb_setup_roots_iterator(xcb_get_setup(display->connection));
@@ -35,7 +35,7 @@ void display_init(display_t *display)
                                                                                    &error);
 
     assert(error == NULL);
-    log_value_debug("RandR loaded",
+    log_value_trace("Found RandR extension",
                     "i:major", randr_version->major_version,
                     "i:minor", randr_version->minor_version);
 
@@ -48,7 +48,9 @@ void display_init(display_t *display)
 
     display->screen_size = xcb_randr_get_screen_info_sizes(display->info_reply);
     assert(display->screen_size != NULL);
-    log_debug("Display size [width=%d, height=%d]", display->screen_size->width, display->screen_size->height);
+    log_value_info("Display size",
+                   "i:width", display->screen_size->width,
+                   "i:height", display->screen_size->height);
 
     xcb_randr_select_input(display->connection,
                            display->screen->root,
@@ -56,13 +58,13 @@ void display_init(display_t *display)
                            XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE |
                            XCB_RANDR_NOTIFY_MASK_OUTPUT_PROPERTY);
 
-    log_debug("Searching 32 bit visual");
+    log_trace("Searching 32 bit visual");
     display->visual_type = xcb_aux_find_visual_by_attrs(display->screen, XCB_VISUAL_CLASS_TRUE_COLOR, 32);
     display->screen_depth = 32;
 
     if (display->visual_type == NULL) {
         // NOTE: 24 bit visuals don't have the alpha channel for transparency
-        log_debug("Falling back to 24 bit visual");
+        log_trace("Falling back to 24 bit visual");
         display->visual_type = xcb_aux_find_visual_by_attrs(display->screen, XCB_VISUAL_CLASS_TRUE_COLOR, 24);
         display->screen_depth = 24;
     }
@@ -73,7 +75,7 @@ void display_init(display_t *display)
     assert(xcb_ewmh_init_atoms_replies(&display->ewmh, ewmh_cookie, &error));
 
     assert(error == NULL);
-    log_debug("Xcb EWMH initialized");
+    log_trace("Initialized xcb_ewmh");
 
     display->database = xcb_xrm_database_from_default(display->connection);
     assert(display->database != NULL);
@@ -81,7 +83,7 @@ void display_init(display_t *display)
     display_update_scale(display);
 
     assert(xcb_errors_context_new(display->connection, &display->errors) == 0);
-    log_debug("Xcb errors loaded");
+    log_trace("Initialized xcb_errors");
 
     xcb_flush(display->connection);
 }
@@ -89,7 +91,7 @@ void display_init(display_t *display)
 bool display_query_xrm(display_t *display, const char *resource, char **value)
 {
     bool found = xcb_xrm_resource_get_string(display->database, resource, NULL, value) >= 0;
-    log_value_debug("Xrm query",
+    log_value_trace("Xrm query",
                     "b:found", found,
                     "s:resource", resource,
                     "s:value", *value ? *value : "");
@@ -108,7 +110,7 @@ void display_update_xrm(display_t *display)
 
     xcb_xrm_database_free(display->database);
     display->database = database;
-    log_debug("Xrm database updated");
+    log_trace("Xrm database updated");
 }
 
 void display_update_scale(display_t *display)
-- 
cgit v1.2.3