Various refactor

1 files changed, 10 insertions, 14 deletions

diff --git a/src/window.c b/src/window.c
index e45eb27..0dba42f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -40,7 +40,7 @@ static void wm_set_size(window_t *window)
     xcb_icccm_size_hints_set_position(&hints, false, window->x, window->y);
 
     xcb_icccm_set_wm_size_hints(window->display->connection, window->window, XCB_ATOM_WM_NORMAL_HINTS, &hints);
-    log_debug("Xcb icccm size hints updated");
+    log_trace("Xcb icccm size hints updated");
 }
 
 static void wm_set_struts(window_t *window)
@@ -70,7 +70,7 @@ static void wm_set_struts(window_t *window)
                         12,
                         values);
 
-    log_debug("Xcb EWMH struts updated");
+    log_trace("Xcb EWMH struts updated");
 }
 
 static void wm_setup(window_t *window)
@@ -90,7 +90,7 @@ static void wm_setup(window_t *window)
 
     assert(xcb_ewmh_init_atoms_replies(&window->display->ewmh, ewmh_cookie, &error));
     assert(error == NULL);
-    log_debug("Xcb EWMH connected");
+    log_debug("Connected EWMH");
 
     xcb_ewmh_set_wm_window_type(&window->display->ewmh, window->window, 1, &window->display->ewmh._NET_WM_WINDOW_TYPE_DOCK);
     xcb_ewmh_set_wm_desktop(&window->display->ewmh, window->window, 0xFFFFFFFF);
@@ -149,11 +149,11 @@ void window_init(window_t *window, display_t *display)
                           window->cw_mask,
                           &window->cw_params);
 
-    log_value_debug("Xcb window created",
+    log_value_debug("Created window",
                     "u:id", window->window);
 
     wm_setup(window);
-    log_debug("Updated window WM options");
+    log_trace("Updated window WM options");
 
     xcb_map_window(display->connection, window->window);
     xcb_flush(display->connection);
@@ -172,12 +172,6 @@ void window_init(window_t *window, display_t *display)
     log_trace("Cairo context created");
 }
 
-//double window_get_scale(window_t *window)
-//{
-//    const int n = 4;
-//    return MAX(1, floor((window->display->screen_dpi / 96.0) * n) * (1.0 / n));
-//}
-
 void window_move(window_t *window, int x, int y)
 {
     if (window->x == x && window->y == y)
@@ -208,7 +202,7 @@ static void window_reshape(window_t *window)
 
     xcb_pixmap_t bitmap = xcb_generate_id(window->display->connection);
     xcb_create_pixmap(window->display->connection, depth, bitmap, window->window, window->width, window->height);
-    log_debug("Xcb pixmap created [id=%u]", bitmap);
+    log_trace("Xcb pixmap created");
 
     cairo_surface_t *surface = cairo_xcb_surface_create_for_bitmap(window->display->connection,
                                                                    window->display->screen,
@@ -232,7 +226,7 @@ static void window_reshape(window_t *window)
     cairo_arc(cr, window->width - radius, radius, radius, 270 * degree, 450 * degree);
     cairo_fill(cr);
 
-    log_trace("Xcb shape painted");
+    log_trace("Painted window shape");
 
     cairo_show_page(cr);
     cairo_destroy(cr);
@@ -241,7 +235,7 @@ static void window_reshape(window_t *window)
 
     xcb_shape_mask(window->display->connection, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_BOUNDING, window->window, 0, 0, bitmap);
     xcb_shape_select_input(window->display->connection, window->window, XCB_SHAPE_NOTIFY);
-    log_debug("Xcb shape mask updated");
+    log_debug("Updated window shape mask");
 
     xcb_free_pixmap(window->display->connection, bitmap);
 }
@@ -275,6 +269,7 @@ void window_present(window_t *window, cairo_surface_t *surface, int width, int h
 {
     cairo_xcb_surface_set_size(window->surface, width, height);
     xcb_clear_area(window->display->connection, false, window->window, 0, 0, 0, 0);
+    log_trace("Cleared window area");
 
     cairo_save(window->cr);
     cairo_set_source_surface(window->cr, surface, 0, 0);
@@ -284,6 +279,7 @@ void window_present(window_t *window, cairo_surface_t *surface, int width, int h
 
     cairo_surface_flush(window->surface);
     cairo_restore(window->cr);
+    log_trace("Flushed window surface");
 
     xcb_circulate_window(window->display->connection, XCB_CIRCULATE_RAISE_LOWEST, window->window);
     xcb_flush(window->display->connection);