feat: add stroke thickness

src/application/applicationstate.c

@@ -1,4 +1,5 @@
 #include "./applicationstate.h"
+#include "glib.h"
 #include "src/core/primitives.h"
 #include "src/core/raster.h"
 #include "src/ui/vektorcanvas.h"
@@ -16,8 +17,25 @@ static void appstate_set_tool(GtkButton* button, gpointer user_data) {
     data->state->selectedPrimitive = NULL;
 }
 
-static void canvas_onclick(GtkGestureClick* gesture, int n_press, double x, double y, gpointer user_data) {
+static void canvas_onclick(GtkGestureClick *gesture, int n_press, double x,
-    vektor_appstate_canvas_click(user_data, x, y);
+                           double y, gpointer user_data) {
+
+    VektorAppState *state = user_data;
+
+    GtkWidget *widget =
+        gtk_event_controller_get_widget(GTK_EVENT_CONTROLLER(gesture));
+
+    int widget_w = gtk_widget_get_width(widget);
+    int widget_h = gtk_widget_get_height(widget);
+
+    int canvas_w = state->canvas->width;
+    int canvas_h = state->canvas->height;
+
+    double sx = canvas_w / (double)widget_w;
+    double sy = canvas_h / (double)widget_h;
+
+    g_debug("<%f , %f>", x * sx, y * sy);
+    vektor_appstate_canvas_click(state, x * sx, y * sy);
 }
 
 void vektor_appstate_canvas_click(VektorAppState *state, double x, double y) {
@@ -29,13 +47,14 @@ void vektor_appstate_canvas_click(VektorAppState* state, double x, double y) {
         if (state->selectedPrimitive == NULL) {
 
             VektorPolyline *line = vektor_polyline_new();
-            VektorPrimitive linePrimitive = (VektorPrimitive){
+            VektorPrimitive linePrimitive =
-                .kind = VEKTOR_POLYLINE, .polyline = line
+                (VektorPrimitive){.kind = VEKTOR_POLYLINE, .polyline = line};
-            };
+            vektor_primitivebuffer_add_primitive(state->primitiveBuffer,
-            vektor_primitivebuffer_add_primitive(state->primitiveBuffer, linePrimitive);
+                                                 linePrimitive);
 
             state->selectedPrimitive =
-                &(state->primitiveBuffer->primitives[state->primitiveBuffer->count - 1]);
+                &(state->primitiveBuffer
+                      ->primitives[state->primitiveBuffer->count - 1]);
 
         } else if (state->selectedPrimitive->kind != VEKTOR_POLYLINE) {
             // selecting a tool resets the selection, so this condition
@@ -45,7 +64,6 @@ void vektor_appstate_canvas_click(VektorAppState* state, double x, double y) {
             goto begin_click_dispatch; // retry
         }
 
-        
         vektor_polyline_add_point(state->selectedPrimitive->polyline, pos);
     }
 
@@ -68,18 +86,13 @@ void vektor_appstate_new(VektorWidgetState* wstate, VektorAppState* stateOut) {
     vektor_canvas_init(wstate, stateOut->canvas);
 
     // link all the buttons
-    g_signal_connect(
+    g_signal_connect(G_OBJECT(wstate->workspaceButtonLinetool), "clicked",
-        G_OBJECT(wstate->workspaceButtonLinetool), 
+                     G_CALLBACK(appstate_set_tool), data_linetool);
-        "clicked", G_CALLBACK(appstate_set_tool), data_linetool);
 
     // Add click gesture to canvas
     GtkGesture *canvasClickGesture = gtk_gesture_click_new();
-    g_signal_connect(
+    g_signal_connect(G_OBJECT(canvasClickGesture), "pressed",
-        G_OBJECT(canvasClickGesture), 
+                     G_CALLBACK(canvas_onclick), stateOut);
-        "pressed", G_CALLBACK(canvas_onclick), stateOut
+    gtk_widget_add_controller(GTK_WIDGET(wstate->workspaceCanvas),
-    );
+                              GTK_EVENT_CONTROLLER(canvasClickGesture));
-    gtk_widget_add_controller(
-        GTK_WIDGET(wstate->workspaceCanvas), 
-        GTK_EVENT_CONTROLLER(canvasClickGesture)
-    );
 }

src/application/applicationstate.h

@@ -1,14 +1,12 @@
 #ifndef VKTR_APPSTATE_H
 #define VKTR_APPSTATE_H
 
-#include "../ui/uicontroller.h"
 #include "../core/primitives.h"
-#include "src/core/raster.h"
+#include "../ui/uicontroller.h"
 #include "../ui/vektorcanvas.h"
+#include "src/core/raster.h"
 
-typedef enum VektorAppTool {
+typedef enum VektorAppTool { VektorLineTool } VektorAppTool;
-    VektorLineTool
-} VektorAppTool;
 
 typedef struct VektorAppState {
     VektorAppTool selectedTool;

src/core/primitives.c

@@ -50,8 +50,8 @@ void vektor_primitivebuffer_add_primitive(VektorPrimitiveBuffer *buffer,
                                           VektorPrimitive prim) {
     if (buffer->count >= buffer->capacity) {
         buffer->capacity = buffer->capacity ? buffer->capacity * 2 : 4;
-    buffer->primitives =
+        buffer->primitives = realloc(
-        realloc(buffer->primitives, sizeof(VektorPrimitive) * buffer->capacity);
+            buffer->primitives, sizeof(VektorPrimitive) * buffer->capacity);
     }
     buffer->primitives[buffer->count++] = prim;
 }

src/core/raster.c

@@ -17,8 +17,8 @@ void vektor_line_flatten(EdgeBuffer *buffer, VektorLine line) {
 
 void vektor_polyline_flatten(EdgeBuffer *buffer, VektorPolyline *line) {
     for (size_t i = 0; i + 1 < line->count; i++) {
-    vektor_edgebuffer_add_edge(buffer,
+        vektor_edgebuffer_add_edge(
-                               (Edge){line->points[i], line->points[i + 1], 0});
+            buffer, (Edge){line->points[i], line->points[i + 1], 0});
     }
 }
 
@@ -54,8 +54,18 @@ inline void vektor_framebuffer_putpixel(VektorFramebuffer *fb, int x, int y,
     fb->pixels[i + 3] = color.a;
 }
 
-void vektor_framebuffer_drawline(VektorFramebuffer *fb, V2 a, V2 b,
+void draw_filled_circle(VektorFramebuffer *fb, int cx, int cy, int r,
                         VektorColor color) {
+    for (int y = -r; y <= r; y++) {
+        int dx = (int)sqrt(r * r - y * y);
+        for (int x = -dx; x <= dx; x++) {
+            vektor_framebuffer_putpixel(fb, cx + x, cy + y, color);
+        }
+    }
+}
+
+void vektor_framebuffer_drawline(VektorFramebuffer *fb, V2 a, V2 b,
+                                 VektorColor color, double thickness) {
     int x0 = (int)a.x;
     int y0 = (int)a.y;
     int x1 = (int)b.x;
@@ -68,7 +78,7 @@ void vektor_framebuffer_drawline(VektorFramebuffer *fb, V2 a, V2 b,
     int err = dx + dy;
 
     for (;;) {
-    vektor_framebuffer_putpixel(fb, x0, y0, color);
+        draw_filled_circle(fb, x0, y0, thickness / 2, color);
         if (x0 == x1 && y0 == y1)
             break;
 
@@ -84,7 +94,8 @@ void vektor_framebuffer_drawline(VektorFramebuffer *fb, V2 a, V2 b,
     }
 }
 
-void vektor_framebuffer_rasterize(VektorFramebuffer *fb, VektorPrimitiveBuffer *prims) {
+void vektor_framebuffer_rasterize(VektorFramebuffer *fb,
+                                  VektorPrimitiveBuffer *prims) {
     EdgeBuffer edges = {0};
     for (size_t i = 0; i < prims->count; i++) {
         VektorPrimitive *p = &prims->primitives[i];
@@ -110,6 +121,6 @@ void vektor_framebuffer_rasterize(VektorFramebuffer *fb, VektorPrimitiveBuffer *
 
     for (size_t i = 0; i < edges.count; i++) {
         vektor_framebuffer_drawline(fb, edges.edges[i].p1, edges.edges[i].p2,
-                                vektor_color_solid(255, 0, 255));
+                                    vektor_color_solid(255, 0, 255), 4);
     }
 }

src/core/raster.h

@@ -38,8 +38,9 @@ void vektor_framebuffer_putpixel(VektorFramebuffer *fb, int x, int y,
                                  VektorColor color);
 
 void vektor_framebuffer_drawline(VektorFramebuffer *fb, V2 a, V2 b,
-                                 VektorColor color);
+                                 VektorColor color, double thickness);
 
-void vektor_framebuffer_rasterize(VektorFramebuffer *fb, VektorPrimitiveBuffer *primitives);
+void vektor_framebuffer_rasterize(VektorFramebuffer *fb,
+                                  VektorPrimitiveBuffer *primitives);
 
 #endif // RASTER_H_

src/main.c

@@ -4,11 +4,11 @@
 #include "stdio.h"
 #include "stdlib.h"
 
+#include "./application/applicationstate.h"
 #include "./core/raster.h"
 #include "./ui/uicontroller.h"
 #include "./ui/vektorcanvas.h"
 #include "./util/color.h"
-#include "./application/applicationstate.h"
 
 static void on_map(GtkWidget *window, gpointer user_data) {
     vektor_uictrl_map((VektorWidgetState *)user_data);
@@ -23,7 +23,6 @@ static void activate(GtkApplication *app, gpointer user_data) {
         (VektorAppState *)malloc(sizeof(VektorAppState));
     vektor_appstate_new(widget_state, app_state);
 
-
     g_signal_connect(widget_state->window, "map", G_CALLBACK(on_map),
                      widget_state);
 

src/ui/uicontroller.c

@@ -16,13 +16,13 @@ void vektor_uictrl_init(GtkApplication *app, VektorWidgetState *stateOut) {
     // Load css
     GtkCssProvider *provider = gtk_css_provider_new();
     gtk_css_provider_load_from_path(provider, "./ui/main.css");
-  gtk_style_context_add_provider_for_display(gdk_display_get_default(), 
+    gtk_style_context_add_provider_for_display(
-    GTK_STYLE_PROVIDER(provider), 
+        gdk_display_get_default(), GTK_STYLE_PROVIDER(provider),
-    GTK_STYLE_PROVIDER_PRIORITY_APPLICATION
+        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-  );
 
     // populate state
-  stateOut->window = GTK_WINDOW(gtk_builder_get_object(builder, "main_window"));
+    stateOut->window =
+        GTK_WINDOW(gtk_builder_get_object(builder, "main_window"));
     stateOut->workspacePaned =
         GTK_PANED(gtk_builder_get_object(builder, "workspace_paned"));
     stateOut->workspaceCanvas =

src/ui/vektorcanvas.c

@@ -22,7 +22,8 @@ void vektor_canvas_init(VektorWidgetState *state, VektorCanvas *canvasOut) {
 
     gtk_picture_set_paintable(canvasOut->canvasWidget,
                               GDK_PAINTABLE(canvasOut->canvasTexture));
-
+    gtk_picture_set_content_fit(GTK_PICTURE(canvasOut->canvasWidget),
+                                GTK_CONTENT_FIT_CONTAIN);
     // g_object_unref(bytes);
 }
 
@@ -33,8 +34,8 @@ void vektor_canvas_update(VektorCanvas *canvas) {
         g_bytes_new(canvas->canvasPixels, VKTR_CANVAS_SIZE);
 
     g_object_unref(canvas->canvasTexture);
-  canvas->canvasTexture =
+    canvas->canvasTexture = gdk_memory_texture_new(
-      gdk_memory_texture_new(canvas->width, canvas->height, GDK_MEMORY_R8G8B8A8,
+        canvas->width, canvas->height, GDK_MEMORY_R8G8B8A8,
         canvas->canvasPixelBytes, canvas->width * 4);
 
     gtk_picture_set_paintable(canvas->canvasWidget,