improve scope~ resize handle and add Pd's colors

porres · porres · commit ffa78c5150fa · 2025-07-06T03:46:44.000-03:00
diff --git a/cyclone_objects/binaries/audio/scope.c b/cyclone_objects/binaries/audio/scope.c
@@ -97,8 +97,9 @@ static void scope_draw_handle(t_scope *x, int state){
     // always destroy (otherwise it may already exist)
     sys_vgui("destroy %s\n", sh->h_pathname);
     if(state){        
-        sys_vgui("canvas %s -width %d -height %d -bg blue -highlightthickness %d -cursor bottom_right_corner\n",
-            sh->h_pathname, HANDLE_SIZE, HANDLE_SIZE, 2*x->x_zoom);
+        sys_vgui("canvas %s -width %d -height %d -bg %s -highlightthickness %d -cursor bottom_right_corner\n",
+            sh->h_pathname, HANDLE_SIZE, HANDLE_SIZE,
+            THISGUI->i_selectcolor->s_name, 2*x->x_zoom);
         int x1, y1, x2, y2;
         scope_getrect((t_gobj *)x, x->x_glist, &x1, &y1, &x2, &y2);
         sys_vgui(".x%lx.c create window %d %d -anchor nw -width %d -height %d -window %s -tags all%lx\n",
@@ -168,34 +169,36 @@ static void scope_drawfg(t_scope *x, t_canvas *cv, int x1, int y1, int x2, int y
         }
         sys_vgui("%d %d \\\n", (int)xx, (int)yy);
     }
-    sys_vgui("-fill #%2.2x%2.2x%2.2x -width %d -tags {fg%lx all%lx}\n",
+    sys_vgui("-fill #%.2x%.2x%.2x -width %d -tags {fg%lx all%lx}\n",
         x->x_fg[0], x->x_fg[1], x->x_fg[2], x->x_zoom, x, x);
 }
 
 static void scope_draw_grid(t_scope *x, t_canvas *cv, int x1, int y1, int x2, int y2){
     float dx = (x2-x1)*0.125, dy = (y2-y1)*0.25, xx, yy;
     int i;
     for(i = 0, xx = x1 + dx; i < 7; i++, xx += dx)
-        sys_vgui(".x%lx.c create line %f %d %f %d -width %d -tags {gr%lx all%lx} -fill #%2.2x%2.2x%2.2x\n",
+        sys_vgui(".x%lx.c create line %f %d %f %d -width %d -tags {gr%lx all%lx} -fill #%.2x%.2x%.2x\n",
             cv, xx, y1, xx, y2, x->x_zoom, x, x, x->x_gg[0], x->x_gg[1], x->x_gg[2]);
     for(i = 0, yy = y1 + dy; i < 3; i++, yy += dy)
-        sys_vgui(".x%lx.c create line %d %f %d %f -width %d -tags {gr%lx all%lx} -fill #%2.2x%2.2x%2.2x\n",
+        sys_vgui(".x%lx.c create line %d %f %d %f -width %d -tags {gr%lx all%lx} -fill #%.2x%.2x%.2x\n",
             cv, x1, yy, x2, yy, x->x_zoom, x, x, x->x_gg[0], x->x_gg[1], x->x_gg[2]);
 }
 
 static void scope_draw_bg(t_scope *x, t_canvas *cv, int x1, int y1, int x2, int y2){
-    sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline #%2.2x%2.2x%2.2x -fill #%2.2x%2.2x%2.2x -width %d -tags {bg%lx all%lx}\n",
+    sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline #%.2x%.2x%.2x -fill #%.2x%.2x%.2x -width %d -tags {bg%lx all%lx}\n",
     cv, x1, y1, x2, y2, x->x_bg[0], x->x_bg[1], x->x_bg[2], x->x_bg[0], x->x_bg[1], x->x_bg[2], x->x_zoom, x, x);
 }
 
 static void scope_draw_inlets(t_scope *x){
     if(x->x_edit && x->x_receive == &s_){
         t_canvas *cv = glist_getcanvas(x->x_glist);
         int xpos = text_xpix(&x->x_obj, x->x_glist), ypos = text_ypix(&x->x_obj, x->x_glist);
-        sys_vgui(".x%lx.c create rectangle %d %d %d %d -fill black -tags {%lx_in1 inlets%lx all%lx}\n",
-            cv, xpos, ypos, xpos+(IOWIDTH*x->x_zoom), ypos+(IHEIGHT*x->x_zoom), x, x, x);
-        sys_vgui(".x%lx.c create rectangle %d %d %d %d -fill black -tags {%lx_in2 inlets%lx all%lx}\n",
-            cv, xpos+x->x_width, ypos, xpos+x->x_width-(IOWIDTH*x->x_zoom), ypos+(IHEIGHT*x->x_zoom), x, x, x);
+        sys_vgui(".x%lx.c create rectangle %d %d %d %d -fill %s -tags {%lx_in1 inlets%lx all%lx}\n",
+            cv, xpos, ypos, xpos+(IOWIDTH*x->x_zoom), ypos+(IHEIGHT*x->x_zoom),
+                 THISGUI->i_foregroundcolor->s_name, x, x, x);
+        sys_vgui(".x%lx.c create rectangle %d %d %d %d -fill %s -tags {%lx_in2 inlets%lx all%lx}\n",
+            cv, xpos+x->x_width, ypos, xpos+x->x_width-(IOWIDTH*x->x_zoom), ypos+(IHEIGHT*x->x_zoom),
+                THISGUI->i_foregroundcolor->s_name, x, x, x);
     }
 }
 
@@ -333,11 +336,12 @@ static void scope_select(t_gobj *z, t_glist *glist, int state){
     t_canvas *cv = glist_getcanvas(glist);
     x->x_select = state;
     if(state)
-        sys_vgui(".x%lx.c itemconfigure bg%lx -outline blue -width %d -fill #%2.2x%2.2x%2.2x\n",
-            cv, x, SCOPE_SELBDWIDTH * x->x_zoom, x->x_bg[0], x->x_bg[1], x->x_bg[2]);
+        sys_vgui(".x%lx.c itemconfigure bg%lx -outline %s -width %d -fill #%.2x%.2x%.2x\n",
+            cv, x, THISGUI->i_selectcolor->s_name, x->x_zoom, x->x_bg[0], x->x_bg[1], x->x_bg[2]);
     else
-        sys_vgui(".x%lx.c itemconfigure bg%lx -outline #%2.2x%2.2x%2.2x -width %d -fill #%2.2x%2.2x%2.2x\n",
-            cv, x, x->x_bg[0], x->x_bg[1], x->x_bg[2], x->x_zoom, x->x_bg[0], x->x_bg[1], x->x_bg[2]);
+        sys_vgui(".x%lx.c itemconfigure bg%lx -outline %s -width %d -fill #%.2x%.2x%.2x\n",
+            cv, x, THISGUI->i_foregroundcolor->s_name,
+            x->x_zoom, x->x_bg[0], x->x_bg[1], x->x_bg[2]);
 }
 
 static void scope_delete(t_gobj *z, t_glist *glist){
@@ -453,7 +457,7 @@ static void scope_fgcolor(t_scope *x, t_floatarg r, t_floatarg g, t_floatarg b){
     if(x->x_fg[0] != red || x->x_fg[1] != green || x->x_fg[2] != blue){
         x->x_fg[0] = red, x->x_fg[1] = green, x->x_fg[2] = blue;
         if(gobj_shouldvis((t_gobj *)x, x->x_glist) && glist_isvisible(x->x_glist))
-            sys_vgui(".x%lx.c itemconfigure fg%lx -fill #%2.2x%2.2x%2.2x\n",
+            sys_vgui(".x%lx.c itemconfigure fg%lx -fill #%.2x%.2x%.2x\n",
                 glist_getcanvas(x->x_glist), x, x->x_fg[0], x->x_fg[1], x->x_fg[2]);
     }
 }
@@ -465,7 +469,7 @@ static void scope_frgb(t_scope *x, t_float r, t_float g, t_float b){ // scale is
     if(x->x_fg[0] != red || x->x_fg[1] != green || x->x_fg[2] != blue){
         x->x_fg[0] = red, x->x_fg[1] = green, x->x_fg[2] = blue;
         if(glist_isvisible(x->x_glist) && gobj_shouldvis((t_gobj *)x, x->x_glist))
-            sys_vgui(".x%lx.c itemconfigure fg%lx -fill #%2.2x%2.2x%2.2x\n",
+            sys_vgui(".x%lx.c itemconfigure fg%lx -fill #%.2x%.2x%.2x\n",
                 glist_getcanvas(x->x_glist), x, x->x_fg[0], x->x_fg[1], x->x_fg[2]);
     }
 }
@@ -477,7 +481,7 @@ static void scope_bgcolor(t_scope *x, t_float r, t_float g, t_float b){ // scale
     if(x->x_bg[0] != red || x->x_bg[1] != green || x->x_bg[2] != blue){
         x->x_bg[0] = red, x->x_bg[1] = green, x->x_bg[2] = blue;
         if(glist_isvisible(x->x_glist) && gobj_shouldvis((t_gobj *)x, x->x_glist))
-            sys_vgui(".x%lx.c itemconfigure bg%lx -fill #%2.2x%2.2x%2.2x\n",
+            sys_vgui(".x%lx.c itemconfigure bg%lx -fill #%.2x%.2x%.2x\n",
                 glist_getcanvas(x->x_glist), x, x->x_bg[0], x->x_bg[1], x->x_bg[2]);
     }
 }
@@ -489,7 +493,7 @@ static void scope_brgb(t_scope *x, t_float r, t_float g, t_float b){ // scale: 0
     if(x->x_bg[0] != red || x->x_bg[1] != green || x->x_bg[2] != blue){
         x->x_bg[0] = red, x->x_bg[1] = green, x->x_bg[2] = blue;
         if(glist_isvisible(x->x_glist) && gobj_shouldvis((t_gobj *)x, x->x_glist))
-            sys_vgui(".x%lx.c itemconfigure bg%lx -fill #%2.2x%2.2x%2.2x\n",
+            sys_vgui(".x%lx.c itemconfigure bg%lx -fill #%.2x%.2x%.2x\n",
                 glist_getcanvas(x->x_glist), x, x->x_bg[0], x->x_bg[1], x->x_bg[2]);
     }
 }
@@ -501,7 +505,7 @@ static void scope_gridcolor(t_scope *x, t_float r, t_float g, t_float b){ // sca
     if(x->x_gg[0] != red || x->x_gg[1] != green || x->x_gg[2] != blue){
         x->x_gg[0] = red, x->x_gg[1] = green, x->x_gg[2] = blue;
         if(glist_isvisible(x->x_glist) && gobj_shouldvis((t_gobj *)x, x->x_glist))
-            sys_vgui(".x%lx.c itemconfigure gr%lx -fill #%2.2x%2.2x%2.2x\n",
+            sys_vgui(".x%lx.c itemconfigure gr%lx -fill #%.2x%.2x%.2x\n",
                 glist_getcanvas(x->x_glist), x, x->x_gg[0], x->x_gg[1], x->x_gg[2]);
     }
 }
@@ -513,7 +517,7 @@ static void scope_grgb(t_scope *x, t_float r, t_float g, t_float b){ // scale: 0
     if(x->x_gg[0] != red || x->x_gg[1] != green || x->x_gg[2] != blue){
         x->x_gg[0] = red, x->x_gg[1] = green, x->x_gg[2] = blue;
         if(glist_isvisible(x->x_glist) && gobj_shouldvis((t_gobj *)x, x->x_glist))
-            sys_vgui(".x%lx.c itemconfigure gr%lx -fill #%2.2x%2.2x%2.2x\n",
+            sys_vgui(".x%lx.c itemconfigure gr%lx -fill #%.2x%.2x%.2x\n",
                 glist_getcanvas(x->x_glist), x, x->x_gg[0], x->x_gg[1], x->x_gg[2]);
     }
 }
@@ -614,8 +618,9 @@ static void handle__click_callback(t_handle *sh, t_floatarg f){
     else if(!sh->h_dragon && click){
         int x1, y1, x2, y2;
         scope_getrect((t_gobj *)x, x->x_glist, &x1, &y1, &x2, &y2);
-        sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline blue -width %d -tags %s\n",
-            x->x_cv, x1, y1, x2, y2, SCOPE_SELBDWIDTH, sh->h_outlinetag);
+        sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline %s -width %d -tags %s\n",
+            x->x_cv, x1, y1, x2, y2, THISGUI->i_selectcolor->s_name,
+            SCOPE_SELBDWIDTH*x->x_zoom, sh->h_outlinetag);
         sh->h_dragx = sh->h_dragy = 0;
     }
     sh->h_dragon = click;
@@ -624,9 +629,10 @@ static void handle__click_callback(t_handle *sh, t_floatarg f){
 static void handle__motion_callback(t_handle *sh, t_floatarg f1, t_floatarg f2){
     if(sh->h_dragon){
         t_scope *x = sh->h_master;
-        int dx = (int)f1, dy = (int)f2, x1, y1, x2, y2, newx, newy;
+        int dx = (int)f1 - HANDLE_SIZE, dy = (int)f2 - HANDLE_SIZE;
+        int x1, y1, x2, y2;
         scope_getrect((t_gobj *)x, x->x_glist, &x1, &y1, &x2, &y2);
-        newx = x2 + dx, newy = y2 + dy;
+        int newx = x2 + dx, newy = y2 + dy;
         if(newx < x1 + SCOPE_MINSIZE*x->x_zoom)
             newx = x1 + SCOPE_MINSIZE*x->x_zoom;
         if(newy < y1 + SCOPE_MINSIZE*x->x_zoom)
