Pd-cvs September 2006

pd-cvs@lists.iem.at

19 participants
346 discussions

pd/src desire.c,1.1.2.138,1.1.2.139
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5831 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.138 retrieving revision 1.1.2.139 diff -C2 -d -r1.1.2.138 -r1.1.2.139 *** desire.c 2 Sep 2006 18:00:43 -0000 1.1.2.138 --- desire.c 2 Sep 2006 19:00:37 -0000 1.1.2.139 *************** *** 488,493 **** its parent will be a "text" object in another window... we don't know which yet. */ ! t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv) ! { t_canvas *x = (t_canvas *)pd_new(canvas_class); t_canvas *owner = canvas_getcurrent(); --- 488,492 ---- its parent will be a "text" object in another window... we don't know which yet. */ ! t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv) { [...5137 lines suppressed...] ! /* try to reduce size by dropping decimal digits */ int wantreduce = bufsize - text->te_width; ! char *decimal = 0, *nextchar, *ebuf = x->x_buf + bufsize, ! *s1, *s2; ! for (decimal = x->x_buf; decimal < ebuf; decimal++) ! if (*decimal == '.') break; ! if (decimal >= ebuf) ! goto giveup; for (nextchar = decimal + 1; nextchar < ebuf; nextchar++) if (*nextchar < '0' || *nextchar > '9') break; --- 9205,9213 ---- int bufsize = x->x_bufsize; if (natom == 1 && atomp->a_type == A_FLOAT) { ! /* try to reduce size by dropping decimal digits */ int wantreduce = bufsize - text->te_width; ! char *decimal = 0, *nextchar, *ebuf = x->x_buf + bufsize, *s1, *s2; ! for (decimal = x->x_buf; decimal < ebuf; decimal++) if (*decimal == '.') break; ! if (decimal >= ebuf) goto giveup; for (nextchar = decimal + 1; nextchar < ebuf; nextchar++) if (*nextchar < '0' || *nextchar > '9') break;

1 0

pd/src desire.c,1.1.2.137,1.1.2.138
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11673 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.137 retrieving revision 1.1.2.138 diff -C2 -d -r1.1.2.137 -r1.1.2.138 *** desire.c 2 Sep 2006 09:01:39 -0000 1.1.2.137 --- desire.c 2 Sep 2006 18:00:43 -0000 1.1.2.138 *************** *** 48,52 **** #define template templaet ! #define glist_each(CHILD,GLIST) for(CHILD=(GLIST)->gl_list; CHILD; CHILD=CHILD->g_next) #define class_addmethod3(_cl,_ptr,_str,_sig) class_addmethod2(_cl,(t_method)_ptr,gensym(_str),_sig) --- 48,53 ---- #define template templaet ! #define glist_each(CHILD,GLIST) for(CHILD=(GLIST)->gl_list; CHILD; CHILD=CHILD->g_next) ! #define glists_each(GLIST,GLISTS) for(GLIST=GLISTS; GLIST; GLIST=GLIST->gl_next) [...2180 lines suppressed...] /* find the rtext that goes with a text item */ ! t_rtext *glist_findrtext(t_glist *gl, t_text *who) ! { t_rtext *x = gl->gl_editor->e_rtext; while (x && x->x_text != who) x = x->x_next; if (!x) bug("glist_findrtext"); ! return (x); } --- 9838,9846 ---- /* find the rtext that goes with a text item */ ! t_rtext *glist_findrtext(t_glist *gl, t_text *who) { t_rtext *x = gl->gl_editor->e_rtext; while (x && x->x_text != who) x = x->x_next; if (!x) bug("glist_findrtext"); ! return x; }

1 0

pd/src objective.tcl,1.1.2.19,1.1.2.20
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31964 Modified Files: Tag: devel_0_39 objective.tcl Log Message: added proc yell, for use with "trace add variable" on @ vars. Index: objective.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -C2 -d -r1.1.2.19 -r1.1.2.20 *** objective.tcl 31 Aug 2006 22:21:18 -0000 1.1.2.19 --- objective.tcl 2 Sep 2006 09:04:22 -0000 1.1.2.20 *************** *** 159,165 **** #-----------------------------------------------------------------------------------# ! proc VTgreen {} {return "\x1b\[0;1;32m"} ! proc VTred {} {return "\x1b\[0;1;31m"} ! proc VTgrey {} {return "\x1b\[0m"} proc error_dump {} { --- 159,166 ---- #-----------------------------------------------------------------------------------# ! proc VTgreen {} {return "\x1b\[0;1;32m"} ! proc VTred {} {return "\x1b\[0;1;31m"} ! proc VTyellow {} {return "\x1b\[0;1;33m"} ! proc VTgrey {} {return "\x1b\[0m"} proc error_dump {} { *************** *** 175,176 **** --- 176,182 ---- set __trace($class:$method) $when } + + proc yell {var key args} { + global _ $key + puts "[VTyellow]HEY! at [info level -1] set $key [list $_($key)][VTgrey]" + }

1 0

pd/src m_class.c, 1.3.4.7.2.19, 1.3.4.7.2.20 m_pd.h, 1.4.4.11.2.26, 1.4.4.11.2.27
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31352 Modified Files: Tag: devel_0_39 m_class.c m_pd.h Log Message: DesireData doesn't have t_widgetbehavior anymore. Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.26 retrieving revision 1.4.4.11.2.27 diff -C2 -d -r1.4.4.11.2.26 -r1.4.4.11.2.27 *** m_pd.h 31 Aug 2006 19:36:06 -0000 1.4.4.11.2.26 --- m_pd.h 2 Sep 2006 09:03:09 -0000 1.4.4.11.2.27 *************** *** 442,447 **** --- 442,449 ---- /* ---------------- widget behaviors ---------------------- */ + #ifndef DESIRE EXTERN_STRUCT _widgetbehavior; #define t_widgetbehavior struct _widgetbehavior + #endif EXTERN_STRUCT _parentwidgetbehavior; *************** *** 481,485 **** --- 483,489 ---- EXTERN void class_addanything(t_class *c, t_method fn); EXTERN void class_sethelpsymbol(t_class *c, t_symbol *s); + #ifndef DESIRE EXTERN void class_setwidget(t_class *c, t_widgetbehavior *w); + #endif EXTERN void class_setparentwidget(t_class *c, t_parentwidgetbehavior *w); EXTERN t_parentwidgetbehavior *class_parentwidget(t_class *c); Index: m_class.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_class.c,v retrieving revision 1.3.4.7.2.19 retrieving revision 1.3.4.7.2.20 diff -C2 -d -r1.3.4.7.2.19 -r1.3.4.7.2.20 *** m_class.c 31 Aug 2006 19:36:06 -0000 1.3.4.7.2.19 --- m_class.c 2 Sep 2006 09:03:09 -0000 1.3.4.7.2.20 *************** *** 162,166 **** --- 162,168 ---- how this is handled. */ + #ifndef DESIRE extern t_widgetbehavior text_widgetbehavior; + #endif extern void text_save(t_gobj *z, t_binbuf *b); *************** *** 235,239 **** --- 237,245 ---- c->c_listmethod = pd_defaultlist; c->c_anymethod = pd_defaultanything; + #ifdef DESIRE + c->c_wb = 0; + #else c->c_wb = (typeflag == CLASS_PATCHABLE ? &text_widgetbehavior : 0); + #endif c->c_pwb = 0; c->c_firstin = ((flags & CLASS_NOINLET) == 0); *************** *** 424,431 **** --- 430,439 ---- } + #ifndef DESIRE void class_setwidget(t_class *c, t_widgetbehavior *w) { c->c_wb = w; } + #endif void class_setparentwidget(t_class *c, t_parentwidgetbehavior *pw)

1 0

pd/src desire.c, 1.1.2.136, 1.1.2.137 desire.h, 1.1.2.12, 1.1.2.13
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30853 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: killing t_widgetbehavior. finally. Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -C2 -d -r1.1.2.12 -r1.1.2.13 *** desire.h 2 Sep 2006 08:13:32 -0000 1.1.2.12 --- desire.h 2 Sep 2006 09:01:40 -0000 1.1.2.13 *************** *** 274,287 **** /* Call this to get a gobj's bounding rectangle in pixels */ ! typedef void (*t_getrectfn)(t_gobj *x, struct _glist *glist, ! int *x1, int *y1, int *x2, int *y2); /* and this to displace a gobj: */ ! typedef void (*t_displacefn)(t_gobj *x, struct _glist *glist, int dx, int dy); /* change color to show selection: */ ! typedef void (*t_selectfn)(t_gobj *x, struct _glist *glist, int state); /* change appearance to show activation/deactivation: */ ! typedef void (*t_activatefn)(t_gobj *x, struct _glist *glist, int state); /* warn a gobj it's about to be deleted */ ! typedef void (*t_deletefn)(t_gobj *x, struct _glist *glist); /* making visible or invisible */ typedef void (*t_visfn)(t_gobj *x, struct _glist *glist, int flag); --- 274,287 ---- /* Call this to get a gobj's bounding rectangle in pixels */ ! /*typedef void (*t_getrectfn)(t_gobj *x, struct _glist *glist, ! int *x1, int *y1, int *x2, int *y2);*/ /* and this to displace a gobj: */ ! /*typedef void (*t_displacefn)(t_gobj *x, struct _glist *glist, int dx, int dy);*/ /* change color to show selection: */ ! /*typedef void (*t_selectfn)(t_gobj *x, struct _glist *glist, int state);*/ /* change appearance to show activation/deactivation: */ ! /*typedef void (*t_activatefn)(t_gobj *x, struct _glist *glist, int state);*/ /* warn a gobj it's about to be deleted */ ! /*typedef void (*t_deletefn)(t_gobj *x, struct _glist *glist);*/ /* making visible or invisible */ typedef void (*t_visfn)(t_gobj *x, struct _glist *glist, int flag); *************** *** 293,301 **** struct _widgetbehavior { ! t_getrectfn w_getrectfn; t_displacefn w_displacefn; t_selectfn w_selectfn; t_activatefn w_activatefn; ! t_deletefn w_deletefn; t_visfn w_visfn; t_clickfn w_clickfn; --- 293,301 ---- struct _widgetbehavior { ! /* t_getrectfn w_getrectfn; t_displacefn w_displacefn; t_selectfn w_selectfn; t_activatefn w_activatefn; ! t_deletefn w_deletefn;*/ t_visfn w_visfn; t_clickfn w_clickfn; *************** *** 374,379 **** EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); - */ EXTERN void gobj_delete(t_gobj *x, t_glist *owner); EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag); EXTERN int gobj_click(t_gobj *x, struct _glist *glist, --- 374,379 ---- EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_delete(t_gobj *x, t_glist *owner); + */ EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag); EXTERN int gobj_click(t_gobj *x, struct _glist *glist, Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.136 retrieving revision 1.1.2.137 diff -C2 -d -r1.1.2.136 -r1.1.2.137 *** desire.c 2 Sep 2006 08:13:32 -0000 1.1.2.136 --- desire.c 2 Sep 2006 09:01:39 -0000 1.1.2.137 *************** *** 1208,1213 **** for (g = gl->gl_list; g; g = g->g_next) { if (vis && g->g_pd == scalar_class) { ! if (action == 1) {if (glist_isvisible(gl)) gobj_vis(g, gl, 1);} ! else if (action == 2) {if (glist_isvisible(gl)) gobj_vis(g, gl, 0);} else scalar_redraw((t_scalar *)g, gl); } else if (g->g_pd == canvas_class) glist_redrawall((t_glist *)g, action); --- 1208,1213 ---- for (g = gl->gl_list; g; g = g->g_next) { if (vis && g->g_pd == scalar_class) { ! if (action == 1) {/*if (glist_isvisible(gl)) gobj_vis(g, gl, 1);*/} [...1471 lines suppressed...] t_text *x = (t_text *)z; --- 8151,8154 ---- *************** *** 8528,8534 **** } - /* this one is for everyone but "gatoms"; it's imposed in m_class.c */ - t_widgetbehavior text_widgetbehavior = {0, 0, 0, 0, text_delete, text_vis, 0}; - void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) { if (x->te_type == T_OBJECT) { --- 8205,8208 ---- *************** *** 9974,9978 **** class_addmethod3(c,canvas_saveto, "saveto","!"); - class_setwidget(c, &graph_widgetbehavior); class_addmethod3(c,graph_bounds,"bounds","ffff"); class_addmethod3(c,graph_xticks,"xticks","fff"); --- 9648,9651 ----

1 0

pd/src TODO,1.1.2.15,1.1.2.16
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30392 Modified Files: Tag: devel_0_39 TODO Log Message: . Index: TODO =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** TODO 30 Aug 2006 00:12:22 -0000 1.1.2.15 --- TODO 2 Sep 2006 09:00:38 -0000 1.1.2.16 *************** *** 12,48 **** SHOWSTOPPERS: ! [1] desiredata.goto10.org is down ! [2] [pd] problems <matju> in particular, i think that there's a problem with closing subpatches? <chun> yes and the rendering <chun> somehow a copy of [pd foo] box is also drawn on the subpatch canvas itself <chun> and things like hilite and hilite io and even moving got updated in the subpatch ! [3] GOP problems ! [3.1] Canvas doesn't distinguish itself from its window ! [3.2] there's no distinction between $@canvas and the canvas that things are really going to be drawn on ! [3.3] canvas properties is pretty broken ! [3.4] introduce coordinate recomputation in View xy ! [3.5] introduce cropping using 0.39's "red rectangle" ! [4] array/graph (0.39.B ?) ! [ ] ddrc: key Canvas missing [ ] right-click properties ! [m] sort thru old TODO list (0.37.B and 0.37.C) - [m] fix GDB connection problem - [m] fix test.pd graph segfault problem - [ ] protect the receive-pointer code (m_binbuf.c) using a t_hash [ ] kill canvas(file) [ ] kill canvas(directory) [ ] kill global canvas [ ] kill global tooltip variable ? ! [ ] complete the merging of b,f in click/motion/unclick ! [ ] change ddrc format: ! [ ] use nested lists ! [ ] keys should be local to a Class ! [ ] colours should be local... (in which way?) ! [ ] defaults should be a ddrc file in the same dir as desire.tk, instead of set key(...) ... [ ] easy to connect an object to itself by accident --- 12,41 ---- SHOWSTOPPERS: ! [ ] the "wire don't get carried over when textobject is update/reinited" bug ! [ ] [pd] problems <matju> in particular, i think that there's a problem with closing subpatches? <chun> yes and the rendering <chun> somehow a copy of [pd foo] box is also drawn on the subpatch canvas itself <chun> and things like hilite and hilite io and even moving got updated in the subpatch ! [ ] GOP problems ! [ ] Canvas doesn't distinguish itself from its window ! [ ] there's no distinction between $@canvas and the canvas that things are really going to be drawn on ! [ ] canvas properties is pretty broken ! [ ] introduce coordinate recomputation in View xy ! [ ] introduce cropping using 0.39's "red rectangle" ! [ ] array/graph (0.39.B ?) ! [ ] rename pd to pd-server, desire.tk to pd-client, add new program "pd" which would launch both [ ] ddrc: key Canvas missing [ ] right-click properties + [ ] desiredata.goto10.org is down ! OTHER: [m] sort thru old TODO list (0.37.B and 0.37.C) [ ] kill canvas(file) [ ] kill canvas(directory) [ ] kill global canvas [ ] kill global tooltip variable ? ! [ ] defaults should be a ddrc file in the same dir as desire.tk, instead of set key(...) ... [ ] easy to connect an object to itself by accident *************** *** 69,78 **** [m] pd_upload optimisation [m] differential upload engine - [m] file save [m] bang counter client: - [m] history undo/redo [h] font stuff [h] different wire types --- 62,69 ---- *************** *** 86,107 **** ---------------------------------------------------------------- 0.39.B or LATER ! 0.39.???: ! [ ] fix 64-bit arrays so that carmen gets a use for DD. ! [ ] carmen also needs strings (no symbol leakage) ! [ ] right-click on labels for translations. ! [ ] time to load city.pd and do Ctrl+A Ctrl+Right, using [times] from TclX: 3800-3900 before method cache 2950-3050 after method cache - bugs: - - 07:24 <matju> however we could make it different by inserting the splashscreen inside the main window - 07:25 <matju> or we could make it a separate window but no timer, just an [OK] button, so actually, this would be - exactly the same as the "About" dialog. - - ======= - - LATER: - [ ] solve printing problems with GDB. use a pty (pseudo-teletype) ---> http://wiki.tcl.tk/3916 [ ] PureUnity test suite should help ensuring all branches of pd are --- 77,90 ---- ---------------------------------------------------------------- 0.39.B or LATER ! [ ] implement "Find", "Find Next" ! [ ] implement "Find Last Error" ! [ ] protect the receive-pointer code (m_binbuf.c) using a t_hash ! [ ] fix 64-bit arrays so that carmen gets a use for DD. ! [ ] carmen also needs strings (no symbol leakage) ! [ ] right-click on labels for translations. ! [ ] time to load city.pd and do Ctrl+A Ctrl+Right, using [times] from TclX: 3800-3900 before method cache 2950-3050 after method cache [ ] solve printing problems with GDB. use a pty (pseudo-teletype) ---> http://wiki.tcl.tk/3916 [ ] PureUnity test suite should help ensuring all branches of pd are *************** *** 113,121 **** [ ] find out why sticking with tcl (by figuring out that other languages might not be so much better) ! ------------------8<--------cut-here--------8<------------------ ! Old TODO list (should be cleaned and merged with the new ones) * <numberat> is there a way to make non-gui objects appear on a GOP? - * multilingual Tk labels & menus * multilingual labels in objects * multilingual comments --- 96,108 ---- [ ] find out why sticking with tcl (by figuring out that other languages might not be so much better) ! 07:24 <matju> however we could make it different by inserting the splashscreen inside the main window ! 07:25 <matju> or we could make it a separate window but no timer, just an [OK] button, so actually, this would be ! exactly the same as the "About" dialog. + * objectbox argument completion + * messagebox completion + * tooltips on arguments/inlets/outlets + * colorised console with hyperlinked error messages * <numberat> is there a way to make non-gui objects appear on a GOP? * multilingual labels in objects * multilingual comments *************** *** 144,150 **** * better reporting of errors in .pdrc * examine licensing / legal stuff - * <dpro> matju: and I still get segfaults if I use -console nn - <dpro> matju: it only happens when I load cyclone or hammer or sickle - <dpro> matju: and it happens when I load -lib sdjsddsd (i.e. some nonexistent thing) * Bug: bad quoting in sys_mgui() * Bug: Control key is fucked on OSX --- 131,134 ---- *************** *** 153,159 **** * bang flash delays should be reimplemented * pdrc_options radio don't load/save - - 0.37.C: - <MiS> sys_vgui: buffer overflow <MiS> matju: may I request a little cosmetic fix. In the "Open" dialog window, I have always found it annoying that all dot directories show up. I'd prefer this to be an option so that I get to scroll less... --- 137,140 ---- *************** *** 171,175 **** * newlines have problems in comments, msgboxes, objectboxes. * make better C<->Tcl layer (to allow \{ \} \\ spaces newlines etc) - * multiple undo <scuntz> matju, could you add an inlet inspector? that goes in the bottom of the window <scuntz> so when you mouseover, it shows you the data types, and what the inlet is expecting --- 152,155 ---- *************** *** 297,301 **** but maybe someone has an idea for that. - [ ] command for unpatcherizing a subpatch or abstraction (useful for making variants) --- 277,280 ---- *************** *** 374,375 **** --- 353,375 ---- <tclguy> or get a combobox from BWidget or tile + 610914 ::TextBox_update_size + 798337 ::update_object + 967368 ::Box_draw_io2 + 1009708 ::poll_sock + 1142075 ::Box_draw_io + 1366807 ::TextBox_draw + 1432429 ::View_look + 2657675 ::ObjectBox_draw + 2705110 ::Manager_call + + 422342 ::ObjectBox_init + 459322 ::ObjectBox_new_as + 634522 ::TextBox_update_size + 953889 ::Box_draw_io2 + 1118041 ::Box_draw_io + 1325440 ::TextBox_draw + 1414138 ::View_look + 2160154 ::update_object + 2390708 ::poll_sock + 2593914 ::ObjectBox_draw + 2618012 ::Manager_call

1 0

pd/src defaults.ddrc,1.1.2.3,1.1.2.4
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30032 Modified Files: Tag: devel_0_39 defaults.ddrc Log Message: moving some defaults from View to Box Index: defaults.ddrc =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/defaults.ddrc,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** defaults.ddrc 30 Aug 2006 13:32:13 -0000 1.1.2.3 --- defaults.ddrc 2 Sep 2006 09:00:09 -0000 1.1.2.4 *************** *** 47,57 **** frame2 #668888 frame3 #000000 ! inletfg #ff0000 ! iopos 0 iowidth 7 minobjwidth 21 outletfg #ff0000 ! selectframe #0080ff ! tooltip 1 } Wire { --- 47,59 ---- frame2 #668888 frame3 #000000 ! selectframe #0080ff ! tooltip 1 ! } ! Box { iowidth 7 minobjwidth 21 + inletfg #ff0000 outletfg #ff0000 ! iopos 0 } Wire {

1 0

pd/src desire.c, 1.1.2.135, 1.1.2.136 desire.h, 1.1.2.11, 1.1.2.12
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8955 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: removed gobj_select, gobj_activate, canvas_startmotion. Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** desire.h 2 Sep 2006 08:08:25 -0000 1.1.2.11 --- desire.h 2 Sep 2006 08:13:32 -0000 1.1.2.12 *************** *** 372,378 **** int *x2, int *y2); EXTERN void gobj_displace(t_gobj *x, t_glist *owner, int dx, int dy); - */ EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_delete(t_gobj *x, t_glist *owner); EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag); --- 372,378 ---- int *x2, int *y2); EXTERN void gobj_displace(t_gobj *x, t_glist *owner, int dx, int dy); EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); + */ EXTERN void gobj_delete(t_gobj *x, t_glist *owner); EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag); Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.135 retrieving revision 1.1.2.136 diff -C2 -d -r1.1.2.135 -r1.1.2.136 *** desire.c 2 Sep 2006 08:08:24 -0000 1.1.2.135 --- desire.c 2 Sep 2006 08:13:32 -0000 1.1.2.136 *************** *** 686,691 **** if (!x->gl_havewindow) {bug("canvas_map"); canvas_vis(x,1);} glist_each(y,x) gobj_changed(y,0); - /*for (sel = x->gl_editor->e_selection; sel; sel = sel->sel_next) - gobj_select(sel->sel_what, x, 1);*/ x->gl_mapped = 1; canvas_drawlines(x); --- 686,689 ---- *************** *** 1256,1269 **** /* ---------------- generic widget behavior ------------------------- */ - void gobj_select(t_gobj *x, t_glist *glist, int state) { - t_widgetbehavior *w = x->g_pd->c_wb; - if (w && w->w_selectfn) w->w_selectfn(x, glist, state); - } - - void gobj_activate(t_gobj *x, t_glist *glist, int state) { - t_widgetbehavior *w = x->g_pd->c_wb; - if (w && w->w_activatefn) w->w_activatefn(x, glist, state); - } - void gobj_delete(t_gobj *x, t_glist *glist) { t_widgetbehavior *w = x->g_pd->c_wb; --- 1254,1257 ---- *************** *** 1489,1512 **** while ((oc = linetraverser_next(&t))) if (t.tr_ob == ob1 && t.tr_outno == n1 && ! t.tr_ob2 == ob2 && t.tr_inno == n2) ! return (1); ! return (0); ! } ! ! /*DIE*/ ! void canvas_startmotion(t_canvas *x) ! { ! int xval, yval; ! if (!x->gl_editor) return; ! glist_getnextxy(x, &xval, &yval); ! if (xval == 0 && yval == 0) return; ! x->gl_editor->e_xwas = xval; ! x->gl_editor->e_ywas = yval; } /* ----------------------------- window stuff ----------------------- */ ! void canvas_print(t_canvas *x, t_symbol *s) ! { sys_vgui(".x%lx.c postscript -file %s\n", (long)x, *s->s_name ? s->s_name : "x.ps"); } --- 1477,1488 ---- while ((oc = linetraverser_next(&t))) if (t.tr_ob == ob1 && t.tr_outno == n1 && ! t.tr_ob2 == ob2 && t.tr_inno == n2) ! return 1; ! return 0; } /* ----------------------------- window stuff ----------------------- */ ! void canvas_print(t_canvas *x, t_symbol *s) { sys_vgui(".x%lx.c postscript -file %s\n", (long)x, *s->s_name ? s->s_name : "x.ps"); } *************** *** 3476,3490 **** } - static void graph_select(t_gobj *z, t_glist *glist, int state) { - t_glist *x = (t_glist *)z; - if (!x->gl_isgraph) text_widgetbehavior.w_selectfn(z, glist, state); - } - - static void graph_activate(t_gobj *z, t_glist *glist, int state) { - t_glist *x = (t_glist *)z; - if (canvas_showtext(x)) - text_widgetbehavior.w_activatefn(z, glist, state); - } - static void graph_delete(t_gobj *z, t_glist *glist) { --- 3452,3455 ---- *************** *** 3563,3569 **** } ! t_widgetbehavior graph_widgetbehavior = {0,0, ! graph_select, ! graph_activate, graph_delete, graph_vis, --- 3528,3532 ---- } ! t_widgetbehavior graph_widgetbehavior = {0,0,0,0, graph_delete, graph_vis, *************** *** 8103,8107 **** static void text_vis(t_gobj *z, t_glist *glist, int vis); - void canvas_startmotion(t_canvas *x); extern t_widgetbehavior text_widgetbehavior; void pd_upload(t_gobj *self); --- 8066,8069 ---- *************** *** 8131,8135 **** binbuf_restore(x->te_binbuf, 1, &at); glist_add(gl, &x->te_g); - canvas_startmotion(glist_getcanvas(gl)); } } --- 8093,8096 ---- *************** *** 8161,8165 **** x->te_type = T_OBJECT; glist_add(gl, &x->te_g); - if (selected) gobj_activate(&x->te_g, gl, 1); if (pd_class(&x->ob_pd) == vinlet_class) canvas_resortinlets(glist_getcanvas(gl)); if (pd_class(&x->ob_pd) == voutlet_class) canvas_resortoutlets(glist_getcanvas(gl)); --- 8122,8125 ---- *************** *** 8178,8182 **** glist_getnextxy(gl, &xpix, &ypix); canvas_objtext(gl, xpix, ypix, 1, b); - canvas_startmotion(glist_getcanvas(gl)); } } --- 8138,8141 ---- *************** *** 8191,8195 **** glist_getnextxy(gl, &xpix, &ypix); canvas_objtext(gl, xpix, ypix, 1, b); - canvas_startmotion(glist_getcanvas(gl)); } --- 8150,8153 ---- *************** *** 8315,8320 **** x->m_text.te_ypix = ypix-3; glist_add(gl, &x->m_text.te_g); - gobj_activate(&x->m_text.te_g, gl, 1); - canvas_startmotion(glist_getcanvas(gl)); } } --- 8273,8276 ---- *************** *** 8496,8500 **** x->a_text.te_ypix = ypix; glist_add(gl, &x->a_text.te_g); - canvas_startmotion(glist_getcanvas(gl)); } } --- 8452,8455 ---- *************** *** 8510,8515 **** } - static void text_select(t_gobj *z, t_glist *glist, int state) {} - static void text_activate(t_gobj *z, t_glist *glist, int state) {} static void text_delete(t_gobj *z, t_glist *glist) {sys_mgui(z,"delete","");} --- 8465,8468 ---- *************** *** 8576,8580 **** /* this one is for everyone but "gatoms"; it's imposed in m_class.c */ ! t_widgetbehavior text_widgetbehavior = {0, 0, text_select, text_activate, text_delete, text_vis, 0}; void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) { --- 8529,8533 ---- /* this one is for everyone but "gatoms"; it's imposed in m_class.c */ ! t_widgetbehavior text_widgetbehavior = {0, 0, 0, 0, text_delete, text_vis, 0}; void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) {

1 0

pd/src desire.c, 1.1.2.134, 1.1.2.135 desire.h, 1.1.2.10, 1.1.2.11
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6662 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: removing gobj_displace and stuff. Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** desire.h 2 Sep 2006 07:23:13 -0000 1.1.2.10 --- desire.h 2 Sep 2006 08:08:25 -0000 1.1.2.11 *************** *** 371,376 **** EXTERN void gobj_getrect(t_gobj *x, t_glist *owner, int *x1, int *y1, int *x2, int *y2); - */ EXTERN void gobj_displace(t_gobj *x, t_glist *owner, int dx, int dy); EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); --- 371,376 ---- EXTERN void gobj_getrect(t_gobj *x, t_glist *owner, int *x1, int *y1, int *x2, int *y2); EXTERN void gobj_displace(t_gobj *x, t_glist *owner, int dx, int dy); + */ EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.134 retrieving revision 1.1.2.135 diff -C2 -d -r1.1.2.134 -r1.1.2.135 *** desire.c 2 Sep 2006 07:23:12 -0000 1.1.2.134 --- desire.c 2 Sep 2006 08:08:24 -0000 1.1.2.135 *************** *** 638,642 **** { int heightwas = y2 - y1; - int heightchange = y2 - y1 - (x->gl_screeny2 - x->gl_screeny1); if (x->gl_screenx1 == x1 && x->gl_screeny1 == y1 && x->gl_screenx2 == x2 && x->gl_screeny2 == y2) --- 638,641 ---- *************** *** 652,663 **** parent. */ float diff = x->gl_y1 - x->gl_y2; - t_gobj *y; x->gl_y1 = heightwas * diff; x->gl_y2 = x->gl_y1 - diff; - /* and move text objects accordingly; they should stick - to the bottom, not the top. */ - for (y = x->gl_list; y; y = y->g_next) - if (pd_checkobject(&y->g_pd)) - gobj_displace(y, x, 0, heightchange); canvas_redraw(x); } --- 651,656 ---- *************** *** 990,995 **** we just suppress that here. */ if (cw > 5 && ch > 5) ! canvas_setbounds(x, txpix, typix, ! txpix + cw - HORIZBORDER, typix + ch - VERTBORDER); } --- 983,987 ---- we just suppress that here. */ if (cw > 5 && ch > 5) ! canvas_setbounds(x, txpix, typix, txpix + cw - HORIZBORDER, typix + ch - VERTBORDER); } *************** *** 1264,1272 **** /* ---------------- generic widget behavior ------------------------- */ - void gobj_displace(t_gobj *x, t_glist *glist, int dx, int dy) { - t_widgetbehavior *w = x->g_pd->c_wb; - if (w && w->w_displacefn) w->w_displacefn(x, glist, dx, dy); - } - void gobj_select(t_gobj *x, t_glist *glist, int state) { t_widgetbehavior *w = x->g_pd->c_wb; --- 1256,1259 ---- *************** *** 2506,2514 **** /* -------------------- widget behavior for garray ------------ */ - static void garray_displace(t_gobj *z, t_glist *glist, int dx, int dy) {} - static void garray_select(t_gobj *z, t_glist *glist, int state) {} - static void garray_activate(t_gobj *z, t_glist *glist, int state) {} - static void garray_delete(t_gobj *z, t_glist *glist) {} - static void garray_vis(t_gobj *z, t_glist *glist, int vis) { t_garray *x = (t_garray *)z; --- 2493,2496 ---- *************** *** 2524,2538 **** #define ARRAYWRITECHUNKSIZE 1000 ! static void garray_save(t_gobj *z, t_binbuf *b) ! { int style, filestyle; t_garray *x = (t_garray *)z; t_array *array = garray_getarray(x); t_template *scalartemplate; ! if (x->x_scalar->sc_template != gensym("pd-_float_array")) ! { ! /* LATER "save" the scalar as such */ ! pd_error(x, "can't save arrays of type %s yet", ! x->x_scalar->sc_template->s_name); return; } --- 2506,2517 ---- #define ARRAYWRITECHUNKSIZE 1000 ! static void garray_save(t_gobj *z, t_binbuf *b) { int style, filestyle; t_garray *x = (t_garray *)z; t_array *array = garray_getarray(x); t_template *scalartemplate; ! if (x->x_scalar->sc_template != gensym("pd-_float_array")) { ! /* LATER "save" the scalar as such */ ! pd_error(x, "can't save arrays of type %s yet", x->x_scalar->sc_template->s_name); return; } *************** *** 2541,2548 **** return; } ! style = template_getfloat(scalartemplate, gensym("style"), ! x->x_scalar->sc_vec, 0); ! filestyle = (style == PLOTSTYLE_POINTS ? 1 : ! (style == PLOTSTYLE_POLY ? 0 : style)); binbuf_addv(b, "sssisi;", gensym("#X"), gensym("array"), x->x_name, array->a_n, &s_float, x->x_saveit + 2 * filestyle); --- 2520,2525 ---- return; } ! style = template_getfloat(scalartemplate, gensym("style"), x->x_scalar->sc_vec, 0); ! filestyle = (style == PLOTSTYLE_POINTS ? 1 : (style == PLOTSTYLE_POLY ? 0 : style)); binbuf_addv(b, "sssisi;", gensym("#X"), gensym("array"), x->x_name, array->a_n, &s_float, x->x_saveit + 2 * filestyle); *************** *** 2562,2575 **** } ! t_widgetbehavior garray_widgetbehavior = ! { ! 0, ! garray_displace, ! garray_select, ! garray_activate, ! garray_delete, ! garray_vis, ! garray_click, ! }; /* ----------------------- public functions -------------------- */ --- 2539,2543 ---- } ! t_widgetbehavior garray_widgetbehavior = {0, 0, 0, 0, 0, garray_vis, garray_click}; /* ----------------------- public functions -------------------- */ *************** *** 3508,3521 **** } - static void graph_displace(t_gobj *z, t_glist *glist, int dx, int dy) { - t_glist *x = (t_glist *)z; - if (!x->gl_isgraph) text_widgetbehavior.w_displacefn(z, glist, dx, dy); - else { - x->gl_obj.te_xpix += dx; - x->gl_obj.te_ypix += dy; - glist_redraw(x); - } - } - static void graph_select(t_gobj *z, t_glist *glist, int state) { t_glist *x = (t_glist *)z; --- 3476,3479 ---- *************** *** 3605,3612 **** } ! t_widgetbehavior graph_widgetbehavior = ! { ! 0, ! graph_displace, graph_select, graph_activate, --- 3563,3567 ---- } ! t_widgetbehavior graph_widgetbehavior = {0,0, graph_select, graph_activate, *************** *** 8147,8151 **** static t_class *gatom_class; static void text_vis(t_gobj *z, t_glist *glist, int vis); - static void text_displace(t_gobj *z, t_glist *glist, int dx, int dy); void canvas_startmotion(t_canvas *x); --- 8102,8105 ---- *************** *** 8556,8566 **** } - static void text_displace(t_gobj *z, t_glist *glist, int dx, int dy) { - t_text *x = (t_text *)z; - x->te_xpix += dx; - x->te_ypix += dy; - /* assuming we got that command from desire.tk; then we don't have to actually - move anything because the GUI does that for us. */ - } static void text_select(t_gobj *z, t_glist *glist, int state) {} static void text_activate(t_gobj *z, t_glist *glist, int state) {} --- 8510,8513 ---- *************** *** 8629,8635 **** /* this one is for everyone but "gatoms"; it's imposed in m_class.c */ ! t_widgetbehavior text_widgetbehavior = { ! 0, text_displace, text_select, text_activate, text_delete, text_vis, 0, ! }; void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) { --- 8576,8580 ---- /* this one is for everyone but "gatoms"; it's imposed in m_class.c */ ! t_widgetbehavior text_widgetbehavior = {0, 0, text_select, text_activate, text_delete, text_vis, 0}; void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) {

1 0

pd/src desire.c, 1.1.2.133, 1.1.2.134 desire.h, 1.1.2.9, 1.1.2.10
by Mathieu Bouchard 02 Sep '06

02 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20057 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: removed gobj_getrect and stuff. Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** desire.h 2 Sep 2006 06:44:55 -0000 1.1.2.9 --- desire.h 2 Sep 2006 07:23:13 -0000 1.1.2.10 *************** *** 368,373 **** --- 368,375 ---- /* ------------------- functions on any gobj ----------------------------- */ + /* EXTERN void gobj_getrect(t_gobj *x, t_glist *owner, int *x1, int *y1, int *x2, int *y2); + */ EXTERN void gobj_displace(t_gobj *x, t_glist *owner, int dx, int dy); EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); *************** *** 484,488 **** --- 486,492 ---- EXTERN void canvas_resortoutlets(t_canvas *x); EXTERN void canvas_free(t_canvas *x); + /* EXTERN void canvas_updatewindowlist( void); + */ EXTERN void canvas_editmode(t_canvas *x, t_floatarg yesplease); EXTERN int canvas_isabstraction(t_canvas *x); *************** *** 493,498 **** --- 497,504 ---- EXTERN void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir); EXTERN void canvas_loadbang(t_canvas *x); + /* EXTERN int canvas_hitbox(t_canvas *x, t_gobj *y, int xpos, int ypos, int *x1p, int *y1p, int *x2p, int *y2p); + */ EXTERN int canvas_setdeleting(t_canvas *x, int flag); EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.133 retrieving revision 1.1.2.134 diff -C2 -d -r1.1.2.133 -r1.1.2.134 *** desire.c 2 Sep 2006 07:11:32 -0000 1.1.2.133 --- desire.c 2 Sep 2006 07:23:12 -0000 1.1.2.134 *************** *** 1264,1272 **** /* ---------------- generic widget behavior ------------------------- */ - void gobj_getrect(t_gobj *x, t_glist *glist, int *x1, int *y1, int *x2, int *y2) { - t_widgetbehavior *w = x->g_pd->c_wb; - if (w && w->w_getrectfn) w->w_getrectfn(x, glist, x1, y1, x2, y2); - } - void gobj_displace(t_gobj *x, t_glist *glist, int dx, int dy) { t_widgetbehavior *w = x->g_pd->c_wb; --- 1264,1267 ---- *************** *** 2509,2558 **** } - /* - static void array_getrect(t_array *array, t_glist *glist, - int *xp1, int *yp1, int *xp2, int *yp2) - { - float x1 = 0x7fffffff, y1 = 0x7fffffff, x2 = -0x7fffffff, y2 = -0x7fffffff; - t_canvas *elemtemplatecanvas; - t_template *elemtemplate; - int elemsize, yonset, wonset, xonset, i; - - if (!array_getfields(array->a_templatesym, &elemtemplatecanvas, - &elemtemplate, &elemsize, 0, 0, 0, &xonset, &yonset, &wonset)) - { - int incr; - // if it has more than 2000 points, just check 300 of them. - if (array->a_n < 2000) - incr = 1; - else incr = array->a_n / 300; - for (i = 0; i < array->a_n; i += incr) - { - float pxpix, pypix, pwpix; - array_getcoordinate(glist, (char *)(array->a_vec) + - i * elemsize, - xonset, yonset, wonset, i, 0, 0, 1, - 0, 0, 0, - &pxpix, &pypix, &pwpix); - if (pwpix < 2) pwpix = 2; - if (pxpix < x1) x1 = pxpix; - if (pxpix > x2) x2 = pxpix; - if (pypix - pwpix < y1) y1 = pypix - pwpix; - if (pypix + pwpix > y2) y2 = pypix + pwpix; - } - } - *xp1 = x1; - *yp1 = y1; - *xp2 = x2; - *yp2 = y2; - } - */ - /* -------------------- widget behavior for garray ------------ */ - static void garray_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) { - t_garray *x = (t_garray *)z; - gobj_getrect(&x->x_scalar->sc_gobj, glist, xp1, yp1, xp2, yp2); - } - static void garray_displace(t_gobj *z, t_glist *glist, int dx, int dy) {} static void garray_select(t_gobj *z, t_glist *glist, int state) {} --- 2504,2509 ---- *************** *** 2613,2617 **** t_widgetbehavior garray_widgetbehavior = { ! garray_getrect, garray_displace, garray_select, --- 2564,2568 ---- t_widgetbehavior garray_widgetbehavior = { ! 0, garray_displace, garray_select, *************** *** 2959,2963 **** static void graph_vis(t_gobj *gr, t_glist *unused_glist, int vis); static void graph_graphrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2); - static void graph_getrect (t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2); void canvas_drawredrect(t_canvas *x, int doit); --- 2910,2913 ---- *************** *** 3201,3209 **** t_inlet *ip; for (vp = vec, xmax = -0x7fffffff, maxp = 0, j = ninlets; j--; vp++) { ! int x1, y1, x2, y2; t_gobj *g = *vp; if (!g) continue; ! gobj_getrect(g, x, &x1, &y1, &x2, &y2); ! if (x1 > xmax) xmax = x1, maxp = vp; } if (!maxp) break; --- 3151,3159 ---- t_inlet *ip; for (vp = vec, xmax = -0x7fffffff, maxp = 0, j = ninlets; j--; vp++) { ! int x1; t_gobj *g = *vp; if (!g) continue; ! x1 = ((t_text *)g)->te_xpix; ! if (x1 > xmax) {xmax = x1; maxp = vp;} } if (!maxp) break; *************** *** 3250,3257 **** t_outlet *ip; for (vp = vec, xmax = -0x7fffffff, maxp = 0, j = noutlets; j--; vp++) { ! int x1, y1, x2, y2; t_gobj *g = *vp; if (!g) continue; ! gobj_getrect(g, x, &x1, &y1, &x2, &y2); if (x1 > xmax) xmax = x1, maxp = vp; } --- 3200,3207 ---- t_outlet *ip; for (vp = vec, xmax = -0x7fffffff, maxp = 0, j = noutlets; j--; vp++) { ! int x1; t_gobj *g = *vp; if (!g) continue; ! x1 = ((t_text *)g)->te_xpix; if (x1 > xmax) xmax = x1, maxp = vp; } *************** *** 3441,3445 **** /*if (vis && canvas_showtext(x)) rtext_draw(glist_findrtext(parent_glist, &x->gl_obj));*/ ! graph_getrect(gr, parent_glist, &x1, &y1, &x2, &y2); /*if (!vis) rtext_erase(glist_findrtext(parent_glist, &x->gl_obj));*/ --- 3391,3397 ---- /*if (vis && canvas_showtext(x)) rtext_draw(glist_findrtext(parent_glist, &x->gl_obj));*/ ! x1=y1=69; ! x2=y2=242; ! /*graph_getrect(gr, parent_glist, &x1, &y1, &x2, &y2);*/ /*if (!vis) rtext_erase(glist_findrtext(parent_glist, &x->gl_obj));*/ *************** *** 3556,3613 **** } - /* get the rectangle, enlarged to contain all the "contents" -- - meaning their formal bounds rectangles. */ - static void graph_getrect(t_gobj *z, t_glist *glist, - int *xp1, int *yp1, int *xp2, int *yp2) - { - int x1 = 0x7fffffff, y1 = 0x7fffffff, x2 = -0x7fffffff, y2 = -0x7fffffff; - t_glist *x = (t_glist *)z; - if (x->gl_isgraph) - { - int hadwindow; - t_gobj *g; - t_text *ob; - int x21, y21, x22, y22; - - graph_graphrect(z, glist, &x1, &y1, &x2, &y2); - if (canvas_showtext(x)) - { - text_widgetbehavior.w_getrectfn(z, glist, &x21, &y21, &x22, &y22); - if (x22 > x2) - x2 = x22; - if (y22 > y2) - y2 = y22; - } - if (!x->gl_goprect) - { - /* expand the rectangle to fit in text objects; this applies only - to the old (0.37) graph-on-parent behavior. */ - /* lie about whether we have our own window to affect gobj_getrect - calls below. */ - hadwindow = x->gl_havewindow; - x->gl_havewindow = 0; - for (g = x->gl_list; g; g = g->g_next) - if ((!(ob = pd_checkobject(&g->g_pd))) || text_shouldvis(ob, x)) - { - /* don't do this for arrays, just let them hang outside the - box. */ - if (pd_class(&g->g_pd) == garray_class) - continue; - gobj_getrect(g, x, &x21, &y21, &x22, &y22); - if (x22 > x2) - x2 = x22; - if (y22 > y2) - y2 = y22; - } - x->gl_havewindow = hadwindow; - } - } - else text_widgetbehavior.w_getrectfn(z, glist, &x1, &y1, &x2, &y2); - *xp1 = x1; - *yp1 = y1; - *xp2 = x2; - *yp2 = y2; - } - static void graph_displace(t_gobj *z, t_glist *glist, int dx, int dy) { t_glist *x = (t_glist *)z; --- 3508,3511 ---- *************** *** 3709,3713 **** t_widgetbehavior graph_widgetbehavior = { ! graph_getrect, graph_displace, graph_select, --- 3607,3611 ---- t_widgetbehavior graph_widgetbehavior = { ! 0, graph_displace, graph_select, *************** *** 8230,8234 **** int pd_pickle(t_foo *foo, char *fmt, ...); int pd_savehead(t_binbuf *b, void /*t_iemgui*/ *x, char *name); - void iemgui_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2); #ifdef MSW --- 8128,8131 ---- *************** *** 8251,8255 **** static void text_vis(t_gobj *z, t_glist *glist, int vis); static void text_displace(t_gobj *z, t_glist *glist, int dx, int dy); - static void text_getrect (t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2); void canvas_startmotion(t_canvas *x); --- 8148,8151 ---- *************** *** 8660,8667 **** } - static void text_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) { - *xp1 = *yp1 = *xp2 = *yp2 = 42; /* desire */ - } - static void text_displace(t_gobj *z, t_glist *glist, int dx, int dy) { t_text *x = (t_text *)z; --- 8556,8559 ---- *************** *** 8738,8743 **** /* this one is for everyone but "gatoms"; it's imposed in m_class.c */ t_widgetbehavior text_widgetbehavior = { ! text_getrect, text_displace, text_select, ! text_activate, text_delete, text_vis, 0, }; --- 8630,8634 ---- /* this one is for everyone but "gatoms"; it's imposed in m_class.c */ t_widgetbehavior text_widgetbehavior = { ! 0, text_displace, text_select, text_activate, text_delete, text_vis, 0, };

1 0

← Newer
1
...
27
28
29
30
31
32
33
34
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs September 2006