From 6709f59710031ce07b6ddaa3e3ef516ad9b8b1cb Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Sun, 20 Sep 2020 21:52:49 -0400
Subject: [PATCH] Updated all 3rd party objects that are affected by this patch
---
externals/footils/knob/knob.c | 2 +-
externals/ggee/gui/w_envgen.h | 2 +-
externals/iem/iemgui/src/cube_sphere.c | 2 +-
externals/iem/iemgui/src/iem_event.c | 2 +-
externals/iem/iemgui/src/numberbox_matrix.c | 2 +-
externals/iem/iemgui/src/room_sim_2d.c | 2 +-
externals/iem/iemgui/src/room_sim_3d.c | 2 +-
externals/miXed/cyclone/hammer/comment.c | 2 +-
externals/moonlib/mknob.c | 6 +++---
externals/pidip/modules/pdp_colorgrid.c | 2 +-
externals/tof/src/w_breakpoints.h | 4 ++--
externals/unauthorized/audience~.c | 2 +-
externals/unauthorized/cooled~.c | 2 +-
externals/unauthorized/grid.c | 2 +-
externals/unauthorized/playlist.c | 2 +-
externals/unauthorized/scratcher~.c | 2 +-
externals/unauthorized/scrolllist.c | 2 +-
externals/unauthorized/sonogram~.c | 2 +-
18 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/externals/footils/knob/knob.c b/externals/footils/knob/knob.c
index bdb953e03..78b8ce140 100644
--- a/externals/footils/knob/knob.c
+++ b/externals/footils/knob/knob.c
@@ -528,7 +528,7 @@ static void knob_click(t_knob *x, t_floatarg xpos, t_floatarg ypos,
(*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
knob_bang(x);
glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, (t_glistmotionfn)knob_motion,
- 0, xpos, ypos);
+ 0, 0, xpos, ypos);
}
static int knob_newclick(t_gobj *z, struct _glist *glist,
diff --git a/externals/ggee/gui/w_envgen.h b/externals/ggee/gui/w_envgen.h
index b457ed96c..76cd4aa1f 100644
--- a/externals/ggee/gui/w_envgen.h
+++ b/externals/ggee/gui/w_envgen.h
@@ -541,7 +541,7 @@ static int envgen_newclick(t_envgen *x, struct _glist *glist,
envgen_next_doodle(x, glist, xpos, ypos);
glist_grab(x->w.glist, &x->x_obj.te_g, (t_glistmotionfn) envgen_motion,
- (t_glistkeyfn) envgen_key, xpos, ypos);
+ (t_glistkeyfn) envgen_key, 0, xpos, ypos);
x->resizing = 0;
if (x->resizeable && (xpos > wxpos + x->w.width) &&
diff --git a/externals/iem/iemgui/src/cube_sphere.c b/externals/iem/iemgui/src/cube_sphere.c
index c1292ef5c..dea32cbcd 100644
--- a/externals/iem/iemgui/src/cube_sphere.c
+++ b/externals/iem/iemgui/src/cube_sphere.c
@@ -366,7 +366,7 @@ static void cube_sphere_click(t_cube_sphere *x, t_floatarg xpos, t_floatarg ypos
x->x_sel_index = sel;
x->x_pos_x = x->x_pix_src_x[sel];
x->x_pos_y = x->x_pix_src_y[sel];
- glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, (t_glistmotionfn)cube_sphere_motion, 0, xpos, ypos);
+ glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, (t_glistmotionfn)cube_sphere_motion, 0, 0, xpos, ypos);
}
}
}
diff --git a/externals/iem/iemgui/src/iem_event.c b/externals/iem/iemgui/src/iem_event.c
index e8353775c..d0a829690 100644
--- a/externals/iem/iemgui/src/iem_event.c
+++ b/externals/iem/iemgui/src/iem_event.c
@@ -232,7 +232,7 @@ static int iem_event_click(t_gobj *z, struct _glist *glist, int xpix, int ypix,
if(doit)
{
glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g,
- (t_glistmotionfn)iem_event_motion, iem_event_key, (t_float)xpix, (t_float)ypix);
+ (t_glistmotionfn)iem_event_motion, iem_event_key, 0, (t_float)xpix, (t_float)ypix);
outlet_anything(x->x_gui.x_obj.ob_outlet, x->x_dragg_x_y, 2, x->x_at_out);
if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing)
diff --git a/externals/iem/iemgui/src/numberbox_matrix.c b/externals/iem/iemgui/src/numberbox_matrix.c
index c71f2f5a2..f6e41b9a4 100644
--- a/externals/iem/iemgui/src/numberbox_matrix.c
+++ b/externals/iem/iemgui/src/numberbox_matrix.c
@@ -716,7 +716,7 @@ static void numberbox_matrix_click(t_numberbox_matrix *x, t_floatarg xpos, t_flo
t_floatarg shift, t_floatarg ctrl, t_floatarg alt)
{
glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g,
- (t_glistmotionfn)numberbox_matrix_motion, numberbox_matrix_key, xpos, ypos);
+ (t_glistmotionfn)numberbox_matrix_motion, numberbox_matrix_key, 0, xpos, ypos);
}
static int numberbox_matrix_newclick(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit)
diff --git a/externals/iem/iemgui/src/room_sim_2d.c b/externals/iem/iemgui/src/room_sim_2d.c
index 7f57c6929..4dc9535b3 100644
--- a/externals/iem/iemgui/src/room_sim_2d.c
+++ b/externals/iem/iemgui/src/room_sim_2d.c
@@ -440,7 +440,7 @@ static void room_sim_2d_click(t_room_sim_2d *x, t_floatarg xpos, t_floatarg ypos
x->x_pos_x = x->x_pix_src_x[sel];
x->x_pos_y = x->x_pix_src_y[sel];
glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g,
- (t_glistmotionfn)room_sim_2d_motion, 0, xpos, ypos);
+ (t_glistmotionfn)room_sim_2d_motion, 0, 0, xpos, ypos);
}
}
diff --git a/externals/iem/iemgui/src/room_sim_3d.c b/externals/iem/iemgui/src/room_sim_3d.c
index 7b8456837..11d9dad53 100644
--- a/externals/iem/iemgui/src/room_sim_3d.c
+++ b/externals/iem/iemgui/src/room_sim_3d.c
@@ -532,7 +532,7 @@ static void room_sim_3d_click(t_room_sim_3d *x, t_floatarg xpos, t_floatarg ypos
x->x_pos_x = x->x_pix_src_x[sel];
x->x_pos_y = x->x_pix_src_y[sel];
x->x_pos_z = x->x_pix_src_z[sel];
- glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, (t_glistmotionfn)room_sim_3d_motion, 0, xpos, ypos);
+ glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, (t_glistmotionfn)room_sim_3d_motion, 0, 0, xpos, ypos);
}
}
diff --git a/externals/miXed/cyclone/hammer/comment.c b/externals/miXed/cyclone/hammer/comment.c
index 003f25416..25a71b7f4 100644
--- a/externals/miXed/cyclone/hammer/comment.c
+++ b/externals/miXed/cyclone/hammer/comment.c
@@ -195,7 +195,7 @@ static void comment_dograb(t_comment *x)
Here we use it just to prevent backspace from erasing entire text.
This has to be done also when we are already active, because
after being clicked at we have lost our previous grab. */
- glist_grab(x->x_glist, (t_gobj *)x, 0, comment_grabbedkey, 0, 0);
+ glist_grab(x->x_glist, (t_gobj *)x, 0, comment_grabbedkey, 0, 0, 0);
}
static void comment__bboxhook(t_comment *x, t_symbol *bindsym,
diff --git a/externals/moonlib/mknob.c b/externals/moonlib/mknob.c
index f12edcf07..d8430ffd9 100644
--- a/externals/moonlib/mknob.c
+++ b/externals/moonlib/mknob.c
@@ -450,13 +450,13 @@ static void mknob_click(t_mknob *x, t_floatarg xpos, t_floatarg ypos,
if (x->x_gui.x_h<0)
glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g,
- (t_glistmotionfn)mknob_motion_fullcircular, 0, xpos, ypos);
+ (t_glistmotionfn)mknob_motion_fullcircular, 0, 0, xpos, ypos);
else if (x->x_gui.x_h==0)
glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g,
- (t_glistmotionfn)mknob_motion_circular, 0, xpos, ypos);
+ (t_glistmotionfn)mknob_motion_circular, 0, 0, xpos, ypos);
else
glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g,
- (t_glistmotionfn)mknob_motion, 0, xpos, ypos);
+ (t_glistmotionfn)mknob_motion, 0, 0, xpos, ypos);
}
static int mknob_newclick(t_gobj *z, struct _glist *glist,
diff --git a/externals/pidip/modules/pdp_colorgrid.c b/externals/pidip/modules/pdp_colorgrid.c
index b60be7238..c47b16fb4 100755
--- a/externals/pidip/modules/pdp_colorgrid.c
+++ b/externals/pidip/modules/pdp_colorgrid.c
@@ -1481,7 +1481,7 @@ static int pdp_colorgrid_click(t_gobj *z, struct _glist *glist,
pdp_colorgrid_output_current(x);
pdp_colorgrid_draw_update(x, glist);
glist_grab(glist, &x->x_obj.te_g, (t_glistmotionfn)pdp_colorgrid_motion,
- 0, xpix, ypix);
+ 0, 0, xpix, ypix);
}
return (1);
}
diff --git a/externals/tof/src/w_breakpoints.h b/externals/tof/src/w_breakpoints.h
index b747672bc..24defdb2b 100644
--- a/externals/tof/src/w_breakpoints.h
+++ b/externals/tof/src/w_breakpoints.h
@@ -518,7 +518,7 @@ static int breakpoints_newclick(t_breakpoints *x, struct _glist *glist,
breakpoints_next_doodle(x,glist,xpos,ypos);
glist_grab(x->w.glist, &x->x_obj.te_g, (t_glistmotionfn) breakpoints_motion,
- (t_glistkeyfn) breakpoints_key, xpos, ypos);
+ (t_glistkeyfn) breakpoints_key, 0, xpos, ypos);
x->w.shift = shift;
breakpoints_followpointer(x,glist);
@@ -544,7 +544,7 @@ static int breakpoints_newclick(t_breakpoints *x, struct _glist *glist,
breakpoints_next_doodle(x,glist,xpos,ypos);
glist_grab(x->w.glist, &x->x_obj.te_g, (t_glistmotionfn) breakpoints_motion,
- (t_glistkeyfn) breakpoints_key, xpos, ypos);
+ (t_glistkeyfn) breakpoints_key, 0, xpos, ypos);
x->resizing = 0;
if (x->resizeable && (xpos > wxpos + x->w.width) &&
diff --git a/externals/unauthorized/audience~.c b/externals/unauthorized/audience~.c
index 237a70d69..870817245 100644
--- a/externals/unauthorized/audience~.c
+++ b/externals/unauthorized/audience~.c
@@ -670,7 +670,7 @@ static int audience_click(t_gobj *z, struct _glist *glist,
}
audience_draw_update(x, glist);
glist_grab(glist, &x->x_obj.te_g, (t_glistmotionfn)audience_motion,
- 0, xpix, ypix);
+ 0, 0, xpix, ypix);
}
return (1);
}
diff --git a/externals/unauthorized/cooled~.c b/externals/unauthorized/cooled~.c
index 11354eb53..b234b7c17 100644
--- a/externals/unauthorized/cooled~.c
+++ b/externals/unauthorized/cooled~.c
@@ -880,7 +880,7 @@ static int cooled_click(t_gobj *z, struct _glist *glist,
x->x_alted = alt;
// activate motion callback
glist_grab( glist, &x->x_obj.te_g, (t_glistmotionfn)cooled_motion,
- 0, xpix, ypix );
+ 0, 0, xpix, ypix );
// draw insertion line
if ( glist_isvisible( x->x_glist ) )
diff --git a/externals/unauthorized/grid.c b/externals/unauthorized/grid.c
index ad67e504c..9a423dbe0 100644
--- a/externals/unauthorized/grid.c
+++ b/externals/unauthorized/grid.c
@@ -510,7 +510,7 @@ static int grid_click(t_gobj *z, struct _glist *glist,
grid_output_current(x);
grid_draw_update(x, glist);
glist_grab(glist, &x->x_obj.te_g, (t_glistmotionfn)grid_motion,
- 0, xpix, ypix);
+ 0, 0, xpix, ypix);
}
return (1);
}
diff --git a/externals/unauthorized/playlist.c b/externals/unauthorized/playlist.c
index f663152b0..d9e869e7f 100644
--- a/externals/unauthorized/playlist.c
+++ b/externals/unauthorized/playlist.c
@@ -640,7 +640,7 @@ static int playlist_click(t_gobj *z, struct _glist *glist,
}
x->x_glist = glist;
glist_grab( glist, &x->x_obj.te_g, (t_glistmotionfn)playlist_motion,
- NULL, xpix, ypix );
+ NULL, NULL, xpix, ypix );
}
return (1);
}
diff --git a/externals/unauthorized/scratcher~.c b/externals/unauthorized/scratcher~.c
index e4c5c168d..14b5088fb 100644
--- a/externals/unauthorized/scratcher~.c
+++ b/externals/unauthorized/scratcher~.c
@@ -417,7 +417,7 @@ static int scratcher_click(t_gobj *z, struct _glist *glist,
{
// activate motion callback
glist_grab( glist, &x->x_obj.te_g, (t_glistmotionfn)scratcher_motion,
- 0, xpix, ypix );
+ 0, 0, xpix, ypix );
x->x_readspeed=0.;
x->x_motioned = 1;
if ( x->x_showspeed )
diff --git a/externals/unauthorized/scrolllist.c b/externals/unauthorized/scrolllist.c
index cb4f0a068..5a85c2fbd 100644
--- a/externals/unauthorized/scrolllist.c
+++ b/externals/unauthorized/scrolllist.c
@@ -426,7 +426,7 @@ static int scrolllist_click(t_gobj *z, struct _glist *glist,
}
x->x_glist = glist;
glist_grab( glist, &x->x_obj.te_g, (t_glistmotionfn)scrolllist_motion,
- NULL, xpix, ypix );
+ NULL, NULL, xpix, ypix );
}
return (1);
}
diff --git a/externals/unauthorized/sonogram~.c b/externals/unauthorized/sonogram~.c
index 9d3b1aeff..30efb5c2a 100644
--- a/externals/unauthorized/sonogram~.c
+++ b/externals/unauthorized/sonogram~.c
@@ -1116,7 +1116,7 @@ static int sonogram_click(t_gobj *z, struct _glist *glist,
x->x_alted = alt;
// activate motion callback
glist_grab( glist, &x->x_obj.te_g, (t_glistmotionfn)sonogram_motion,
- 0, xpix, ypix );
+ 0, 0, xpix, ypix );
if ( shift && alt && (x->x_xstartcapture != x->x_xendcapture ) )
{
--
GitLab