diff options
author | Miller Puckette <millerpuckette@users.sourceforge.net> | 2005-08-16 04:06:28 +0000 |
---|---|---|
committer | Miller Puckette <millerpuckette@users.sourceforge.net> | 2005-08-16 04:06:28 +0000 |
commit | 8892fb6aabcbfd2c4695c154c22751b5fe5c9004 (patch) | |
tree | bd44e093cbc928e32560f70d4ca64fd593d5dc3c /pd | |
parent | ccd93386bb8edff9991df8d8cabf71b73039c5e3 (diff) |
Configure.in was broken. Also, better GUI update queueing for
IEM guis and for 'data' (which should affect arrays.)
svn path=/trunk/; revision=3430
Diffstat (limited to 'pd')
-rw-r--r-- | pd/doc/5.reference/rzero~-help.pd | 62 | ||||
-rw-r--r-- | pd/doc/7.stuff/tools/testtone.pd | 16 | ||||
-rw-r--r-- | pd/src/configure.in | 2 | ||||
-rw-r--r-- | pd/src/g_all_guis.c | 3 | ||||
-rw-r--r-- | pd/src/g_all_guis.h | 6 | ||||
-rw-r--r-- | pd/src/g_array.c | 29 | ||||
-rw-r--r-- | pd/src/g_canvas.c | 23 | ||||
-rw-r--r-- | pd/src/g_canvas.h | 11 | ||||
-rw-r--r-- | pd/src/g_editor.c | 18 | ||||
-rw-r--r-- | pd/src/g_hdial.c | 9 | ||||
-rw-r--r-- | pd/src/g_hslider.c | 5 | ||||
-rw-r--r-- | pd/src/g_numbox.c | 36 | ||||
-rw-r--r-- | pd/src/g_scalar.c | 40 | ||||
-rw-r--r-- | pd/src/g_template.c | 135 | ||||
-rw-r--r-- | pd/src/g_traversal.c | 37 | ||||
-rw-r--r-- | pd/src/g_vdial.c | 9 | ||||
-rw-r--r-- | pd/src/g_vslider.c | 5 | ||||
-rw-r--r-- | pd/src/g_vumeter.c | 31 | ||||
-rw-r--r-- | pd/src/makefile | 2 | ||||
-rw-r--r-- | pd/src/makefile.dependencies | 529 | ||||
-rw-r--r-- | pd/src/notes.txt | 21 | ||||
-rw-r--r-- | pd/src/s_main.c | 2 |
22 files changed, 635 insertions, 396 deletions
diff --git a/pd/doc/5.reference/rzero~-help.pd b/pd/doc/5.reference/rzero~-help.pd index c2200371..ea0f1d0b 100644 --- a/pd/doc/5.reference/rzero~-help.pd +++ b/pd/doc/5.reference/rzero~-help.pd @@ -1,30 +1,29 @@ -#N canvas 56 7 526 510 12; +#N canvas 211 109 664 557 12; #X floatatom 104 172 0 0 0 0 - - -; #X obj 54 85 osc~ 100; #X msg 69 117 clear; -#X obj 77 483 lop~; -#X text 8 483 see also:; -#X text 331 482 updated for Pd version-0.38; -#X obj 84 430 rzero~; -#X obj 35 450 cpole~; -#X obj 35 430 rpole~; -#X obj 133 430 rzero_rev~; -#X obj 84 450 czero~; -#X obj 133 450 czero_rev~; -#X text 211 430 real; -#X text 210 451 complex; -#X text 32 414 1-pole; -#X text 81 414 1-zero; -#X text 131 414 1-zero \, reversed; -#X text 57 399 summary of raw filters:; +#X obj 92 520 lop~; +#X text 9 520 see also:; +#X text 402 521 updated for Pd version-0.38; +#X obj 100 459 rzero~; +#X obj 35 483 cpole~; +#X obj 35 459 rpole~; +#X obj 164 459 rzero_rev~; +#X obj 100 483 czero~; +#X obj 164 483 czero_rev~; +#X text 262 459 real; +#X text 261 484 complex; +#X text 33 438 1-pole; +#X text 98 439 1-zero; +#X text 162 438 1-zero \, reversed; +#X text 57 420 summary of raw filters:; #X msg 71 143 set 1; -#X text 117 143 <-- set internal state; -#X text 118 86 <-- signal to filter; -#X text 128 173 <-- filter coefficient (may be a signal); -#X text 115 198 <-- creation argument initializes filter coefficient +#X text 125 143 <-- set internal state; +#X text 134 86 <-- signal to filter; +#X text 137 172 <-- filter coefficient (may be a signal); +#X text 132 195 <-- creation argument initializes filter coefficient ; -#X text 113 116 <-- clear internal state to zero; -#X text 14 230 The action of rpole~ is:; +#X text 124 116 <-- clear internal state to zero; #N canvas 393 91 326 287 test 0; #X obj 76 78 osc~; #X floatatom 76 55 5 0 0 0 - - -; @@ -58,22 +57,23 @@ #X connect 14 0 2 0; #X connect 14 0 11 0; #X restore 457 416 pd test; -#X text 111 483 etc.: user-friendly filters; +#X text 136 520 etc.: user-friendly filters; #X obj 52 7 rzero~; #X text 114 7 real one-zero (non-recursive) filter \, raw; #X text 8 35 Rzero~ filters an audio signal (left inlet) via a one-zero real filter \, whose coefficient is controlled by a creation argument or by an audio signal (right inlet).; #X obj 53 195 rzero~ 1; -#X text 8 270 where y[n] is the output \, x[n] the input \, and a[n] +#X text 8 271 where y[n] is the output \, x[n] the input \, and a[n] the filter coefficient. The filter is always stable.; -#X text 10 302 The transfer function is H(Z) = 1 - aZ^-1.; -#X text 73 252 y[n] = x[n] - a[n] * x[n-1]; -#X text 8 320 (Pd also provides a suite of user-friendly filters. This +#X text 9 307 The transfer function is H(Z) = 1 - aZ^-1.; +#X text 68 250 y[n] = x[n] - a[n] * x[n-1]; +#X text 7 330 (Pd also provides a suite of user-friendly filters. This and other raw filters are provided for situations which the user-friendly ones can't handle. See Chapter 8 of http://crca.ucsd.edu/~msp/techniques for an introduction to the necessary theory.); -#X connect 0 0 30 1; -#X connect 1 0 30 0; -#X connect 2 0 30 0; -#X connect 18 0 30 0; +#X text 14 230 The action of rzero~ is:; +#X connect 0 0 29 1; +#X connect 1 0 29 0; +#X connect 2 0 29 0; +#X connect 18 0 29 0; diff --git a/pd/doc/7.stuff/tools/testtone.pd b/pd/doc/7.stuff/tools/testtone.pd index c5eae9af..5b4da125 100644 --- a/pd/doc/7.stuff/tools/testtone.pd +++ b/pd/doc/7.stuff/tools/testtone.pd @@ -61,9 +61,9 @@ started" in the Help menu.; but is free for you to use for any reasonable purpose. See the file \, LICENSE.txt in the distribution.; #X obj 135 117 tgl 20 0 tone-ch1 tone-ch1 1 5 -8 0 12 -262144 -1 -1 -0 1; +1 1; #X obj 160 117 tgl 20 0 tone-ch2 tone-ch2 2 5 -8 0 12 -262144 -1 -1 -0 1; +1 1; #X obj 236 282 tgl 20 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1; #X obj 394 110 tgl 20 0 tone-monitor set-tone-monitor monitor 25 10 @@ -93,13 +93,13 @@ but is free for you to use for any reasonable purpose. See the file #X obj 393 148 tgl 20 0 tone-hipass set-tone-hipass input-hipass 25 10 0 12 -262144 -1 -1 0 1; #X obj 185 117 tgl 20 0 tone-ch3 tone-ch3 3 5 -8 0 12 -262144 -1 -1 -0 1; +1 1; #X obj 210 117 tgl 20 0 tone-ch4 tone-ch4 4 5 -8 0 12 -262144 -1 -1 -0 1; +1 1; #X obj 235 117 tgl 20 0 tone-ch5 tone-ch5 5 5 -8 0 12 -262144 -1 -1 -0 1; +1 1; #X obj 260 117 tgl 20 0 tone-ch6 tone-ch6 6 5 -8 0 12 -262144 -1 -1 -0 1; +1 1; #X obj 331 108 bng 15 250 50 0 tone-all empty ALL 20 8 0 12 -262144 -1 -1; #X obj 331 129 bng 15 250 50 0 tone-none empty NONE 20 8 0 12 -262144 @@ -447,9 +447,9 @@ but is free for you to use for any reasonable purpose. See the file #X floatatom 335 186 3 0 0 0 - - -; #X floatatom 368 186 3 0 0 0 - - -; #X obj 283 117 tgl 20 0 tone-ch7 tone-ch7 7 5 -8 0 12 -262144 -1 -1 -0 1; +1 1; #X obj 308 117 tgl 20 0 tone-ch8 tone-ch8 8 5 -8 0 12 -262144 -1 -1 -0 1; +1 1; #X connect 1 0 2 0; #X connect 1 1 2 1; #X connect 2 0 3 0; diff --git a/pd/src/configure.in b/pd/src/configure.in index fc3c56a4..eab771d9 100644 --- a/pd/src/configure.in +++ b/pd/src/configure.in @@ -349,5 +349,5 @@ then MORECFLAGS=$MORECFLAGS" -g3 -D__COMPAQC__ -arch host" fi -AC_OUTPUT(makefile config.h) +AC_OUTPUT(makefile) diff --git a/pd/src/g_all_guis.c b/pd/src/g_all_guis.c index f2df4a4b..4f82bec0 100644 --- a/pd/src/g_all_guis.c +++ b/pd/src/g_all_guis.c @@ -521,7 +521,10 @@ void iemgui_vis(t_gobj *z, t_glist *glist, int vis) if (vis) (*x->x_gui.x_draw)((void *)z, glist, IEM_GUI_DRAW_MODE_NEW); else + { (*x->x_gui.x_draw)((void *)z, glist, IEM_GUI_DRAW_MODE_ERASE); + sys_unqueuegui(z); + } } void iemgui_save(t_iemgui *iemgui, t_symbol **srl, int *bflcol) diff --git a/pd/src/g_all_guis.h b/pd/src/g_all_guis.h index 2bc38f12..2d7d7dd6 100644 --- a/pd/src/g_all_guis.h +++ b/pd/src/g_all_guis.h @@ -198,9 +198,10 @@ typedef struct _hdial { t_iemgui x_gui; int x_on; - int x_on_old; + int x_on_old; /* LATER delete this; it's used for old version */ int x_change; int x_number; + int x_drawn; t_atom x_at[2]; } t_hdial; @@ -242,6 +243,8 @@ typedef struct _vu int x_scale; void *x_out_rms; void *x_out_peak; + unsigned int x_updaterms:1; + unsigned int x_updatepeak:1; } t_vu; typedef struct _my_numbox @@ -266,6 +269,7 @@ typedef struct _vdial int x_on_old; int x_change; int x_number; + int x_drawn; t_atom x_at[2]; } t_vdial; diff --git a/pd/src/g_array.c b/pd/src/g_array.c index 14854f0a..fb11715b 100644 --- a/pd/src/g_array.c +++ b/pd/src/g_array.c @@ -552,7 +552,7 @@ void array_redraw(t_array *a, t_glist *glist) { while (a->a_gp.gp_stub->gs_which == GP_ARRAY) a = a->a_gp.gp_stub->gs_un.gs_array; - gobj_redraw(&a->a_gp.gp_un.gp_scalar->sc_gobj, glist); + scalar_redraw(a->a_gp.gp_un.gp_scalar, glist); } /* routine to get screen coordinates of a point in an array */ @@ -615,7 +615,7 @@ static void array_motion(void *z, t_floatarg dx, t_floatarg dy) array_motion_ycumulative += dy * array_motion_yperpix; if (array_motion_xfield) { - /* it's an x, y plot; can drag many points at once */ + /* it's an x, y plot */ int i; for (i = 0; i < array_motion_npoints; i++) { @@ -653,7 +653,7 @@ static void array_motion(void *z, t_floatarg dx, t_floatarg dy) else if (array_motion_yfield) { /* a y-only plot. */ - int thisx = array_motion_initx + array_motion_xcumulative, x2; + int thisx = array_motion_initx + array_motion_xcumulative + 0.5, x2; int increment, i, nchange; float newy = array_motion_ycumulative, oldy = fielddesc_getcoord(array_motion_yfield, @@ -680,8 +680,7 @@ static void array_motion(void *z, t_floatarg dx, t_floatarg dy) array_motion_lastx = thisx; } if (array_motion_scalar) - sys_queuegui(&array_motion_scalar->sc_gobj, - array_motion_glist, gobj_redraw); + scalar_redraw(array_motion_scalar, array_motion_glist); if (array_motion_array) array_redraw(array_motion_array, array_motion_glist); } @@ -703,6 +702,7 @@ static int array_doclick_element(t_array *array, t_glist *glist, t_canvas *elemtemplatecanvas; t_template *elemtemplate; int elemsize, yonset, wonset, xonset, i, incr, hit; + float xsum; if (elemtemplatesym == &s_float) return (0); @@ -714,12 +714,21 @@ static int array_doclick_element(t_array *array, t_glist *glist, if (array->a_n < 2000) incr = 1; else incr = array->a_n / 300; - for (i = 0; i < array->a_n; i += incr) + for (i = 0, xsum = 0; i < array->a_n; i += incr) { + float usexloc, useyloc; + if (xonset >= 0) + usexloc = xloc + fielddesc_cvttocoord(xfield, + *(float *)(((char *)(array->a_vec) + elemsize * i) + xonset)); + else usexloc = xloc + xsum, xsum += xinc; + useyloc = yloc + (yonset >= 0 ? fielddesc_cvttocoord(yfield, + *(float *)(((char *)(array->a_vec) + elemsize * i) + yonset)) : 0); + if (hit = scalar_doclick( (t_word *)((char *)(array->a_vec) + i * elemsize), elemtemplate, 0, array, - glist, xloc, yloc, xpix, ypix, shift, alt, dbl, doit)) + glist, usexloc, useyloc, + xpix, ypix, shift, alt, dbl, doit)) return (hit); } return (0); @@ -850,8 +859,10 @@ int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, array_motion_xcumulative = fielddesc_getcoord(xfield, array_motion_template, (t_word *)(elem + i * elemsize), 1); - array_motion_wp = (t_word *)(elem + i * elemsize); - array_motion_npoints = array->a_n - i; + array_motion_wp = (t_word *)(elem + i * elemsize); + if (shift) + array_motion_npoints = array->a_n - i; + else array_motion_npoints = 1; } else { diff --git a/pd/src/g_canvas.c b/pd/src/g_canvas.c index ba72f8bc..adccb788 100644 --- a/pd/src/g_canvas.c +++ b/pd/src/g_canvas.c @@ -403,6 +403,18 @@ t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv) pd_bind(&x->gl_pd, canvas_makebindsym(x->gl_name)); x->gl_loading = 1; x->gl_goprect = 0; /* no GOP rectangle unless it's turned on later */ + /* cancel "vis" flag if we're a subpatch of an + abstraction inside another patch. A separate mechanism prevents + the toplevel abstraction from showing up. */ + if (vis && gensym("#X")->s_thing && + ((*gensym("#X")->s_thing) == canvas_class)) + { + t_canvas *zzz = (t_canvas *)(gensym("#X")->s_thing); + while (zzz && !zzz->gl_env) + zzz = zzz->gl_owner; + if (zzz && canvas_isabstraction(zzz) && zzz->gl_owner) + vis = 0; + } x->gl_willvis = vis; x->gl_edit = !strncmp(x->gl_name->s_name, "Untitled", 8); x->gl_font = sys_nearestfontsize(font); @@ -1344,15 +1356,6 @@ void glob_dsp(void *dummy, t_symbol *s, int argc, t_atom *argv) else post("dsp state %d", canvas_dspstate); } - /* LATER replace this with a queueing scheme */ -void glist_redrawitem(t_glist *owner, t_gobj *gobj) -{ - if (glist_isvisible(owner)) - { - gobj_vis(gobj, owner, 0); - gobj_vis(gobj, owner, 1); - } -} /* redraw all "scalars" (do this if a drawing command is changed.) LATER we'll use the "template" information to select which ones we @@ -1376,7 +1379,7 @@ static void glist_redrawall(t_glist *gl, int action) if (glist_isvisible(gl)) gobj_vis(g, gl, 0); } - else glist_redrawitem(gl, g); + else scalar_redraw((t_scalar *)g, gl); } else if (g->g_pd == canvas_class) glist_redrawall((t_glist *)g, action); diff --git a/pd/src/g_canvas.h b/pd/src/g_canvas.h index d9cb4275..857df86d 100644 --- a/pd/src/g_canvas.h +++ b/pd/src/g_canvas.h @@ -352,7 +352,6 @@ EXTERN int gobj_click(t_gobj *x, struct _glist *glist, EXTERN void gobj_save(t_gobj *x, t_binbuf *b); EXTERN void gobj_properties(t_gobj *x, struct _glist *glist); EXTERN void gobj_save(t_gobj *x, t_binbuf *b); -EXTERN void gobj_redraw(t_gobj *gobj, t_glist *glist); /* -------------------- functions on glists --------------------- */ EXTERN t_glist *glist_new( void); @@ -387,7 +386,6 @@ EXTERN float glist_ytopixels(t_glist *x, float yval); EXTERN float glist_dpixtodx(t_glist *x, float dxpix); EXTERN float glist_dpixtody(t_glist *x, float dypix); -EXTERN void glist_redrawitem(t_glist *owner, t_gobj *gobj); EXTERN void glist_getnextxy(t_glist *gl, int *xval, int *yval); EXTERN void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv); EXTERN t_glist *glist_addglist(t_glist *g, t_symbol *sym, @@ -522,14 +520,6 @@ EXTERN void linetraverser_start(t_linetraverser *t, t_canvas *x); EXTERN t_outconnect *linetraverser_next(t_linetraverser *t); EXTERN void linetraverser_skipobject(t_linetraverser *t); -/* --------------------- functions on tscalars --------------------- */ - -EXTERN void tscalar_getrect(t_tscalar *x, t_glist *owner, - int *xp1, int *yp1, int *xp2, int *yp2); -EXTERN void tscalar_vis(t_tscalar *x, t_glist *owner, int flag); -EXTERN int tscalar_click(t_tscalar *x, int xpix, int ypix, int shift, - int alt, int dbl, int doit); - /* --------- functions on garrays (graphical arrays) -------------------- */ EXTERN t_template *garray_template(t_garray *x); @@ -554,6 +544,7 @@ EXTERN t_scalar *scalar_new(t_glist *owner, t_symbol *templatesym); EXTERN void word_free(t_word *wp, t_template *tmpl); EXTERN void scalar_getbasexy(t_scalar *x, float *basex, float *basey); +EXTERN void scalar_redraw(t_scalar *x, t_glist *glist); /* ------helper routines for "garrays" and "plots" -------------- */ EXTERN int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c index a4bfa1e6..932a5413 100644 --- a/pd/src/g_editor.c +++ b/pd/src/g_editor.c @@ -94,11 +94,6 @@ int gobj_click(t_gobj *x, struct _glist *glist, else return (0); } -void gobj_redraw(t_gobj *gobj, t_glist *glist) -{ - glist_redrawitem(glist, gobj); -} - /* ------------------------ managing the selection ----------------- */ void glist_selectline(t_glist *x, t_outconnect *oc, int index1, @@ -696,10 +691,11 @@ static void glist_doreload(t_glist *gl, t_symbol *name, t_symbol *dir, { /* we're going to remake the object, so "g" will go stale. Get its index here, and afterward restore g. Also, the - replacement will be at teh end of the list, so we don't + replacement will be at the end of the list, so we don't do g = g->g_next in this case. */ int j = glist_getindex(gl, g); - if (!gl->gl_havewindow) + int hadwindow = gl->gl_havewindow; + if (!hadwindow) canvas_vis(glist_getcanvas(gl), 1); glist_noselect(gl); glist_select(gl, g); @@ -709,6 +705,8 @@ static void glist_doreload(t_glist *gl, t_symbol *name, t_symbol *dir, canvas_undo(gl); glist_noselect(gl); g = glist_nth(gl, j); + if (!hadwindow) + canvas_vis(glist_getcanvas(gl), 0); } else { @@ -955,7 +953,11 @@ static void canvas_donecanvasdialog(t_glist *x, canvas_setgraph(x, graphme, 0); if (x->gl_havewindow) canvas_redraw(x); - else gobj_redraw(&x->gl_gobj, x->gl_owner); + else if (glist_isvisible(x->gl_owner)) + { + gobj_vis(&x->gl_gobj, x->gl_owner, 0); + gobj_vis(&x->gl_gobj, x->gl_owner, 1); + } } /* called from the gui when a popup menu comes back with "properties," diff --git a/pd/src/g_hdial.c b/pd/src/g_hdial.c index 3da1ef71..5f37fbed 100644 --- a/pd/src/g_hdial.c +++ b/pd/src/g_hdial.c @@ -31,18 +31,20 @@ static t_class *hradio_class, *hradio_old_class; /* widget helper functions */ -void hradio_draw_update(t_hradio *x, t_glist *glist) +void hradio_draw_update(t_gobj *client, t_glist *glist) { + t_hradio *x = (t_hradio *)client; if(glist_isvisible(glist)) { t_canvas *canvas=glist_getcanvas(glist); sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -outline #%6.6x\n", - canvas, x, x->x_on_old, + canvas, x, x->x_drawn, x->x_gui.x_bcol, x->x_gui.x_bcol); sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -outline #%6.6x\n", canvas, x, x->x_on, x->x_gui.x_fcol, x->x_gui.x_fcol); + x->x_drawn = x->x_on; } } @@ -68,6 +70,7 @@ void hradio_draw_new(t_hradio *x, t_glist *glist) xx11 += dx; xx21 += dx; xx22 += dx; + x->x_drawn = x->x_on; } sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", @@ -204,7 +207,7 @@ void hradio_draw_select(t_hradio* x, t_glist* glist) void hradio_draw(t_hradio *x, t_glist *glist, int mode) { if(mode == IEM_GUI_DRAW_MODE_UPDATE) - hradio_draw_update(x, glist); + sys_queuegui(x, glist, hradio_draw_update); else if(mode == IEM_GUI_DRAW_MODE_MOVE) hradio_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) diff --git a/pd/src/g_hslider.c b/pd/src/g_hslider.c index be744d41..624f1afe 100644 --- a/pd/src/g_hslider.c +++ b/pd/src/g_hslider.c @@ -30,8 +30,9 @@ static t_class *hslider_class; /* widget helper functions */ -static void hslider_draw_update(t_hslider *x, t_glist *glist) +static void hslider_draw_update(t_gobj *client, t_glist *glist) { + t_hslider *x = (t_hslider *)client; t_canvas *canvas=glist_getcanvas(glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); @@ -182,7 +183,7 @@ static void hslider_draw_select(t_hslider* x,t_glist* glist) void hslider_draw(t_hslider *x, t_glist *glist, int mode) { if(mode == IEM_GUI_DRAW_MODE_UPDATE) - hslider_draw_update(x, glist); + sys_queuegui(x, glist, hslider_draw_update); else if(mode == IEM_GUI_DRAW_MODE_MOVE) hslider_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) diff --git a/pd/src/g_numbox.c b/pd/src/g_numbox.c index 547641c5..68e1399d 100644 --- a/pd/src/g_numbox.c +++ b/pd/src/g_numbox.c @@ -26,6 +26,7 @@ /*------------------ global functions -------------------------*/ static void my_numbox_key(void *z, t_floatarg fkey); +static void my_numbox_draw_update(t_gobj *client, t_glist *glist); /* ------------ nmx gui-my number box ----------------------- */ @@ -39,13 +40,13 @@ static void my_numbox_tick_reset(t_my_numbox *x) if(x->x_gui.x_fsf.x_change && x->x_gui.x_glist) { x->x_gui.x_fsf.x_change = 0; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } } static void my_numbox_tick_wait(t_my_numbox *x) { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } void my_numbox_clip(t_my_numbox *x) @@ -127,8 +128,9 @@ void my_numbox_ftoa(t_my_numbox *x) } } -static void my_numbox_draw_update(t_my_numbox *x, t_glist *glist) +static void my_numbox_draw_update(t_gobj *client, t_glist *glist) { + t_my_numbox *x = (t_my_numbox *)client; if (glist_isvisible(glist)) { if(x->x_gui.x_fsf.x_change) @@ -315,7 +317,7 @@ static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist) x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); x->x_buf[0] = 0; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } sys_vgui(".x%lx.c itemconfigure %lxBASE1 -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); @@ -342,7 +344,7 @@ static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist) void my_numbox_draw(t_my_numbox *x, t_glist *glist, int mode) { if(mode == IEM_GUI_DRAW_MODE_UPDATE) - my_numbox_draw_update(x, glist); + sys_queuegui(x, glist, my_numbox_draw_update); else if(mode == IEM_GUI_DRAW_MODE_MOVE) my_numbox_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) @@ -382,7 +384,7 @@ static void my_numbox_save(t_gobj *z, t_binbuf *b) { x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } binbuf_addv(b, "ssiisiiffiisssiiiiiiifi", gensym("#X"),gensym("obj"), (int)x->x_gui.x_obj.te_xpix, (int)x->x_gui.x_obj.te_ypix, @@ -446,7 +448,7 @@ static void my_numbox_properties(t_gobj *z, t_glist *owner) { x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } sprintf(buf, "pdtk_iemgui_dialog %%s NUMBERBOX \ @@ -522,7 +524,7 @@ static void my_numbox_motion(t_my_numbox *x, t_floatarg dx, t_floatarg dy) else x->x_val -= k2*dy; my_numbox_clip(x); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); my_numbox_bang(x); clock_unset(x->x_clock_reset); } @@ -560,7 +562,7 @@ static int my_numbox_newclick(t_gobj *z, struct _glist *glist, x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); x->x_buf[0] = 0; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } } return (1); @@ -570,7 +572,7 @@ static void my_numbox_set(t_my_numbox *x, t_floatarg f) { x->x_val = f; my_numbox_clip(x); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } static void my_numbox_log_height(t_my_numbox *x, t_floatarg lh) @@ -622,7 +624,7 @@ static void my_numbox_range(t_my_numbox *x, t_symbol *s, int ac, t_atom *av) if(my_numbox_check_minmax(x, (double)atom_getfloatarg(0, ac, av), (double)atom_getfloatarg(1, ac, av))) { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); /*my_numbox_bang(x);*/ } } @@ -663,7 +665,7 @@ static void my_numbox_log(t_my_numbox *x) x->x_lin0_log1 = 1; if(my_numbox_check_minmax(x, x->x_min, x->x_max)) { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); /*my_numbox_bang(x);*/ } } @@ -682,7 +684,7 @@ static void my_numbox_loadbang(t_my_numbox *x) { if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit) { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); my_numbox_bang(x); } } @@ -698,7 +700,7 @@ static void my_numbox_key(void *z, t_floatarg fkey) { x->x_gui.x_fsf.x_change = 0; clock_unset(x->x_clock_reset); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); return; } if(((c>='0')&&(c<='9'))||(c=='.')||(c=='-')|| @@ -708,7 +710,7 @@ static void my_numbox_key(void *z, t_floatarg fkey) { buf[0] = c; strcat(x->x_buf, buf); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } } else if((c=='\b')||(c==127)) @@ -718,7 +720,7 @@ static void my_numbox_key(void *z, t_floatarg fkey) if(sl < 0) sl = 0; x->x_buf[sl] = 0; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } else if((c=='\n')||(c==13)) { @@ -728,7 +730,7 @@ static void my_numbox_key(void *z, t_floatarg fkey) clock_unset(x->x_clock_reset); my_numbox_clip(x); my_numbox_bang(x); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update); } clock_delay(x->x_clock_reset, 3000); } diff --git a/pd/src/g_scalar.c b/pd/src/g_scalar.c index d091108c..9c5ce836 100644 --- a/pd/src/g_scalar.c +++ b/pd/src/g_scalar.c @@ -198,18 +198,16 @@ static void scalar_getrect(t_gobj *z, t_glist *owner, static void scalar_select(t_gobj *z, t_glist *owner, int state) { t_scalar *x = (t_scalar *)z; - /* post("scalar_select %d", state); */ - /* later */ + t_symbol *templatesym = x->sc_template; + t_template *tmpl; + t_atom at; + t_gpointer gp; + gpointer_init(&gp); + gpointer_setglist(&gp, owner, x); + SETPOINTER(&at, &gp); if (state) { int x1, y1, x2, y2; - t_symbol *templatesym = x->sc_template; - t_template *tmpl; - t_atom at; - t_gpointer gp; - gpointer_init(&gp); - gpointer_setglist(&gp, owner, x); - SETPOINTER(&at, &gp); if (tmpl = template_findbyname(templatesym)) template_notify(tmpl, gensym("select"), 1, &at); gpointer_unset(&gp); @@ -221,7 +219,13 @@ static void scalar_select(t_gobj *z, t_glist *owner, int state) glist_getcanvas(owner), x1, y1, x1, y2, x2, y2, x2, y1, x1, y1, x); } - else sys_vgui(".x%lx.c delete select%lx\n", glist_getcanvas(owner), x); + else + { + sys_vgui(".x%lx.c delete select%lx\n", glist_getcanvas(owner), x); + if (tmpl = template_findbyname(templatesym)) + template_notify(tmpl, gensym("deselect"), 1, &at); + + } } static void scalar_displace(t_gobj *z, t_glist *glist, int dx, int dy) @@ -248,7 +252,7 @@ static void scalar_displace(t_gobj *z, t_glist *glist, int dx, int dy) if (goty) *(t_float *)(((char *)(x->sc_vec)) + yonset) += dy * (glist_pixelstoy(glist, 1) - glist_pixelstoy(glist, 0)); - glist_redrawitem(glist, z); + scalar_redraw(x, glist); if (glist_isselected(glist, z)) { scalar_select(z, glist, 0); @@ -295,8 +299,18 @@ static void scalar_vis(t_gobj *z, t_glist *owner, int vis) if (!wb) continue; (*wb->w_parentvisfn)(y, owner, x->sc_vec, template, basex, basey, vis); } - if (!vis) - sys_unqueuegui(x); + sys_unqueuegui(x); +} + +static void scalar_doredraw(t_gobj *client, t_glist *glist) +{ + scalar_vis(client, glist, 0); + scalar_vis(client, glist, 1); +} + +void scalar_redraw(t_scalar *x, t_glist *glist) +{ + sys_queuegui(x, glist, scalar_doredraw); } int scalar_doclick(t_word *data, t_template *template, t_scalar *sc, diff --git a/pd/src/g_template.c b/pd/src/g_template.c index 7a788933..69f1c864 100644 --- a/pd/src/g_template.c +++ b/pd/src/g_template.c @@ -434,7 +434,7 @@ void template_conform(t_template *tfrom, t_template *tto) t_dataslot *dataslot = &tto->t_vec[i]; for (j = 0; j < nfrom; j++) if (!conformedfrom[j] && - dataslot_matches(dataslot, &tfrom->t_vec[j], 1)) + dataslot_matches(dataslot, &tfrom->t_vec[j], 0)) { conformaction[i] = j; conformedfrom[j] = 1; @@ -960,8 +960,10 @@ typedef struct _curve t_fielddesc x_fillcolor; t_fielddesc x_outlinecolor; t_fielddesc x_width; + t_fielddesc x_vis; int x_npoints; t_fielddesc *x_vec; + t_canvas *x_canvas; } t_curve; static void *curve_new(t_symbol *classsym, t_int argc, t_atom *argv) @@ -971,16 +973,29 @@ static void *curve_new(t_symbol *classsym, t_int argc, t_atom *argv) int flags = 0; int nxy, i; t_fielddesc *fd; + x->x_canvas = canvas_getcurrent(); if (classname[0] == 'f') { classname += 6; flags |= CLOSED; - if (argc) fielddesc_setfloatarg(&x->x_fillcolor, argc--, argv++); - else fielddesc_setfloat_const(&x->x_outlinecolor, 0); } else classname += 4; if (classname[0] == 'c') flags |= BEZ; x->x_flags = flags; + fielddesc_setfloat_const(&x->x_vis, 1); + while (1) + { + t_symbol *firstarg = atom_getsymbolarg(0, argc, argv); + if (!strcmp(firstarg->s_name, "-v") && argc > 1) + { + fielddesc_setfloatarg(&x->x_vis, 1, argv+1); + argc -= 2; argv += 2; + } + else break; + } + if ((flags & CLOSED) && argc) + fielddesc_setfloatarg(&x->x_fillcolor, argc--, argv++); + else fielddesc_setfloat_const(&x->x_fillcolor, 0); if (argc) fielddesc_setfloatarg(&x->x_outlinecolor, argc--, argv++); else fielddesc_setfloat_const(&x->x_outlinecolor, 0); if (argc) fielddesc_setfloatarg(&x->x_width, argc--, argv++); @@ -996,6 +1011,23 @@ static void *curve_new(t_symbol *classsym, t_int argc, t_atom *argv) return (x); } +void curve_float(t_curve *x, t_floatarg f) +{ + int viswas; + if (x->x_vis.fd_type != A_FLOAT || x->x_vis.fd_var) + { + pd_error(x, "global vis/invis for a template with variable visibility"); + return; + } + viswas = (x->x_vis.fd_un.fd_float != 0); + + if ((f != 0 && viswas) || (f == 0 && !viswas)) + return; + canvas_redrawallfortemplatecanvas(x->x_canvas, 2); + fielddesc_setfloat_const(&x->x_vis, (f != 0)); + canvas_redrawallfortemplatecanvas(x->x_canvas, 1); +} + /* -------------------- widget behavior for curve ------------ */ static void curve_getrect(t_gobj *z, t_glist *glist, @@ -1006,6 +1038,12 @@ static void curve_getrect(t_gobj *z, t_glist *glist, int i, n = x->x_npoints; t_fielddesc *f = x->x_vec; int x1 = 0x7fffffff, x2 = -0x7fffffff, y1 = 0x7fffffff, y2 = -0x7fffffff; + if (!fielddesc_getfloat(&x->x_vis, template, data, 0)) + { + *xp1 = *yp1 = 0x7fffffff; + *xp2 = *yp2 = -0x7fffffff; + return; + } for (i = 0, f = x->x_vec; i < n; i++, f += 2) { int xloc = glist_xtopixels(glist, @@ -1071,6 +1109,8 @@ static void curve_vis(t_gobj *z, t_glist *glist, int i, n = x->x_npoints; t_fielddesc *f = x->x_vec; + if (!fielddesc_getfloat(&x->x_vis, template, data, 0)) + return; if (vis) { if (n > 1) @@ -1158,7 +1198,7 @@ static void curve_motion(void *z, t_floatarg dx, t_floatarg dy) 1); } if (curve_motion_scalar) - glist_redrawitem(curve_motion_glist, &curve_motion_scalar->sc_gobj); + scalar_redraw(curve_motion_scalar, curve_motion_glist); if (curve_motion_array) array_redraw(curve_motion_array, curve_motion_glist); } @@ -1173,6 +1213,8 @@ static int curve_click(t_gobj *z, t_glist *glist, int bestn = -1; int besterror = 0x7fffffff; t_fielddesc *f; + if (!fielddesc_getfloat(&x->x_vis, template, data, 0)) + return (0); for (i = 0, f = x->x_vec; i < n; i++, f += 2) { int xval = fielddesc_getcoord(f, template, data, 0), @@ -1235,7 +1277,7 @@ static void curve_free(t_curve *x) static void curve_setup(void) { curve_class = class_new(gensym("drawpolygon"), (t_newmethod)curve_new, - (t_method)curve_free, sizeof(t_curve), CLASS_NOINLET, A_GIMME, 0); + (t_method)curve_free, sizeof(t_curve), 0, A_GIMME, 0); class_setdrawcommand(curve_class); class_addcreator((t_newmethod)curve_new, gensym("drawcurve"), A_GIMME, 0); @@ -1244,6 +1286,7 @@ static void curve_setup(void) class_addcreator((t_newmethod)curve_new, gensym("filledcurve"), A_GIMME, 0); class_setparentwidget(curve_class, &curve_widgetbehavior); + class_addfloat(curve_class, curve_float); } /* --------- plots for showing arrays --------------- */ @@ -1271,13 +1314,15 @@ typedef struct _plot static void *plot_new(t_symbol *classsym, t_int argc, t_atom *argv) { t_plot *x = (t_plot *)pd_new(plot_class); - int defstyle = PLOTSTYLE_POLY, vis = 1, scalarvis = 1; + int defstyle = PLOTSTYLE_POLY; x->x_canvas = canvas_getcurrent(); fielddesc_setfloat_var(&x->x_xpoints, gensym("x")); fielddesc_setfloat_var(&x->x_ypoints, gensym("y")); fielddesc_setfloat_var(&x->x_wpoints, gensym("w")); + fielddesc_setfloat_const(&x->x_vis, 1); + fielddesc_setfloat_const(&x->x_scalarvis, 1); while (1) { t_symbol *firstarg = atom_getsymbolarg(0, argc, argv); @@ -1287,15 +1332,15 @@ static void *plot_new(t_symbol *classsym, t_int argc, t_atom *argv) defstyle = PLOTSTYLE_BEZ; argc--, argv++; } - else if (!strcmp(firstarg->s_name, "-n")) + else if (!strcmp(firstarg->s_name, "-v") && argc > 1) { - vis = 0; - argc--; argv++; + fielddesc_setfloatarg(&x->x_vis, 1, argv+1); + argc -= 2; argv += 2; } - else if (!strcmp(firstarg->s_name, "-noscalar")) + else if (!strcmp(firstarg->s_name, "-vs") && argc > 1) { - scalarvis = 0; - argc--; argv++; + fielddesc_setfloatarg(&x->x_scalarvis, 1, argv+1); + argc -= 2; argv += 2; } else if (!strcmp(firstarg->s_name, "-x") && argc > 1) { @@ -1328,10 +1373,6 @@ static void *plot_new(t_symbol *classsym, t_int argc, t_atom *argv) else fielddesc_setfloat_const(&x->x_xinc, 1); if (argc) fielddesc_setfloatarg(&x->x_style, argc--, argv++); else fielddesc_setfloat_const(&x->x_style, defstyle); - if (argc) fielddesc_setfloatarg(&x->x_vis, argc--, argv++); - else fielddesc_setfloat_const(&x->x_vis, vis); - if (argc) fielddesc_setfloatarg(&x->x_scalarvis, argc--, argv++); - else fielddesc_setfloat_const(&x->x_scalarvis, 1); return (x); } @@ -1701,8 +1742,8 @@ static void plot_vis(t_gobj *z, t_glist *glist, if (xonset >= 0 || ixpix != lastpixel) { sys_vgui("%d %f \\\n", ixpix, glist_ytopixels(glist, - basey + fielddesc_cvttocoord(yfielddesc, - yloc + yval) + + basey + yloc + fielddesc_cvttocoord(yfielddesc, + yval) + fielddesc_cvttocoord(wfielddesc, wval))); ndrawn++; } @@ -1714,12 +1755,12 @@ static void plot_vis(t_gobj *z, t_glist *glist, if (ndrawn < 4) { sys_vgui("%d %f \\\n", ixpix + 10, glist_ytopixels(glist, - basey + fielddesc_cvttocoord(yfielddesc, - yloc + yval) + + basey + yloc + fielddesc_cvttocoord(yfielddesc, + yval) + fielddesc_cvttocoord(wfielddesc, wval))); sys_vgui("%d %f \\\n", ixpix + 10, glist_ytopixels(glist, - basey + fielddesc_cvttocoord(yfielddesc, - yloc + yval) - + basey + yloc + fielddesc_cvttocoord(yfielddesc, + yval) - fielddesc_cvttocoord(wfielddesc, wval))); } ouch: @@ -1753,8 +1794,8 @@ static void plot_vis(t_gobj *z, t_glist *glist, { sys_vgui("%d %f \\\n", ixpix, glist_ytopixels(glist, - basey + fielddesc_cvttocoord(yfielddesc, - yloc + yval))); + basey + yloc + fielddesc_cvttocoord(yfielddesc, + yval))); ndrawn++; } lastpixel = ixpix; @@ -1763,8 +1804,8 @@ static void plot_vis(t_gobj *z, t_glist *glist, /* TK will complain if there aren't at least 2 points... */ if (ndrawn == 0) sys_vgui("0 0 0 0 \\\n"); else if (ndrawn == 1) sys_vgui("%d %f \\\n", ixpix + 10, - glist_ytopixels(glist, basey + - fielddesc_cvttocoord(yfielddesc, yloc + yval))); + glist_ytopixels(glist, basey + yloc + + fielddesc_cvttocoord(yfielddesc, yval))); sys_vgui("-width %f\\\n", linewidth); sys_vgui("-fill %s\\\n", outline); @@ -1789,7 +1830,8 @@ static void plot_vis(t_gobj *z, t_glist *glist, if (yonset >= 0) yval = *(float *)((elem + elemsize * i) + yonset); else yval = 0; - useyloc = basey + fielddesc_cvttocoord(yfielddesc, yloc+yval); + useyloc = basey + yloc + + fielddesc_cvttocoord(yfielddesc, yval); for (y = elemtemplatecanvas->gl_list; y; y = y->g_next) { t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd); @@ -1870,12 +1912,12 @@ static void plot_setup(void) class_setparentwidget(plot_class, &plot_widgetbehavior); } -/* ---------------- drawnumber: draw a number ---------------- */ +/* ---------------- drawnumber: draw a number (or symbol) ---------------- */ /* drawnumbers draw numeric fields at controllable locations, with - controllable color and label . - invocation: (drawnumber|drawsymbol) variable x y color label + controllable color and label. invocation: + (drawnumber|drawsymbol) [-v <visible>] variable x y color label */ t_class *drawnumber_class; @@ -1885,11 +1927,11 @@ t_class *drawnumber_class; typedef struct _drawnumber { t_object x_obj; - int x_vis; /* LATER incorporate into flags field below? */ t_fielddesc x_value; t_fielddesc x_xloc; t_fielddesc x_yloc; t_fielddesc x_color; + t_fielddesc x_vis; t_symbol *x_label; int x_flags; t_canvas *x_canvas; @@ -1904,15 +1946,15 @@ static void *drawnumber_new(t_symbol *classsym, t_int argc, t_atom *argv) if (classname[4] == 's') flags |= DRAW_SYMBOL; x->x_flags = flags; - x->x_vis = 1; + fielddesc_setfloat_const(&x->x_vis, 1); x->x_canvas = canvas_getcurrent(); while (1) { t_symbol *firstarg = atom_getsymbolarg(0, argc, argv); - if (!strcmp(firstarg->s_name, "-n")) + if (!strcmp(firstarg->s_name, "-v") && argc > 1) { - x->x_vis = 0; - argc--; argv++; + fielddesc_setfloatarg(&x->x_vis, 1, argv+1); + argc -= 2; argv += 2; } else break; } @@ -1920,7 +1962,6 @@ static void *drawnumber_new(t_symbol *classsym, t_int argc, t_atom *argv) { if (argc) fielddesc_setsymbolarg(&x->x_value, argc--, argv++); else fielddesc_setsymbol_const(&x->x_value, &s_); - } else { @@ -1942,10 +1983,18 @@ static void *drawnumber_new(t_symbol *classsym, t_int argc, t_atom *argv) void drawnumber_float(t_drawnumber *x, t_floatarg f) { - if ((f != 0 && x->x_vis) || (f == 0 && !x->x_vis)) + int viswas; + if (x->x_vis.fd_type != A_FLOAT || x->x_vis.fd_var) + { + pd_error(x, "global vis/invis for a template with variable visibility"); + return; + } + viswas = (x->x_vis.fd_un.fd_float != 0); + + if ((f != 0 && viswas) || (f == 0 && !viswas)) return; canvas_redrawallfortemplatecanvas(x->x_canvas, 2); - x->x_vis = (f!= 0); + fielddesc_setfloat_const(&x->x_vis, (f != 0)); canvas_redrawallfortemplatecanvas(x->x_canvas, 1); } @@ -1970,7 +2019,7 @@ static void drawnumber_getrect(t_gobj *z, t_glist *glist, int xloc, yloc, font, fontwidth, fontheight; char buf[DRAWNUMBER_BUFSIZE]; - if (!x->x_vis) + if (!fielddesc_getfloat(&x->x_vis, template, data, 0)) { *xp1 = *yp1 = 0x7fffffff; *xp2 = *yp2 = -0x7fffffff; @@ -2021,7 +2070,7 @@ static void drawnumber_vis(t_gobj *z, t_glist *glist, { t_drawnumber *x = (t_drawnumber *)z; - if (!x->x_vis) + if (!fielddesc_getfloat(&x->x_vis, template, data, 0)) return; if (vis) { @@ -2067,8 +2116,7 @@ static void drawnumber_motion(void *z, t_floatarg dx, t_floatarg dy) drawnumber_motion_ycumulative, 1); if (drawnumber_motion_scalar) - glist_redrawitem(drawnumber_motion_glist, - &drawnumber_motion_scalar->sc_gobj); + scalar_redraw(drawnumber_motion_scalar, drawnumber_motion_glist); if (drawnumber_motion_array) array_redraw(drawnumber_motion_array, drawnumber_motion_glist); } @@ -2084,7 +2132,8 @@ static int drawnumber_click(t_gobj *z, t_glist *glist, data, template, basex, basey, &x1, &y1, &x2, &y2); if (xpix >= x1 && xpix <= x2 && ypix >= y1 && ypix <= y2 - && x->x_value.fd_var && x->x_vis) + && x->x_value.fd_var && + fielddesc_getfloat(&x->x_vis, template, data, 0)) { if (doit) { diff --git a/pd/src/g_traversal.c b/pd/src/g_traversal.c index c99a125c..375b5123 100644 --- a/pd/src/g_traversal.c +++ b/pd/src/g_traversal.c @@ -273,7 +273,6 @@ static void ptrobj_next(t_ptrobj *x) { ptrobj_vnext(x, 0); } - static void ptrobj_sendwindow(t_ptrobj *x, t_symbol *s, int argc, t_atom *argv) { t_scalar *sc; @@ -334,6 +333,32 @@ static void ptrobj_pointer(t_ptrobj *x, t_gpointer *gp) ptrobj_bang(x); } + +static void ptrobj_rewind(t_ptrobj *x) +{ + t_scalar *sc; + t_symbol *templatesym; + int n; + t_typedout *to; + t_glist *glist; + t_pd *canvas; + t_gstub *gs; + if (!gpointer_check(&x->x_gp, 1)) + { + pd_error(x, "pointer_rewind: empty pointer"); + return; + } + gs = x->x_gp.gp_stub; + if (gs->gs_which != GP_GLIST) + { + pd_error(x, "pointer_rewind: sorry, unavailable for arrays"); + return; + } + glist = gs->gs_un.gs_glist; + gpointer_setglist(&x->x_gp, glist, 0); + ptrobj_bang(x); +} + static void ptrobj_free(t_ptrobj *x) { freebytes(x->x_typedout, x->x_ntypedout * sizeof (*x->x_typedout)); @@ -351,6 +376,8 @@ static void ptrobj_setup(void) A_DEFFLOAT, 0); class_addmethod(ptrobj_class, (t_method)ptrobj_sendwindow, gensym("send-window"), A_GIMME, 0); + class_addmethod(ptrobj_class, (t_method)ptrobj_rewind, + gensym("rewind"), 0); class_addpointer(ptrobj_class, ptrobj_pointer); class_addbang(ptrobj_class, ptrobj_bang); } @@ -541,14 +568,14 @@ static void set_bang(t_set *x) else for (i = 0, vp = x->x_variables; i < nitems; i++, vp++) template_setfloat(template, vp->gv_sym, vec, vp->gv_w.w_float, 1); if (gs->gs_which == GP_GLIST) - glist_redrawitem(gs->gs_un.gs_glist, (t_gobj *)(gp->gp_un.gp_scalar)); + scalar_redraw(gp->gp_un.gp_scalar, gs->gs_un.gs_glist); else { t_array *owner_array = gs->gs_un.gs_array; while (owner_array->a_gp.gp_stub->gs_which == GP_ARRAY) owner_array = owner_array->a_gp.gp_stub->gs_un.gs_array; - glist_redrawitem(owner_array->a_gp.gp_stub->gs_un.gs_glist, - (t_gobj *)(owner_array->a_gp.gp_un.gp_scalar)); + scalar_redraw(owner_array->a_gp.gp_un.gp_scalar, + owner_array->a_gp.gp_stub->gs_un.gs_glist); } } @@ -1019,7 +1046,7 @@ static void append_float(t_append *x, t_float f) template_setfloat(template, vp->gv_sym, vec, vp->gv_f, 1); } - glist_redrawitem(glist, (t_gobj *)sc); + scalar_redraw(sc, glist); outlet_pointer(x->x_obj.ob_outlet, gp); } diff --git a/pd/src/g_vdial.c b/pd/src/g_vdial.c index 32d30876..81e29693 100644 --- a/pd/src/g_vdial.c +++ b/pd/src/g_vdial.c @@ -32,18 +32,20 @@ static t_class *vradio_class, *vradio_old_class; /* widget helper functions */ -void vradio_draw_update(t_vradio *x, t_glist *glist) +void vradio_draw_update(t_gobj *client, t_glist *glist) { + t_hradio *x = (t_hradio *)client; if(glist_isvisible(glist)) { t_canvas *canvas=glist_getcanvas(glist); sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -outline #%6.6x\n", - canvas, x, x->x_on_old, + canvas, x, x->x_drawn, x->x_gui.x_bcol, x->x_gui.x_bcol); sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -outline #%6.6x\n", canvas, x, x->x_on, x->x_gui.x_fcol, x->x_gui.x_fcol); + x->x_drawn = x->x_on; } } @@ -70,6 +72,7 @@ void vradio_draw_new(t_vradio *x, t_glist *glist) yy12 += dy; yy21 += dy; yy22 += dy; + x->x_drawn = x->x_on; } sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %lxLABEL\n", @@ -204,7 +207,7 @@ void vradio_draw_select(t_vradio* x, t_glist* glist) void vradio_draw(t_vradio *x, t_glist *glist, int mode) { if(mode == IEM_GUI_DRAW_MODE_UPDATE) - vradio_draw_update(x, glist); + sys_queuegui(x, glist, vradio_draw_update); else if(mode == IEM_GUI_DRAW_MODE_MOVE) vradio_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) diff --git a/pd/src/g_vslider.c b/pd/src/g_vslider.c index 00dfa701..eba519a3 100644 --- a/pd/src/g_vslider.c +++ b/pd/src/g_vslider.c @@ -30,8 +30,9 @@ static t_class *vslider_class; /* widget helper functions */ -static void vslider_draw_update(t_vslider *x, t_glist *glist) +static void vslider_draw_update(t_gobj *client, t_glist *glist) { + t_vslider *x = (t_vslider *)client; if (glist_isvisible(glist)) { int r = text_ypix(&x->x_gui.x_obj, glist) + x->x_gui.x_h - (x->x_val + 50)/100; @@ -174,7 +175,7 @@ static void vslider_draw_select(t_vslider *x, t_glist *glist) void vslider_draw(t_vslider *x, t_glist *glist, int mode) { if(mode == IEM_GUI_DRAW_MODE_UPDATE) - vslider_draw_update(x, glist); + sys_queuegui(x, glist, vslider_draw_update); else if(mode == IEM_GUI_DRAW_MODE_MOVE) vslider_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) diff --git a/pd/src/g_vumeter.c b/pd/src/g_vumeter.c index 983a28e4..ac6ee0ae 100644 --- a/pd/src/g_vumeter.c +++ b/pd/src/g_vumeter.c @@ -76,6 +76,21 @@ static void vu_update_peak(t_vu *x, t_glist *glist) } } +static void vu_draw_update(t_gobj *client, t_glist *glist) +{ + t_vu *x = (t_vu *)client; + if (x->x_updaterms) + { + vu_update_rms(x, glist); + x->x_updaterms = 0; + } + if (x->x_updatepeak) + { + vu_update_peak(x, glist); + x->x_updatepeak = 0; + } +} + static void vu_draw_new(t_vu *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); @@ -151,6 +166,8 @@ static void vu_draw_new(t_vu *x, t_glist *glist) xpos+x->x_gui.x_w+1, ypos-1, x, 1); } + x->x_updaterms = x->x_updatepeak = 1; + sys_queuegui(x, x->x_gui.x_glist, vu_draw_update); } @@ -185,8 +202,8 @@ static void vu_draw_move(t_vu *x, t_glist *glist) sys_vgui(".x%lx.c coords %lxSCALE%d %d %d\n", canvas, x, i, end, yyy+k3); } - vu_update_peak(x, glist); - vu_update_rms(x, glist); + x->x_updaterms = x->x_updatepeak = 1; + sys_queuegui(x, glist, vu_draw_update); sys_vgui(".x%lx.c coords %lxLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); @@ -572,7 +589,8 @@ static void vu_float(t_vu *x, t_floatarg rms) rms = 0.01*(float)(i - 10000); x->x_fr = rms; outlet_float(x->x_out_rms, rms); - vu_update_rms(x, x->x_gui.x_glist); + x->x_updaterms = 1; + sys_queuegui(x, x->x_gui.x_glist, vu_draw_update); } static void vu_ft1(t_vu *x, t_floatarg peak) @@ -591,16 +609,17 @@ static void vu_ft1(t_vu *x, t_floatarg peak) i = (int)(100.0*peak + 10000.5); peak = 0.01*(float)(i - 10000); x->x_fp = peak; + x->x_updatepeak = 1; + sys_queuegui(x, x->x_gui.x_glist, vu_draw_update); outlet_float(x->x_out_peak, peak); - vu_update_peak(x, x->x_gui.x_glist); } static void vu_bang(t_vu *x) { outlet_float(x->x_out_peak, x->x_fp); outlet_float(x->x_out_rms, x->x_fr); - vu_update_rms(x, x->x_gui.x_glist); - vu_update_peak(x, x->x_gui.x_glist); + x->x_updaterms = x->x_updatepeak = 1; + sys_queuegui(x, x->x_gui.x_glist, vu_draw_update); } static void *vu_new(t_symbol *s, int argc, t_atom *argv) diff --git a/pd/src/makefile b/pd/src/makefile index 74fa20c4..9a560285 100644 --- a/pd/src/makefile +++ b/pd/src/makefile @@ -19,7 +19,7 @@ GLIB = -ltk8.4 -ltcl8.4 LDFLAGS = -Wl,-export-dynamic -lasound LIB = -ldl -lpthread -lasound -OPT_CFLAGS = -g +OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD diff --git a/pd/src/makefile.dependencies b/pd/src/makefile.dependencies index e51d1f4e..d6c7d5c5 100644 --- a/pd/src/makefile.dependencies +++ b/pd/src/makefile.dependencies @@ -11,8 +11,10 @@ g_canvas.o: g_canvas.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ - m_imp.h s_stuff.h g_canvas.h /usr/include/string.h g_all_guis.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h m_pd.h m_imp.h s_stuff.h g_canvas.h \ + /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h g_all_guis.h g_graph.o: g_graph.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -28,7 +30,8 @@ g_graph.o: g_graph.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/string.h + /usr/include/bits/stdio.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h g_text.o: g_text.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -44,8 +47,11 @@ g_text.o: g_text.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/string.h /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h + /usr/include/bits/stdio.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ + /usr/include/bits/mathinline.h g_rtext.o: g_rtext.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -56,11 +62,13 @@ g_rtext.o: g_rtext.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h s_stuff.h g_canvas.h t_tk.h + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h s_stuff.h \ + g_canvas.h t_tk.h g_array.o: g_array.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -71,12 +79,14 @@ g_array.o: g_array.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ - g_canvas.h /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h m_pd.h g_canvas.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h g_template.o: g_template.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -87,15 +97,20 @@ g_template.o: g_template.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ - s_stuff.h g_canvas.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h m_pd.h s_stuff.h g_canvas.h g_io.o: g_io.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h g_canvas.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h + /usr/include/gnu/stubs.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/endian.h \ + /usr/include/bits/endian.h /usr/include/bits/types.h \ + /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ + /usr/include/stdlib.h g_scalar.o: g_scalar.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -106,11 +121,12 @@ g_scalar.o: g_scalar.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ - g_canvas.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h m_pd.h g_canvas.h g_traversal.o: g_traversal.c /usr/include/stdlib.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h \ @@ -122,11 +138,12 @@ g_traversal.o: g_traversal.c /usr/include/stdlib.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ - g_canvas.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h m_pd.h g_canvas.h g_guiconnect.o: g_guiconnect.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h g_canvas.h g_readwrite.o: g_readwrite.c /usr/include/stdlib.h \ @@ -143,8 +160,9 @@ g_readwrite.o: g_readwrite.c /usr/include/stdlib.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ - g_canvas.h /usr/include/string.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h m_pd.h g_canvas.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h g_editor.o: g_editor.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -158,8 +176,10 @@ g_editor.o: g_editor.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ - m_imp.h s_stuff.h g_canvas.h /usr/include/string.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h m_pd.h m_imp.h s_stuff.h g_canvas.h \ + /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h g_all_guis.o: g_all_guis.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -170,15 +190,17 @@ g_all_guis.o: g_all_guis.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/bits/mathinline.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h g_bang.o: g_bang.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -189,15 +211,17 @@ g_bang.o: g_bang.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/bits/mathinline.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h g_hdial.o: g_hdial.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -208,15 +232,17 @@ g_hdial.o: g_hdial.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/bits/mathinline.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h g_hslider.o: g_hslider.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -227,15 +253,17 @@ g_hslider.o: g_hslider.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/bits/mathinline.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h g_mycanvas.o: g_mycanvas.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -246,15 +274,17 @@ g_mycanvas.o: g_mycanvas.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/bits/mathinline.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h g_numbox.o: g_numbox.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -265,15 +295,17 @@ g_numbox.o: g_numbox.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/bits/mathinline.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h g_toggle.o: g_toggle.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -284,15 +316,17 @@ g_toggle.o: g_toggle.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/bits/mathinline.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h g_vdial.o: g_vdial.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -303,13 +337,15 @@ g_vdial.o: g_vdial.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ + /usr/include/bits/mathinline.h g_vslider.o: g_vslider.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -320,15 +356,17 @@ g_vslider.o: g_vslider.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/bits/mathinline.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h g_vumeter.o: g_vumeter.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -339,15 +377,17 @@ g_vumeter.o: g_vumeter.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ + g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/bits/mathinline.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h m_pd.o: m_pd.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -372,7 +412,8 @@ m_class.o: m_class.c m_pd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ /usr/include/getopt.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/string.h + /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h m_obj.o: m_obj.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h m_imp.h m_atom.o: m_atom.c m_pd.h \ @@ -384,7 +425,9 @@ m_atom.o: m_atom.c m_pd.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/string.h + /usr/include/bits/stdio.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h m_memory.o: m_memory.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -395,7 +438,7 @@ m_memory.o: m_memory.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - m_pd.h m_imp.h + /usr/include/bits/string.h /usr/include/bits/string2.h m_pd.h m_imp.h m_binbuf.o: m_binbuf.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -410,9 +453,11 @@ m_binbuf.o: m_binbuf.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h /usr/include/fcntl.h \ - /usr/include/bits/fcntl.h /usr/include/string.h + /usr/include/bits/stdio.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ + /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h m_conf.o: m_conf.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h m_glob.o: m_glob.c m_pd.h \ @@ -445,12 +490,14 @@ s_main.o: s_main.c m_pd.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h /usr/include/string.h \ - /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ - /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/stdlib.h /usr/include/stdio.h /usr/include/libio.h \ + /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ + /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/stdlib.h \ - /usr/include/alloca.h /usr/include/unistd.h \ + /usr/include/bits/stdio.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/alloca.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ /usr/include/getopt.h s_inter.o: s_inter.c m_pd.h \ @@ -487,31 +534,34 @@ s_inter.o: s_inter.c m_pd.h \ /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \ /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/errno.h \ /usr/include/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/asm/errno.h /usr/include/string.h /usr/include/stdio.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/include/gconv.h /usr/include/bits/stdio_lim.h \ - /usr/include/bits/sys_errlist.h /usr/include/sched.h + /usr/include/asm/errno.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ + /usr/include/wchar.h /usr/include/gconv.h /usr/include/bits/stdio_lim.h \ + /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \ + /usr/include/sched.h s_file.o: s_file.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/stdlib.h /usr/include/sys/types.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h /usr/include/stdio.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ + /usr/include/gnu/stubs.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/endian.h \ + /usr/include/bits/endian.h /usr/include/bits/types.h \ + /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ + /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ + /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/stdio.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/errno.h /usr/include/bits/errno.h \ - /usr/include/linux/errno.h /usr/include/asm/errno.h \ - /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/fcntl.h \ - /usr/include/bits/fcntl.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/bits/stdio.h /usr/include/errno.h \ + /usr/include/bits/errno.h /usr/include/linux/errno.h \ + /usr/include/asm/errno.h /usr/include/sys/stat.h \ + /usr/include/bits/stat.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h s_print.o: s_print.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \ @@ -527,7 +577,9 @@ s_print.o: s_print.c m_pd.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/string.h /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/bits/stdio.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/errno.h /usr/include/bits/errno.h \ /usr/include/linux/errno.h /usr/include/asm/errno.h s_stuff.h s_loader.o: s_loader.c /usr/include/dlfcn.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ @@ -541,11 +593,13 @@ s_loader.o: s_loader.c /usr/include/dlfcn.h /usr/include/features.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/string.h m_pd.h s_stuff.h \ - /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ - /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/getopt.h /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h m_pd.h s_stuff.h /usr/include/stdio.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h s_path.o: s_path.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -558,12 +612,14 @@ s_path.o: s_path.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ /usr/include/getopt.h /usr/include/sys/stat.h /usr/include/bits/stat.h \ - /usr/include/string.h m_pd.h m_imp.h s_stuff.h /usr/include/stdio.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h m_pd.h m_imp.h s_stuff.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ + /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/ctype.h + /usr/include/bits/stdio.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/ctype.h s_entry.o: s_entry.c s_audio.o: s_audio.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \ @@ -574,16 +630,17 @@ s_audio.o: s_audio.c m_pd.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h \ - /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \ - /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/bits/sigset.h /usr/include/sys/resource.h \ - /usr/include/bits/resource.h /usr/include/stdlib.h \ - /usr/include/sys/types.h /usr/include/endian.h \ + /usr/include/bits/stdio.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h /usr/include/sys/time.h /usr/include/time.h \ + /usr/include/bits/time.h /usr/include/sys/select.h \ + /usr/include/bits/select.h /usr/include/bits/sigset.h \ + /usr/include/sys/resource.h /usr/include/bits/resource.h \ + /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h /usr/include/string.h /usr/include/errno.h \ + /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/errno.h \ /usr/include/bits/errno.h /usr/include/linux/errno.h \ /usr/include/asm/errno.h s_midi.o: s_midi.c m_pd.h \ @@ -595,16 +652,19 @@ s_midi.o: s_midi.c m_pd.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/bits/sigset.h /usr/include/string.h /usr/include/stdio.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/bits/sigset.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ + /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/signal.h /usr/include/bits/signum.h \ - /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h \ - /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \ - /usr/include/bits/sigstack.h /usr/include/bits/pthreadtypes.h \ - /usr/include/bits/sched.h /usr/include/bits/sigthread.h + /usr/include/bits/stdio.h /usr/include/signal.h \ + /usr/include/bits/signum.h /usr/include/bits/siginfo.h \ + /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \ + /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \ + /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ + /usr/include/bits/sigthread.h d_ugen.o: d_ugen.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h m_imp.h \ /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \ @@ -621,7 +681,8 @@ d_ctl.o: d_ctl.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ + /usr/include/bits/mathinline.h d_arithmetic.o: d_arithmetic.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h d_osc.o: d_osc.c m_pd.h \ @@ -629,18 +690,20 @@ d_osc.o: d_osc.c m_pd.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ - /usr/include/sys/types.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/time.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h + /usr/include/bits/mathinline.h /usr/include/endian.h \ + /usr/include/bits/endian.h /usr/include/sys/types.h \ + /usr/include/bits/types.h /usr/include/bits/wordsize.h \ + /usr/include/bits/typesizes.h /usr/include/time.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ + /usr/include/bits/sched.h d_filter.o: d_filter.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ + /usr/include/bits/mathinline.h d_dac.o: d_dac.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h d_misc.o: d_misc.c m_pd.h \ @@ -652,12 +715,15 @@ d_misc.o: d_misc.c m_pd.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/string.h + /usr/include/bits/stdio.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h d_math.o: d_math.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ + /usr/include/bits/mathinline.h d_fft.o: d_fft.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h d_mayer_fft.o: d_mayer_fft.c m_pd.h \ @@ -672,8 +738,9 @@ d_fftroutine.o: d_fftroutine.c /usr/include/stdio.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ + /usr/include/bits/stdio.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \ /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ @@ -693,7 +760,11 @@ d_array.o: d_array.c m_pd.h \ d_global.o: d_global.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h + /usr/include/gnu/stubs.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/endian.h \ + /usr/include/bits/endian.h /usr/include/bits/types.h \ + /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ + /usr/include/stdlib.h d_delay.o: d_delay.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h d_resample.o: d_resample.c m_pd.h \ @@ -702,16 +773,21 @@ x_arithmetic.o: x_arithmetic.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ + /usr/include/bits/mathinline.h x_connective.o: x_connective.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/stdio.h /usr/include/bits/types.h \ + /usr/include/gnu/stubs.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/endian.h \ + /usr/include/bits/endian.h /usr/include/bits/types.h \ /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/stdlib.h /usr/include/stdio.h /usr/include/libio.h \ + /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ + /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h x_interface.o: x_interface.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h x_midi.o: x_midi.c m_pd.h \ @@ -721,19 +797,22 @@ x_misc.o: x_misc.c m_pd.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/stdio.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/bits/mathinline.h /usr/include/stdio.h \ + /usr/include/bits/types.h /usr/include/bits/wordsize.h \ + /usr/include/bits/typesizes.h /usr/include/libio.h \ + /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ + /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/string.h /usr/include/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ - /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/bits/sigset.h /usr/include/bits/time.h \ - /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ - /usr/include/bits/sched.h /usr/include/sys/time.h \ - /usr/include/sys/times.h /usr/include/sys/param.h \ + /usr/include/bits/stdio.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \ + /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \ + /usr/include/bits/select.h /usr/include/bits/sigset.h \ + /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ + /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ + /usr/include/sys/time.h /usr/include/sys/times.h \ + /usr/include/sys/param.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/limits.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ @@ -750,12 +829,14 @@ x_time.o: x_time.c m_pd.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h x_acoustics.o: x_acoustics.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ + /usr/include/bits/mathinline.h x_net.o: x_net.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \ /usr/include/sys/types.h /usr/include/features.h \ @@ -766,7 +847,9 @@ x_net.o: x_net.c m_pd.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/string.h /usr/include/sys/socket.h /usr/include/sys/uio.h \ + /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/stdlib.h \ + /usr/include/sys/socket.h /usr/include/sys/uio.h \ /usr/include/bits/uio.h /usr/include/bits/socket.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/limits.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.h \ @@ -781,14 +864,18 @@ x_net.o: x_net.c m_pd.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h x_qlist.o: x_qlist.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/types.h \ + /usr/include/gnu/stubs.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/endian.h \ + /usr/include/bits/endian.h /usr/include/bits/types.h \ /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/stdlib.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h x_gui.o: x_gui.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ @@ -798,9 +885,11 @@ x_gui.o: x_gui.c m_pd.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/string.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/bits/stdio.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \ + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h x_list.o: x_list.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/alloca.h /usr/include/features.h /usr/include/sys/cdefs.h \ @@ -823,7 +912,9 @@ d_soundfile.o: d_soundfile.c /usr/include/unistd.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/string.h /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/bits/stdio.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ + /usr/include/stdlib.h /usr/include/errno.h /usr/include/bits/errno.h \ /usr/include/linux/errno.h /usr/include/asm/errno.h m_pd.h s_midi_oss.o: s_midi_oss.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ @@ -834,10 +925,10 @@ s_midi_oss.o: s_midi_oss.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h \ - /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/bits/stdio.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \ + /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ @@ -857,14 +948,15 @@ s_audio_oss.o: s_audio_oss.c /usr/include/linux/soundcard.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h \ - /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/bits/stdio.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \ + /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/sys/time.h /usr/include/sys/stat.h \ /usr/include/bits/stat.h /usr/include/sys/ioctl.h \ /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ @@ -882,31 +974,33 @@ s_audio_alsa.o: s_audio_alsa.c /usr/include/alsa/asoundlib.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ - /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/bits/sigset.h /usr/include/bits/time.h \ - /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ - /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/assert.h \ - /usr/include/sys/poll.h /usr/include/bits/poll.h /usr/include/errno.h \ - /usr/include/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/asm/errno.h /usr/include/alsa/asoundef.h \ - /usr/include/alsa/version.h /usr/include/alsa/global.h \ - /usr/include/alsa/input.h /usr/include/alsa/output.h \ - /usr/include/alsa/error.h /usr/include/alsa/conf.h \ - /usr/include/alsa/pcm.h /usr/include/alsa/rawmidi.h \ - /usr/include/alsa/timer.h /usr/include/alsa/hwdep.h \ - /usr/include/alsa/control.h /usr/include/alsa/mixer.h \ - /usr/include/alsa/seq_event.h /usr/include/alsa/seq.h \ - /usr/include/alsa/seqmid.h /usr/include/alsa/seq_midi_event.h \ - /usr/include/alsa/conv.h /usr/include/alsa/instr.h m_pd.h s_stuff.h \ - /usr/include/sys/time.h /usr/include/sys/stat.h \ - /usr/include/bits/stat.h /usr/include/sys/ioctl.h \ - /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ - /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \ - /usr/include/sys/ttydefaults.h /usr/include/sched.h \ - /usr/include/sys/mman.h /usr/include/bits/mman.h s_audio_alsa.h + /usr/include/bits/stdio.h /usr/include/stdlib.h \ + /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \ + /usr/include/bits/endian.h /usr/include/sys/select.h \ + /usr/include/bits/select.h /usr/include/bits/sigset.h \ + /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ + /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ + /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/assert.h /usr/include/sys/poll.h \ + /usr/include/bits/poll.h /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/linux/errno.h /usr/include/asm/errno.h \ + /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \ + /usr/include/alsa/global.h /usr/include/alsa/input.h \ + /usr/include/alsa/output.h /usr/include/alsa/error.h \ + /usr/include/alsa/conf.h /usr/include/alsa/pcm.h \ + /usr/include/alsa/rawmidi.h /usr/include/alsa/timer.h \ + /usr/include/alsa/hwdep.h /usr/include/alsa/control.h \ + /usr/include/alsa/mixer.h /usr/include/alsa/seq_event.h \ + /usr/include/alsa/seq.h /usr/include/alsa/seqmid.h \ + /usr/include/alsa/seq_midi_event.h /usr/include/alsa/conv.h \ + /usr/include/alsa/instr.h m_pd.h s_stuff.h /usr/include/sys/time.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h \ + /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h \ + /usr/include/asm/ioctls.h /usr/include/asm/ioctl.h \ + /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h \ + /usr/include/sched.h /usr/include/sys/mman.h /usr/include/bits/mman.h \ + s_audio_alsa.h s_audio_alsamm.o: s_audio_alsamm.c /usr/include/alsa/asoundlib.h \ /usr/include/unistd.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/posix_opt.h \ @@ -918,30 +1012,32 @@ s_audio_alsamm.o: s_audio_alsamm.c /usr/include/alsa/asoundlib.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ - /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/bits/sigset.h /usr/include/bits/time.h \ - /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ - /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/assert.h \ - /usr/include/sys/poll.h /usr/include/bits/poll.h /usr/include/errno.h \ - /usr/include/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/asm/errno.h /usr/include/alsa/asoundef.h \ - /usr/include/alsa/version.h /usr/include/alsa/global.h \ - /usr/include/alsa/input.h /usr/include/alsa/output.h \ - /usr/include/alsa/error.h /usr/include/alsa/conf.h \ - /usr/include/alsa/pcm.h /usr/include/alsa/rawmidi.h \ - /usr/include/alsa/timer.h /usr/include/alsa/hwdep.h \ - /usr/include/alsa/control.h /usr/include/alsa/mixer.h \ - /usr/include/alsa/seq_event.h /usr/include/alsa/seq.h \ - /usr/include/alsa/seqmid.h /usr/include/alsa/seq_midi_event.h \ - /usr/include/alsa/conv.h /usr/include/alsa/instr.h m_pd.h s_stuff.h \ - /usr/include/sys/time.h /usr/include/sys/stat.h \ - /usr/include/bits/stat.h /usr/include/sys/ioctl.h \ - /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ - /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \ - /usr/include/sys/ttydefaults.h /usr/include/sched.h s_audio_alsa.h + /usr/include/bits/stdio.h /usr/include/stdlib.h \ + /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \ + /usr/include/bits/endian.h /usr/include/sys/select.h \ + /usr/include/bits/select.h /usr/include/bits/sigset.h \ + /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ + /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ + /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \ + /usr/include/bits/string2.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/assert.h /usr/include/sys/poll.h \ + /usr/include/bits/poll.h /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/linux/errno.h /usr/include/asm/errno.h \ + /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \ + /usr/include/alsa/global.h /usr/include/alsa/input.h \ + /usr/include/alsa/output.h /usr/include/alsa/error.h \ + /usr/include/alsa/conf.h /usr/include/alsa/pcm.h \ + /usr/include/alsa/rawmidi.h /usr/include/alsa/timer.h \ + /usr/include/alsa/hwdep.h /usr/include/alsa/control.h \ + /usr/include/alsa/mixer.h /usr/include/alsa/seq_event.h \ + /usr/include/alsa/seq.h /usr/include/alsa/seqmid.h \ + /usr/include/alsa/seq_midi_event.h /usr/include/alsa/conv.h \ + /usr/include/alsa/instr.h m_pd.h s_stuff.h /usr/include/sys/time.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h \ + /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h \ + /usr/include/asm/ioctls.h /usr/include/asm/ioctl.h \ + /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h \ + /usr/include/sched.h s_audio_alsa.h s_midi_alsa.o: s_midi_alsa.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -951,10 +1047,10 @@ s_midi_alsa.o: s_midi_alsa.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h \ - /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/bits/stdio.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \ + /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ @@ -963,6 +1059,7 @@ s_midi_alsa.o: s_midi_alsa.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/errno.h /usr/include/bits/errno.h \ /usr/include/linux/errno.h /usr/include/asm/errno.h \ /usr/include/alsa/asoundlib.h /usr/include/string.h \ + /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/assert.h /usr/include/sys/poll.h /usr/include/bits/poll.h \ /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \ /usr/include/alsa/global.h /usr/include/alsa/input.h \ diff --git a/pd/src/notes.txt b/pd/src/notes.txt index c3fddbc1..dd9e641c 100644 --- a/pd/src/notes.txt +++ b/pd/src/notes.txt @@ -10,6 +10,7 @@ bug fix in d_soundfile.c bugfix in number2 plot drawing instructions turn on and off ranges in drawing instructions +select/deselect hook unify graph properties dialogs GOP font depends on abstraction, not parent bug fixes, stale pointers @@ -18,22 +19,32 @@ message "addcomma" etc Mac to tcl/tk 8.4.5; pd extension added automatically bug fix writing aiff gfiles bug fix (tcl error messages when starting open dialogs) +pointer rewind (also check if send-window documented?) + ------------ 0.39 --------- problems: +"list" to signal inlet (e.g., "*~") complains +"find" doesn't open GOPs correctly +save dirty abstractions on close +close dirty patches on quit +stop vis-ing subpatches of abstractions +when retyping abstractions, offer to save dirty one +don't filter locked click() through getrect +better hit detection (getrect is too greedy; try just sending it through) +thread-unsafe callbacks from sys_microsleep() + windows: modal dialogs confuse watchdog check the right-click-on-empty-canvas mac: load libraries first before opening patches on drag-and-drop + writing 3-byte soundfiles distorts??? check: MIDI I/O for windows blechman patch for s_inter.c check what happens when going back and forth between graph-on-parent - -garray change: -make a gobj_redraw that schedules the redraw array_resize etc., should redraw the array directly? Or should "setsize" and "garray_resize" do it instead? check it's queued correctly. @@ -47,11 +58,10 @@ problems: TK commands to nonexistent windows? (occasionally still happens) array name changes don't show up on parent arrays that don't fit in bounds don't update (same as red rectangle problem?) -look in d_resample.pd to inderstand inlet~ upsampling... +look in d_resample.pd to understand inlet~ upsampling... flag for array to suppress printing name fix samplerate~ to figure out blocking patcher inlets don't deal with scalars (zbug.pd) -need to optimize canvas_motion (get rid of box hit test??) check if there's a problem loading libs on startup if superuser tk errors for large tables? wierdly small hotspot on lines @@ -106,7 +116,6 @@ figure out why Pd sometimes crashes when you close example after adding fields arrays of non-existent templates crash vget, vset traversal objects cursor to show (x, y) location -better hit detection (getrect is too greedy; try tk's "current" tag for canvas) typing at drawnumbers test and debug list elements of templates sublists should display on parent if desired? (new drawing instruction) diff --git a/pd/src/s_main.c b/pd/src/s_main.c index 7b4b6aac..098ca115 100644 --- a/pd/src/s_main.c +++ b/pd/src/s_main.c @@ -2,7 +2,7 @@ * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ -char pd_version[] = "Pd version 0.39 TEST 4b\n"; +char pd_version[] = "Pd version 0.39 TEST 4c\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; |