ortho and smooth rebased on current master

bk138 · Mar 15, 2024 · 4d58439 · 4d58439
1 parent 7d171ac
commit 4d58439
Show file tree

Hide file tree

Showing 9 changed files with 1,020 additions and 52 deletions.
diff --git a/src/callbacks.c b/src/callbacks.c
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "drawing.h"
 #include "build-config.h"
-
+#include "smooth.h"
 
 gboolean on_expose (GtkWidget *widget,
 		    cairo_t* cr,
@@ -281,7 +281,7 @@ gboolean on_buttonpress (GtkWidget *win,
   GromitPaintType type = devdata->cur_context->type;
 
   // store original state to have dynamic update of line and rect
-  if (type == GROMIT_LINE || type == GROMIT_RECT)
+  if (type == GROMIT_LINE || type == GROMIT_RECT || type == GROMIT_SMOOTH)
     {
       copy_surface(data->aux_backbuffer, data->backbuffer);
     }
@@ -398,6 +398,7 @@ gboolean on_motion (GtkWidget *win,
           }
           if (type == GROMIT_LINE)
             {
+              GromitArrowType atype = devdata->cur_context->arrow_type;
 	      draw_line (data, ev->device, devdata->lastx, devdata->lasty, ev->x, ev->y);
               if (devdata->cur_context->arrowsize > 0)
                 {
@@ -460,6 +461,34 @@ gboolean on_buttonrelease (GtkWidget *win,
 
   GromitPaintType type = devdata->cur_context->type;
 
+  if (type == GROMIT_SMOOTH)
+    {
+      if (0) {
+          // smooth pen
+          douglas_peucker(devdata->coordlist, 10);  // was 15
+          add_points(devdata->coordlist, 200);
+          devdata->coordlist = catmull_rom(devdata->coordlist, 5);
+      } else {
+          // smart rect pen
+          douglas_peucker(devdata->coordlist, 15);  // was 15
+          orthogonalize(devdata->coordlist, 20, 40);
+          round_corners(devdata->coordlist, 20, 6);
+      }
+
+      copy_surface(data->backbuffer, data->aux_backbuffer);
+      GdkRectangle rect = {0, 0, data->width, data->height};
+      gdk_window_invalidate_rect(gtk_widget_get_window(data->win), &rect, 0);
+
+      GList *ptr = devdata->coordlist;
+      while (ptr->next)
+        {
+          GromitStrokeCoordinate *c1 = ptr->data;
+          GromitStrokeCoordinate *c2 = ptr->next->data;
+          ptr = ptr->next;
+          draw_line (data, ev->device, c1->x, c1->y, c2->x, c2->y);
+        }
+    }
+
   if (devdata->cur_context->arrowsize != 0)
     {
       GromitArrowType atype = devdata->cur_context->arrow_type;

diff --git a/src/config.c b/src/config.c
@@ -171,6 +171,7 @@ gboolean parse_config (GromitData *data)
   g_scanner_scope_add_symbol (scanner, 0, "PEN",    (gpointer) GROMIT_PEN);
   g_scanner_scope_add_symbol (scanner, 0, "LINE",   (gpointer) GROMIT_LINE);
   g_scanner_scope_add_symbol (scanner, 0, "RECT",   (gpointer) GROMIT_RECT);
+  g_scanner_scope_add_symbol (scanner, 0, "SMOOTH", (gpointer) GROMIT_SMOOTH);
   g_scanner_scope_add_symbol (scanner, 0, "ERASER", (gpointer) GROMIT_ERASER);
   g_scanner_scope_add_symbol (scanner, 0, "RECOLOR",(gpointer) GROMIT_RECOLOR);
   g_scanner_scope_add_symbol (scanner, 0, "HOTKEY",            HOTKEY_SYMBOL_VALUE);
@@ -340,6 +341,7 @@ gboolean parse_config (GromitData *data)
                               goto cleanup;
                             }
                           arrowsize = scanner->value.v_float;
+                          arrowtype = GROMIT_ARROW_END;
                         }
                       else if ((intptr_t) scanner->value.v_symbol == 4)
                         {
@@ -567,7 +569,7 @@ int parse_args (int argc, char **argv, GromitData *data)
                wrong_arg = TRUE;
              }
          }
-      else if (strcmp (arg, "-o") == 0 ||
+       else if (strcmp (arg, "-o") == 0 ||
                 strcmp (arg, "--opacity") == 0)
          {
            if (i+1 < argc && strtod (argv[i+1], NULL) >= 0.0 && strtod (argv[i+1], NULL) <= 1.0)

diff --git a/src/drawing.c b/src/drawing.c
@@ -3,14 +3,6 @@
 #include "drawing.h"
 #include "main.h"
 
-typedef struct
-{
-  gint x;
-  gint y;
-  gint width;
-} GromitStrokeCoordinate;
-
-
 void draw_line (GromitData *data,
 		GdkDevice *dev,
 		gint x1, gint y1,

diff --git a/src/drawing.h b/src/drawing.h
@@ -8,6 +8,14 @@
 
 #include "main.h"
 
+typedef struct
+{
+  gint x;
+  gint y;
+  gint width;
+} GromitStrokeCoordinate;
+
+
 void draw_line (GromitData *data, GdkDevice *dev, gint x1, gint y1, gint x2, gint y2);
 void draw_arrow (GromitData *data, GdkDevice *dev, gint x1, gint y1, gint width, gfloat direction);