diff options
| -rw-r--r-- | draw.c | 4 | ||||
| -rw-r--r-- | window.c | 10 |
2 files changed, 6 insertions, 8 deletions
@@ -23,7 +23,9 @@ void draw_init(const char *font, int height, int x_padding, int y_padding) void draw(Window *win) { - double scale = window_get_scale(win); + // FIXME: Does not work for scale != 1 + //double scale = window_get_scale(win); + double scale = 1; int screen_width, screen_height; window_get_screen_size(win, &screen_width, &screen_height); @@ -16,11 +16,8 @@ #include "window.h" #include "log.h" -// TODO: Event logic should be decoupled from Window logic -#include "draw.h" - struct Window { - Connection *con; + Connection *con; xcb_drawable_t window; cairo_surface_t *surface; cairo_t *cr; @@ -121,8 +118,8 @@ static void wm_setup(Window *win) Window *window_create(Connection *con) { Window *win = g_malloc0(sizeof(Window)); - g_assert_nonnull(win); - win->con = con; + g_assert_nonnull(win); + win->con = con; const uint32_t value_mask = XCB_CW_BACK_PIXMAP | XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL | XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK | XCB_CW_COLORMAP; @@ -287,7 +284,6 @@ static void window_paint_corners(Window *win) cairo_set_source_rgba(cr, 0, 0, 0, 0); cairo_paint(cr); - // TODO: Decouple somewhat drawing and X11 cairo_set_source_rgba(cr, 1, 1, 1, 1); cairo_arc(cr, radius, radius, radius, 90.0 * degree, 270 * degree); cairo_arc(cr, win->width - radius, radius, radius, 270 * degree, 450 * degree); |