Pd-cvs September 2006

pd-cvs@lists.iem.at

19 participants
346 discussions

pd/src desire.tk,1.1.2.452,1.1.2.453
by Mathieu Bouchard 03 Sep '06

03 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28144 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed bug in GAtomProperties (swapping of send/receive symbols) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.452 retrieving revision 1.1.2.453 diff -C2 -d -r1.1.2.452 -r1.1.2.453 *** desire.tk 2 Sep 2006 04:10:00 -0000 1.1.2.452 --- desire.tk 3 Sep 2006 16:46:22 -0000 1.1.2.453 *************** *** 1798,1806 **** } - def ObjectBox unedit {} { - super - $self erase ;# (why?) - } - #-----------------------------------------------------------------------------------# def Canvas name= {name} {set @name $name ; $self update_title} --- 1798,1801 ---- *************** *** 2245,2249 **** def Canvas cut {} { ! $@history atomically "Cut" { $self copy $self delete_selection --- 2240,2244 ---- def Canvas cut {} { ! $@history atomically [list cut] { $self copy $self delete_selection *************** *** 3182,3187 **** set fields(vdl) $fields(hradio) set fields(coords) {foo bar xfrom yfrom xto yto w h gop x1 y1} ;# goes with #N canvas ! set fields(floatatom) {foo bar x1 y1 w min max pos lab snd rcv} ! set fields(symbolatom) {foo bar x1 y1 w min max pos lab snd rcv} set fields(array) {name n elemtype flags} --- 3177,3182 ---- set fields(vdl) $fields(hradio) set fields(coords) {foo bar xfrom yfrom xto yto w h gop x1 y1} ;# goes with #N canvas ! set fields(floatatom) {foo bar x1 y1 w min max pos lab rcv snd} ! set fields(symbolatom) {foo bar x1 y1 w min max pos lab rcv snd} set fields(array) {name n elemtype flags} *************** *** 3525,3528 **** --- 3520,3532 ---- } + class_new WirePropertiesDialog {PropertiesDialog} + def Box popup_properties {} {WirePropertiesDialog new $self} + def WirePropertiesDialog init {of} { + super $of + wm title .$self "Wire Properties" + pack [label .$self.huh -text "huh..."] + pack [label .$self.huh2 -text "this is where some #V properties should go"] + } + class_new GAtomPropertiesDialog {PropertiesDialog} *************** *** 3536,3540 **** super $of foreach var {w min max pos} {set @$var $_($of:$var)} ! foreach var {lab snd rcv} {set @$var [gatom_unescape $_($of:$var)]} wm title .$self "Atom" global properties --- 3540,3544 ---- super $of foreach var {w min max pos} {set @$var $_($of:$var)} ! foreach var {lab rcv snd} {set @$var [gatom_unescape $_($of:$var)]} wm title .$self "Atom" global properties *************** *** 6003,6010 **** def FontBombDialog init {} { - global font super cancel ok set f .$self ! $self add_fontbomb $f foo } ############ other stuff ######### --- 6007,6013 ---- def FontBombDialog init {} { super cancel ok set f .$self ! $self add_fontbomb $f foo } ############ other stuff #########

1 0

packages/darwin_app org.puredata.pd.plist,1.16,1.17
by Hans-Christoph Steiner 03 Sep '06

03 Sep '06

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv664 Modified Files: org.puredata.pd.plist Log Message: added flatspace and deprecated Index: org.puredata.pd.plist =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/org.puredata.pd.plist,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** org.puredata.pd.plist 27 Apr 2006 11:49:14 -0000 1.16 --- org.puredata.pd.plist 3 Sep 2006 09:28:43 -0000 1.17 *************** *** 6,66 **** <string>0</string> <key>loadlib1</key> - <string>Gem</string> - <key>loadlib2</key> <string>cyclone</string> ! <key>loadlib3</key> <string>zexy</string> ! <key>loadlib4</key> <string>creb</string> ! <key>loadlib5</key> <string>cxc</string> ! <key>loadlib6</key> <string>ext13</string> ! <key>loadlib7</key> <string>iemlib</string> <key>loadlib8</key> ! <string>iemmatrix</string> <key>loadlib9</key> ! <string>list-abs</string> <key>loadlib10</key> ! <string>mapping</string> <key>loadlib11</key> ! <string>markex</string> <key>loadlib12</key> ! <string>maxlib</string> <key>loadlib13</key> ! <string>memento</string> <key>loadlib14</key> ! <string>mjlib</string> <key>loadlib15</key> ! <string>motex</string> <key>loadlib16</key> ! <string>mtx</string> <key>loadlib17</key> ! <string>oscx</string> <key>loadlib18</key> ! <string>pddp</string> <key>loadlib19</key> ! <string>pdogg</string> <key>loadlib20</key> ! <string>pdp</string> <key>loadlib21</key> ! <string>pidip</string> <key>loadlib22</key> ! <string>pixeltango</string> <key>loadlib23</key> ! <string>pmpd</string> <key>loadlib24</key> ! <string>rradical</string> <key>loadlib25</key> ! <string>sigpack</string> <key>loadlib26</key> ! <string>smlib</string> <key>loadlib27</key> ! <string>toxy</string> <key>loadlib28</key> ! <string>unauthorized</string> <key>loadlib29</key> ! <string>vbap</string> <key>path1</key> <string>/System/Library/Fonts</string> --- 6,68 ---- <string>0</string> <key>loadlib1</key> <string>cyclone</string> ! <key>loadlib2</key> <string>zexy</string> ! <key>loadlib3</key> <string>creb</string> ! <key>loadlib4</key> <string>cxc</string> ! <key>loadlib5</key> <string>ext13</string> ! <key>loadlib6</key> <string>iemlib</string> + <key>loadlib7</key> + <string>list-abs</string> <key>loadlib8</key> ! <string>mapping</string> <key>loadlib9</key> ! <string>markex</string> <key>loadlib10</key> ! <string>maxlib</string> <key>loadlib11</key> ! <string>memento</string> <key>loadlib12</key> ! <string>mjlib</string> <key>loadlib13</key> ! <string>motex</string> <key>loadlib14</key> ! <string>oscx</string> <key>loadlib15</key> ! <string>pddp</string> <key>loadlib16</key> ! <string>pdogg</string> <key>loadlib17</key> ! <string>pixeltango</string> <key>loadlib18</key> ! <string>pmpd</string> <key>loadlib19</key> ! <string>rradical</string> <key>loadlib20</key> ! <string>sigpack</string> <key>loadlib21</key> ! <string>smlib</string> <key>loadlib22</key> ! <string>toxy</string> <key>loadlib23</key> ! <string>unauthorized</string> <key>loadlib24</key> ! <string>vbap</string> <key>loadlib25</key> ! <string>pan</string> <key>loadlib26</key> ! <string>freeverb</string> <key>loadlib27</key> ! <string>hcs</string> <key>loadlib28</key> ! <string>jmmmp</string> <key>loadlib29</key> ! <string>flatspace</string> ! <key>loadlib30</key> ! <string>deprecated</string> <key>path1</key> <string>/System/Library/Fonts</string>

1 0

pd/src desire.c, 1.1.2.145, 1.1.2.146 desire.h, 1.1.2.20, 1.1.2.21
by Mathieu Bouchard 03 Sep '06

03 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6021 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: . Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -C2 -d -r1.1.2.20 -r1.1.2.21 *** desire.h 3 Sep 2006 05:40:39 -0000 1.1.2.20 --- desire.h 3 Sep 2006 06:01:01 -0000 1.1.2.21 *************** *** 109,113 **** unsigned int gl_havewindow:1; /* true if we own a window */ unsigned int gl_mapped:1; /* true if, moreover, it's "mapped" */ - unsigned int gl_dirty:1; /* (root canvas only:) patch has changed */ unsigned int gl_loading:1; /* am now loading from file */ unsigned int gl_willvis:1; /* make me visible after loading */ --- 109,112 ---- *************** *** 117,120 **** --- 116,127 ---- }; + /* LATER consider adding font size to this struct (see glist_getfont()) */ + struct _canvasenvironment { + t_symbol *ce_dir; /* directory patch lives in */ + int ce_argc; /* number of "$" arguments */ + t_atom *ce_argv; /* array of "$" arguments */ + int ce_dollarzero; /* value of "$0" */ + }; + /* a data structure to describe a field in a pure datum */ #define DT_FLOAT 0 *************** *** 194,205 **** }; - /* cursor definitions; used as return value for t_parentclickfn */ - #define CURSOR_RUNMODE_CLICKME 1 - #define CURSOR_RUNMODE_THICKEN 2 - #define CURSOR_RUNMODE_ADDPOINT 3 - #define CURSOR_EDITMODE_DISCONNECT 6 extern t_canvas *canvas_list; /* list of all root canvases */ extern t_class *vinlet_class, *voutlet_class, *canvas_class; extern int glist_valid; /* incremented when pointers might be stale */ #define PLOTSTYLE_POINTS 0 /* plotting styles for arrays */ --- 201,209 ---- }; extern t_canvas *canvas_list; /* list of all root canvases */ extern t_class *vinlet_class, *voutlet_class, *canvas_class; extern int glist_valid; /* incremented when pointers might be stale */ + EXTERN int sys_noloadbang; + EXTERN t_symbol *s_empty; #define PLOTSTYLE_POINTS 0 /* plotting styles for arrays */ *************** *** 211,214 **** --- 215,223 ---- /* from desire.c */ + EXTERN int pd_scanargs(int argc, t_atom *argv, char *fmt, ...); + EXTERN int pd_saveargs(t_binbuf *b, char *fmt, ...); + EXTERN void pd_upload(t_gobj *self); + EXTERN void sys_mgui(void *self, const char *sel, const char *fmt, ...); + EXTERN t_glist *glist_new(void); EXTERN void glist_init(t_glist *x); *************** *** 228,231 **** --- 237,241 ---- EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); EXTERN t_canvasenvironment *canvas_getenv(t_canvas *x); + EXTERN int canvas_getdollarzero(void); EXTERN void linetraverser_start(t_linetraverser *t, t_canvas *x); *************** *** 236,255 **** /* -------------------- TO BE SORTED OUT --------------------- */ - EXTERN void canvas_vistext(t_canvas *x, t_text *y); EXTERN void canvas_redrawallfortemplate(t_template *tmpl, int action); EXTERN void canvas_redrawallfortemplatecanvas(t_canvas *x, int action); - EXTERN void canvas_dirty(t_canvas *x, t_int n); - EXTERN int canvas_showtext(t_canvas *x); - EXTERN void canvas_vis(t_canvas *x, t_floatarg f); - EXTERN void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir); - EXTERN void canvas_fattenforscalars(t_canvas *x, int *x1, int *y1, int *x2, int *y2); - EXTERN void canvas_visforscalars(t_canvas *x, t_glist *glist, int vis); - EXTERN int canvas_clicksub(t_canvas *x, int xpix, int ypix, int shift, int alt, int dbl, int doit); - EXTERN t_glist *canvas_getglistonsuper(void); - EXTERN t_template *garray_template(t_garray *x); - EXTERN t_garray *graph_array(t_glist *gl, t_symbol *s, t_symbol *tmpl, t_floatarg f, t_floatarg saveit); EXTERN t_array *array_new(t_symbol *templatesym, t_gpointer *parent); EXTERN void array_resize(t_array *x, int n); - EXTERN void array_free(t_array *x); EXTERN t_gstub *gstub_new(t_glist *gl, t_array *a); EXTERN void gstub_cutoff(t_gstub *gs); --- 246,253 ---- *************** *** 259,280 **** 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); - EXTERN int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, t_symbol *elemtemplatesym, float linewidth, float xloc, float xinc, float yloc, float scalarvis, t_fielddesc *xfield, t_fielddesc *yfield, t_fielddesc *wfield, int xpix, int ypix, int shift, int alt, int dbl, int doit); ! EXTERN void array_getcoordinate(t_glist *glist, ! char *elem, int xonset, int yonset, int wonset, int indx, float basex, float basey, float xinc, t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, float *xp, float *yp, float *wp); ! EXTERN int array_getfields(t_symbol *elemtemplatesym, ! t_canvas **elemtemplatecanvasp, t_template **elemtemplatep, int *elemsizep, t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, int *xonsetp, int *yonsetp, int *wonsetp); - EXTERN t_template *template_new(t_symbol *sym, int argc, t_atom *argv); EXTERN void template_free(t_template *x); --- 257,273 ---- EXTERN t_scalar *scalar_new(t_glist *owner, t_symbol *templatesym); EXTERN void word_free(t_word *wp, t_template *tmpl); EXTERN void scalar_redraw(t_scalar *x, t_glist *glist); EXTERN int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, t_symbol *elemtemplatesym, float linewidth, float xloc, float xinc, float yloc, float scalarvis, t_fielddesc *xfield, t_fielddesc *yfield, t_fielddesc *wfield, int xpix, int ypix, int shift, int alt, int dbl, int doit); ! EXTERN void array_getcoordinate(t_glist *glist, char *elem, int xonset, int yonset, int wonset, int indx, float basex, float basey, float xinc, t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, float *xp, float *yp, float *wp); ! EXTERN int array_getfields(t_symbol *elemtemplatesym, t_canvas **elemtemplatecanvasp, t_template **elemtemplatep, int *elemsizep, t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, int *xonsetp, int *yonsetp, int *wonsetp); EXTERN t_template *template_new(t_symbol *sym, int argc, t_atom *argv); EXTERN void template_free(t_template *x); *************** *** 290,294 **** EXTERN t_canvas *template_findcanvas(t_template *tmpl); EXTERN void template_notify(t_template *, t_symbol *s, int argc, t_atom *argv); - EXTERN t_float template_getfloat( t_template *x, t_symbol *fieldname, t_word *wp, int loud); EXTERN void template_setfloat( t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud); --- 283,286 ---- *************** *** 299,329 **** EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val); EXTERN float fielddesc_cvtfromcoord(t_fielddesc *f, float coord); ! ! EXTERN t_guiconnect *guiconnect_new(t_pd *who, t_symbol *sym); ! EXTERN void guiconnect_notarget(t_guiconnect *x, double timedelay); ! ! EXTERN t_symbol *iemgui_raute2dollar(t_symbol *s); ! EXTERN t_symbol *iemgui_dollar2raute(t_symbol *s); ! ! #define IS_A_FLOAT(atom,index) ((atom+index)->a_type == A_FLOAT) ! #define IS_A_SYMBOL(atom,index) ((atom+index)->a_type == A_SYMBOL) ! typedef void (*t_iemfunptr)(void *x, t_glist *glist, int mode); ! ! EXTERN int sys_noloadbang; ! EXTERN int canvas_getdollarzero(void); ! EXTERN void canvas_getargs(int *argcp, t_atom **argvp); ! EXTERN int pd_scanargs(int argc, t_atom *argv, char *fmt, ...); ! EXTERN int pd_saveargs(t_binbuf *b, char *fmt, ...); ! EXTERN void pd_upload(t_gobj *self); ! EXTERN void sys_mgui(void *self, const char *sel, const char *fmt, ...); ! EXTERN t_symbol *s_empty; ! EXTERN int convert_color2(int x); ! //EXTERN void binbuf_update(t_iemgui *x, t_symbol *qlass, int argc, t_atom *argv); ! //EXTERN int pd_savehead(t_binbuf *b, t_iemgui *x, char *name); ! EXTERN void iemgui_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2); #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) } #endif - #endif /* __DESIRE_H */ --- 291,298 ---- EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val); EXTERN float fielddesc_cvtfromcoord(t_fielddesc *f, float coord); ! //EXTERN int pd_pickle(t_foo *foo, char *fmt, ...); #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) } #endif #endif /* __DESIRE_H */ Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.145 retrieving revision 1.1.2.146 diff -C2 -d -r1.1.2.145 -r1.1.2.146 *** desire.c 3 Sep 2006 05:40:38 -0000 1.1.2.145 --- desire.c 3 Sep 2006 06:01:00 -0000 1.1.2.146 *************** *** 288,299 **** */ - /* LATER consider adding font size to this struct (see glist_getfont()) */ - struct _canvasenvironment { - t_symbol *ce_dir; /* directory patch lives in */ - int ce_argc; /* number of "$" arguments */ - t_atom *ce_argv; /* array of "$" arguments */ - int ce_dollarzero; /* value of "$0" */ - }; - #define GLIST_DEFCANVASWIDTH 450 #define GLIST_DEFCANVASHEIGHT 300 --- 288,291 ---- *************** *** 367,376 **** } - void canvas_getargs(int *argcp, t_atom **argvp) { - t_canvasenvironment *e = canvas_getenv(canvas_getcurrent()); - *argcp = e->ce_argc; - *argvp = e->ce_argv; - } - t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s) { t_symbol *ret; --- 359,362 ---- *************** *** 406,410 **** } ! void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { if (strcmp(x->gl_name->s_name, "Pd")) pd_unbind((t_pd *)x, canvas_makebindsym(x->gl_name)); x->gl_name = s; --- 392,396 ---- } ! static void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { if (strcmp(x->gl_name->s_name, "Pd")) pd_unbind((t_pd *)x, canvas_makebindsym(x->gl_name)); x->gl_name = s; *************** *** 643,654 **** } - void canvas_dirty(t_canvas *x, t_int n) { - t_canvas *x2 = canvas_getrootfor(x); - if ((unsigned)n != x2->gl_dirty) { - x2->gl_dirty = n; - sys_mgui(x,"modified?=","i",n); - } - } - void canvas_drawredrect(t_canvas *x, int doit) { if (doit) sys_mgui(glist_getcanvas(x),"gop_rectangle","iiii", --- 629,632 ---- *************** *** 657,660 **** --- 635,640 ---- } + static void canvas_vis(t_canvas *x, t_floatarg f); + /* the window becomes "mapped" (visible and not miniaturized) or "unmapped" (either miniaturized or just plain gone.) This should be *************** *** 687,690 **** --- 667,672 ---- static void canvas_redraw(t_canvas *x) {if (glist_isvisible(x)) {canvas_map(x,0); canvas_map(x, 1);}} + t_guiconnect *guiconnect_new(t_pd *who, t_symbol *sym); + static t_editor *editor_new(t_glist *owner) { char buf[40]; *************** *** 697,700 **** --- 679,684 ---- } + static void guiconnect_notarget(t_guiconnect *x, double timedelay); + static void editor_free(t_editor *x, t_glist *y) { guiconnect_notarget(x->e_guiconnect, 1000); *************** *** 724,731 **** } ! /* we call this when we want the window to become visible, mapped, and ! in front of all windows; or with "f" zero, when we want to get rid of ! the window. */ ! void canvas_vis(t_canvas *x, t_floatarg f) { if (!!f) { if (x->gl_editor) { /* already visible, so just raise window */ --- 708,714 ---- } ! /* we call this when we want the window to become visible, mapped, and ! in front of all windows; or with "f" zero, when we want to get rid of the window. */ ! static void canvas_vis(t_canvas *x, t_floatarg f) { if (!!f) { if (x->gl_editor) { /* already visible, so just raise window */ *************** *** 983,986 **** --- 966,971 ---- /* ------------------ table ---------------------------*/ + static t_garray *graph_array(t_glist *gl, t_symbol *s, t_symbol *tmpl, t_floatarg f, t_floatarg saveit); + static int tabcount = 0; *************** *** 1024,1028 **** /* return true if the "canvas" object should be treated as a text object. This is true for abstractions but also for "table"s... */ ! int canvas_showtext(t_canvas *x) { t_atom *argv = x->gl_obj.te_binbuf? binbuf_getvec( x->gl_obj.te_binbuf) : 0; int argc = x->gl_obj.te_binbuf? binbuf_getnatom(x->gl_obj.te_binbuf) : 0; --- 1009,1013 ---- /* return true if the "canvas" object should be treated as a text object. This is true for abstractions but also for "table"s... */ ! static int canvas_showtext(t_canvas *x) { t_atom *argv = x->gl_obj.te_binbuf? binbuf_getvec( x->gl_obj.te_binbuf) : 0; int argc = x->gl_obj.te_binbuf? binbuf_getnatom(x->gl_obj.te_binbuf) : 0; *************** *** 1399,1415 **** } - /* find a dirty sub-glist, if any, of this one (including itself) */ - static t_glist *glist_finddirty(t_glist *x) { - t_gobj *g; - t_glist *g2; - if (x->gl_env && x->gl_dirty) - return x; - for (g = x->gl_list; g; g = g->g_next) - if (pd_class(&g->g_pd) == canvas_class && - (g2 = glist_finddirty((t_glist *)g))) - return g2; - return 0; - } - void canvas_close(t_canvas *x) { if (x->gl_owner) canvas_vis(x, 0); else pd_free((t_pd *)x); --- 1384,1387 ---- *************** *** 1685,1689 **** void word_free(t_word *wp, t_template *template); ! void array_free(t_array *x) { int i; t_template *scalartemplate = template_findbyname(x->a_templatesym); --- 1657,1661 ---- void word_free(t_word *wp, t_template *template); ! static void array_free(t_array *x) { int i; t_template *scalartemplate = template_findbyname(x->a_templatesym); *************** *** 2121,2124 **** --- 2093,2102 ---- } + /* cursor definitions; used as return value for t_parentclickfn */ + #define CURSOR_RUNMODE_CLICKME 1 + #define CURSOR_RUNMODE_THICKEN 2 + #define CURSOR_RUNMODE_ADDPOINT 3 + #define CURSOR_EDITMODE_DISCONNECT 6 + /* LATER move this and others back into plot parentwidget code, so they can be static (look in g_canvas.h for candidates). */ *************** *** 2310,2323 **** } - /* This functiopn gets the template of an array; if we can't figure - out what template an array's elements belong to we're in grave trouble - when it's time to free or resize it. */ - t_template *garray_template(t_garray *x) { - t_array *array = garray_getarray(x); - t_template *template = array ? template_findbyname(array->a_templatesym) : 0; - if (!template) bug("garray_template"); - return template; - } - /* get the length */ int garray_npoints(t_garray *x) {return garray_getarray(x)->a_n;} --- 2288,2291 ---- *************** *** 2692,2695 **** --- 2660,2665 ---- } + static void scalar_getbasexy(t_scalar *x, float *basex, float *basey); + static float gobj_getxforsort(t_gobj *g) { if (pd_class(&g->g_pd) == scalar_class) { *************** *** 3176,3180 **** we're ready to delete the object; otherwise we wait either for signoff or for a timeout. */ ! void guiconnect_notarget(t_guiconnect *x, double timedelay) { if (!x->x_sym) pd_free((t_pd *)x); else { --- 3146,3150 ---- we're ready to delete the object; otherwise we wait either for signoff or for a timeout. */ ! static void guiconnect_notarget(t_guiconnect *x, double timedelay) { if (!x->x_sym) pd_free((t_pd *)x); else { *************** *** 3732,3736 **** if (!x->gl_owner) canvas_rename(x, filename, dir); post("saved to: %s/%s", dir->s_name, filename->s_name); - canvas_dirty(x, 0); canvas_reload(filename, dir, (t_gobj *)x); } --- 3702,3705 ---- *************** *** 4360,4365 **** } ! /* -------------------- widget behavior for scalar ------------ */ ! void scalar_getbasexy(t_scalar *x, float *basex, float *basey) { t_template *template = template_findbyname(x->sc_template); *basex = template_getfloat(template, gensym("x"), x->sc_vec, 0); --- 4329,4333 ---- } ! static void scalar_getbasexy(t_scalar *x, float *basex, float *basey) { t_template *template = template_findbyname(x->sc_template); *basex = template_getfloat(template, gensym("x"), x->sc_vec, 0); *************** *** 6860,6864 **** /*EXTERN*/ void canvas_savecontainerto(t_canvas *x, t_binbuf *b); - //typedef void (*t_iemfunptr)(void *x, t_glist *glist, int mode); #define IEMGUI_FIELDS \ --- 6828,6831 ---- *************** *** 6940,6949 **** t_symbol *s_empty; - int convert_color2(int x); - void binbuf_update(t_iemgui *x, t_symbol *qlass, int argc, t_atom *argv); typedef struct t_foo { int argc; t_atom *argv; t_binbuf *b; } t_foo; ! int pd_pickle(t_foo *foo, char *fmt, ...); ! int pd_savehead(t_binbuf *b, void /*t_iemgui*/ *x, char *name); #ifdef MSW --- 6907,6914 ---- t_symbol *s_empty; typedef struct t_foo { int argc; t_atom *argv; t_binbuf *b; } t_foo; ! static int pd_pickle(t_foo *foo, char *fmt, ...); ! static int pd_savehead(t_binbuf *b, void /*t_iemgui*/ *x, char *name); #ifdef MSW *************** *** 6993,6996 **** --- 6958,6967 ---- } + void canvas_getargs(int *argcp, t_atom **argvp) { + t_canvasenvironment *e = canvas_getenv(canvas_getcurrent()); + *argcp = e->ce_argc; + *argvp = e->ce_argv; + } + static void canvas_objtext(t_glist *gl, int xpix, int ypix, int selected, t_binbuf *b) { t_text *x=0; *************** *** 7199,7203 **** return gensym(shmo); } - /* else return iemgui_dollar2raute(s);*/ else return s; } --- 7170,7173 ---- *************** *** 7206,7210 **** static t_symbol *gatom_unescapit(t_symbol *s) { if (*s->s_name == '-') return gensym(s->s_name+1); - /* return iemgui_raute2dollar(s);*/ return s; } --- 7176,7179 ---- *************** *** 7733,7737 **** } ! int pd_savehead(t_binbuf *b, void /*t_text*/ *x_, char *name) { t_text *x = (t_text *)x_; binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"), --- 7702,7706 ---- } ! static int pd_savehead(t_binbuf *b, void /*t_text*/ *x_, char *name) { t_text *x = (t_text *)x_; binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"),

1 0

pd/src desire.c, 1.1.2.144, 1.1.2.145 desire.h, 1.1.2.19, 1.1.2.20
by Mathieu Bouchard 03 Sep '06

03 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29572 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: . Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -C2 -d -r1.1.2.19 -r1.1.2.20 *** desire.h 3 Sep 2006 05:14:04 -0000 1.1.2.19 --- desire.h 3 Sep 2006 05:40:39 -0000 1.1.2.20 *************** *** 200,204 **** #define CURSOR_EDITMODE_DISCONNECT 6 extern t_canvas *canvas_list; /* list of all root canvases */ ! extern t_class *vinlet_class, *voutlet_class; extern int glist_valid; /* incremented when pointers might be stale */ --- 200,204 ---- #define CURSOR_EDITMODE_DISCONNECT 6 extern t_canvas *canvas_list; /* list of all root canvases */ ! extern t_class *vinlet_class, *voutlet_class, *canvas_class; extern int glist_valid; /* incremented when pointers might be stale */ *************** *** 214,279 **** EXTERN void glist_init(t_glist *x); EXTERN void glist_add(t_glist *x, t_gobj *g); - EXTERN t_canvas *glist_getcanvas(t_glist *x); EXTERN void glist_delete(t_glist *x, t_gobj *y); EXTERN int glist_isvisible(t_glist *x); EXTERN int glist_istoplevel(t_glist *x); EXTERN t_canvas *canvas_getcurrent(void); ! EXTERN void canvas_deletelinesfor(t_canvas *x, t_text *text); ! EXTERN void canvas_deletelinesforio(t_canvas *x, t_text *text, t_inlet *inp, t_outlet *outp); EXTERN void linetraverser_start(t_linetraverser *t, t_canvas *x); EXTERN t_outconnect *linetraverser_next(t_linetraverser *t); ! /* -------------------- TO BE SORTED OUT --------------------- */ ! EXTERN void glist_read(t_glist *x, t_symbol *filename, t_symbol *format); ! EXTERN void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format); ! EXTERN float glist_pixelstox(t_glist *x, float xpix); ! EXTERN float glist_pixelstoy(t_glist *x, float ypix); ! EXTERN float glist_xtopixels(t_glist *x, float xval); ! 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_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, ! float x1, float y1, float x2, float y2, ! float px1, float py1, float px2, float py2); ! EXTERN t_binbuf *glist_writetobinbuf(t_glist *x, int wholething); ! EXTERN int glist_isgraph(t_glist *x); ! EXTERN void glist_redraw(t_glist *x); ! EXTERN void canvas_create_editor(t_glist *x, int createit); ! EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); ! EXTERN int text_xcoord(t_text *x, t_glist *glist); ! EXTERN int text_ycoord(t_text *x, t_glist *glist); ! EXTERN int text_xpix( t_text *x, t_glist *glist); ! EXTERN int text_ypix( t_text *x, t_glist *glist); ! EXTERN int text_shouldvis(t_text *x, t_glist *glist); ! ! EXTERN t_class *canvas_class; ! EXTERN t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv); EXTERN t_symbol *canvas_makebindsym(t_symbol *s); - EXTERN void canvas_vistext(t_canvas *x, t_text *y); - EXTERN void canvas_redraw(t_canvas *x); ! EXTERN t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *sym, t_symbol* h); ! EXTERN void canvas_rminlet(t_canvas *x, t_inlet *ip); ! EXTERN t_outlet *canvas_addoutlet(t_canvas *x, t_pd *who, t_symbol *sym); ! EXTERN void canvas_rmoutlet(t_canvas *x, t_outlet *op); EXTERN void canvas_redrawallfortemplate(t_template *tmpl, int action); EXTERN void canvas_redrawallfortemplatecanvas(t_canvas *x, int action); - EXTERN t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s); - EXTERN t_canvas *canvas_getrootfor(t_canvas *x); EXTERN void canvas_dirty(t_canvas *x, t_int n); - EXTERN void canvas_resortinlets(t_canvas *x); - EXTERN void canvas_resortoutlets(t_canvas *x); - EXTERN void canvas_free(t_canvas *x); - EXTERN int canvas_isabstraction(t_canvas *x); - EXTERN int canvas_istable(t_canvas *x); EXTERN int canvas_showtext(t_canvas *x); EXTERN void canvas_vis(t_canvas *x, t_floatarg f); - EXTERN t_canvasenvironment *canvas_getenv(t_canvas *x); EXTERN void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir); - EXTERN void canvas_loadbang(t_canvas *x); - EXTERN int canvas_setdeleting(t_canvas *x, int flag); - EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); EXTERN void canvas_fattenforscalars(t_canvas *x, int *x1, int *y1, int *x2, int *y2); EXTERN void canvas_visforscalars(t_canvas *x, t_glist *glist, int vis); --- 214,246 ---- EXTERN void glist_init(t_glist *x); EXTERN void glist_add(t_glist *x, t_gobj *g); EXTERN void glist_delete(t_glist *x, t_gobj *y); + EXTERN void canvas_deletelinesfor(t_canvas *x, t_text *text); + EXTERN void canvas_deletelinesforio(t_canvas *x, t_text *text, t_inlet *inp, t_outlet *outp); + EXTERN int glist_isvisible(t_glist *x); EXTERN int glist_istoplevel(t_glist *x); + EXTERN int canvas_istable(t_canvas *x); + EXTERN int canvas_isabstraction(t_canvas *x); + + EXTERN t_canvas *glist_getcanvas(t_glist *x); + EXTERN t_canvas *canvas_getrootfor(t_canvas *x); EXTERN t_canvas *canvas_getcurrent(void); ! EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); ! EXTERN t_canvasenvironment *canvas_getenv(t_canvas *x); ! EXTERN void linetraverser_start(t_linetraverser *t, t_canvas *x); EXTERN t_outconnect *linetraverser_next(t_linetraverser *t); ! EXTERN t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s); EXTERN t_symbol *canvas_makebindsym(t_symbol *s); ! /* -------------------- TO BE SORTED OUT --------------------- */ ! EXTERN void canvas_vistext(t_canvas *x, t_text *y); EXTERN void canvas_redrawallfortemplate(t_template *tmpl, int action); EXTERN void canvas_redrawallfortemplatecanvas(t_canvas *x, int action); EXTERN void canvas_dirty(t_canvas *x, t_int n); EXTERN int canvas_showtext(t_canvas *x); EXTERN void canvas_vis(t_canvas *x, t_floatarg f); EXTERN void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir); EXTERN void canvas_fattenforscalars(t_canvas *x, int *x1, int *y1, int *x2, int *y2); EXTERN void canvas_visforscalars(t_canvas *x, t_glist *glist, int vis); Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.144 retrieving revision 1.1.2.145 diff -C2 -d -r1.1.2.144 -r1.1.2.145 *** desire.c 3 Sep 2006 05:14:01 -0000 1.1.2.144 --- desire.c 3 Sep 2006 05:40:38 -0000 1.1.2.145 *************** *** 477,481 **** 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(); --- 477,481 ---- its parent will be a "text" object in another window... we don't know which yet. */ ! static 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(); *************** *** 550,557 **** } #define GLIST_DEFGRAPHWIDTH 200 #define GLIST_DEFGRAPHHEIGHT 140 /* make a new glist and add it to this glist. It will appear as a "graph", not a text object. */ ! t_glist *glist_addglist(t_glist *g, t_symbol *sym, float x1, float y1, float x2, float y2, float px1, float py1, float px2, float py2) { --- 550,559 ---- } + static void canvas_create_editor(t_glist *x, int createit); + #define GLIST_DEFGRAPHWIDTH 200 #define GLIST_DEFGRAPHHEIGHT 140 /* make a new glist and add it to this glist. It will appear as a "graph", not a text object. */ ! static t_glist *glist_addglist(t_glist *g, t_symbol *sym, float x1, float y1, float x2, float y2, float px1, float py1, float px2, float py2) { *************** *** 603,608 **** } ! /* call glist_addglist from a Pd message */ ! void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv) { t_symbol *sym; float x1,y1,x2,y2,px1,py1,px2,py2; --- 605,609 ---- } ! static void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv) { t_symbol *sym; float x1,y1,x2,y2,px1,py1,px2,py2; *************** *** 611,617 **** } ! /* return true if the glist should appear as a graph on parent; ! otherwise it appears as a text box. */ ! int glist_isgraph(t_glist *x) {return x->gl_isgraph;} /* This is sent from the GUI to inform a toplevel that its window has been --- 612,616 ---- } ! static void canvas_redraw(t_canvas *x); /* This is sent from the GUI to inform a toplevel that its window has been *************** *** 626,630 **** x->gl_screenx2 = x2; x->gl_screeny2 = y2; ! if (!glist_isgraph(x) && (x->gl_y2 < x->gl_y1)) { /* if it's flipped so that y grows upward, fix so that zero is bottom edge and redraw. This is --- 625,629 ---- x->gl_screenx2 = x2; x->gl_screeny2 = y2; ! if (!x->gl_isgraph && (x->gl_y2 < x->gl_y1)) { /* if it's flipped so that y grows upward, fix so that zero is bottom edge and redraw. This is *************** *** 686,692 **** } ! void canvas_redraw(t_canvas *x) { ! if (glist_isvisible(x)) {canvas_map(x,0); canvas_map(x, 1);} ! } static t_editor *editor_new(t_glist *owner) { --- 685,689 ---- } ! static void canvas_redraw(t_canvas *x) {if (glist_isvisible(x)) {canvas_map(x,0); canvas_map(x, 1);}} static t_editor *editor_new(t_glist *owner) { *************** *** 708,712 **** /* recursively create or destroy all editors of a glist and its sub-glists, as long as they aren't toplevels. */ ! void canvas_create_editor(t_glist *x, int createit) { t_gobj *y; if (createit) { --- 705,710 ---- /* recursively create or destroy all editors of a glist and its sub-glists, as long as they aren't toplevels. */ ! ! static void canvas_create_editor(t_glist *x, int createit) { t_gobj *y; if (createit) { *************** *** 753,757 **** /* if we're a graph on our parent, and if the parent exists and is visible, show ourselves on parent. */ ! if (glist_isgraph(x) && x->gl_owner) { canvas_create_editor(x, 1); x->gl_havewindow = 0; --- 751,755 ---- /* if we're a graph on our parent, and if the parent exists and is visible, show ourselves on parent. */ ! if (x->gl_isgraph && x->gl_owner) { canvas_create_editor(x, 1); x->gl_havewindow = 0; *************** *** 790,794 **** } ! void canvas_free(t_canvas *x) { t_gobj *y; int dspstate = canvas_suspend_dsp(); --- 788,792 ---- } ! static void canvas_free(t_canvas *x) { t_gobj *y; int dspstate = canvas_suspend_dsp(); *************** *** 840,843 **** --- 838,844 ---- } + static void canvas_resortinlets(t_canvas *x); + static void canvas_resortoutlets(t_canvas *x); + static void canvas_pop(t_canvas *x, t_floatarg fvis) { if (fvis!=0) canvas_vis(x, 1); *************** *** 885,888 **** --- 886,891 ---- } + static void canvas_loadbang(t_canvas *x); + static void canvas_loadbangabstractions(t_canvas *x) { t_gobj *y; *************** *** 906,910 **** } ! void canvas_loadbang(t_canvas *x) { canvas_loadbangabstractions(x); canvas_loadbangsubpatches(x); --- 909,913 ---- } ! static void canvas_loadbang(t_canvas *x) { canvas_loadbangabstractions(x); canvas_loadbangsubpatches(x); *************** *** 1144,1147 **** --- 1147,1152 ---- /******************* redrawing data *********************/ + static void glist_redraw(t_glist *x); + /* redraw all "scalars" (do this if a drawing command is changed.) LATER we'll use the "template" information to select which ones we *************** *** 1310,1316 **** any missing paramters and redraw things if necessary. */ void canvas_setgraph(t_glist *x, int flag, int nogoprect) { ! if (!flag && glist_isgraph(x)) { x->gl_isgraph = 0; ! } else if (flag && !glist_isgraph(x)) { if (x->gl_pixwidth <= 0) x->gl_pixwidth = GLIST_DEFGRAPHWIDTH; if (x->gl_pixheight <= 0) x->gl_pixheight = GLIST_DEFGRAPHHEIGHT; --- 1315,1321 ---- any missing paramters and redraw things if necessary. */ void canvas_setgraph(t_glist *x, int flag, int nogoprect) { ! if (!flag && x->gl_isgraph) { x->gl_isgraph = 0; ! } else if (flag && !x->gl_isgraph) { if (x->gl_pixwidth <= 0) x->gl_pixwidth = GLIST_DEFGRAPHWIDTH; if (x->gl_pixheight <= 0) x->gl_pixheight = GLIST_DEFGRAPHHEIGHT; *************** *** 1330,1333 **** --- 1335,1341 ---- } + static float glist_dpixtodx(t_glist*x,float dxpix); + static float glist_dpixtody(t_glist*x,float dypix); + /* called from the gui when "OK" is selected on the canvas properties dialog. Again we negate "y" scale. */ *************** *** 1590,1594 **** static int canvas_last_glist_x, canvas_last_glist_y; ! void glist_getnextxy(t_glist *gl, int *xpix, int *ypix) { if (canvas_last_glist == gl) *xpix = canvas_last_glist_x, *ypix = canvas_last_glist_y; --- 1598,1602 ---- static int canvas_last_glist_x, canvas_last_glist_y; ! static void glist_getnextxy(t_glist *gl, int *xpix, int *ypix) { if (canvas_last_glist == gl) *xpix = canvas_last_glist_x, *ypix = canvas_last_glist_y; *************** *** 1969,1972 **** --- 1977,1983 ---- } + static float glist_xtopixels(t_glist *x, float xval); + static float glist_ytopixels(t_glist *x, float yval); + /* routine to get screen coordinates of a point in an array */ void array_getcoordinate(t_glist *glist, char *elem, int xonset, int yonset, int wonset, int indx, *************** *** 2246,2249 **** --- 2257,2267 ---- #define ARRAYWRITECHUNKSIZE 1000 + static float glist_pixelstox(t_glist *x, float xpix); + static float glist_pixelstoy(t_glist *x, float xpix); + + /* convert an X screen distance to an X coordinate increment. */ + static float glist_dpixtodx(t_glist*x,float dxpix){return dxpix*(glist_pixelstox(x,1)-glist_pixelstox(x,0));} + static float glist_dpixtody(t_glist*x,float dypix){return dypix*(glist_pixelstoy(x,1)-glist_pixelstoy(x,0));} + static void garray_save(t_gobj *z, t_binbuf *b) { int style, filestyle; *************** *** 2732,2736 **** /* --------------- inlets and outlets ----------- */ ! t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *s, t_symbol* h) { t_inlet *ip = inlet_new(&x->gl_obj, who, s, 0); inlet_settip(ip,h); --- 2750,2754 ---- /* --------------- inlets and outlets ----------- */ ! static t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *s, t_symbol* h) { t_inlet *ip = inlet_new(&x->gl_obj, who, s, 0); inlet_settip(ip,h); *************** *** 2740,2744 **** } ! void canvas_rminlet(t_canvas *x, t_inlet *ip) { t_canvas *owner = x->gl_owner; if (owner) canvas_deletelinesforio(owner, &x->gl_obj, ip, 0); --- 2758,2762 ---- } ! static void canvas_rminlet(t_canvas *x, t_inlet *ip) { t_canvas *owner = x->gl_owner; if (owner) canvas_deletelinesforio(owner, &x->gl_obj, ip, 0); *************** *** 2750,2754 **** extern void obj_moveinletfirst(t_object *x, t_inlet *i); ! void canvas_resortinlets(t_canvas *x) { int ninlets = 0, i, j, xmax; t_gobj *y, **vec, **vp, **maxp; --- 2768,2772 ---- extern void obj_moveinletfirst(t_object *x, t_inlet *i); ! static void canvas_resortinlets(t_canvas *x) { int ninlets = 0, i, j, xmax; t_gobj *y, **vec, **vp, **maxp; *************** *** 2777,2781 **** } ! t_outlet *canvas_addoutlet(t_canvas *x, t_pd *who, t_symbol *s) { t_outlet *op = outlet_new(&x->gl_obj, s); if (!x->gl_loading) canvas_resortoutlets(x); --- 2795,2799 ---- } ! static t_outlet *canvas_addoutlet(t_canvas *x, t_pd *who, t_symbol *s) { t_outlet *op = outlet_new(&x->gl_obj, s); if (!x->gl_loading) canvas_resortoutlets(x); *************** *** 2784,2788 **** } ! void canvas_rmoutlet(t_canvas *x, t_outlet *op) { t_canvas *owner = x->gl_owner; if (owner) canvas_deletelinesforio(owner, &x->gl_obj, 0, op); --- 2802,2806 ---- } ! static void canvas_rmoutlet(t_canvas *x, t_outlet *op) { t_canvas *owner = x->gl_owner; if (owner) canvas_deletelinesforio(owner, &x->gl_obj, 0, op); *************** *** 2794,2798 **** extern void obj_moveoutletfirst(t_object *x, t_outlet *i); ! void canvas_resortoutlets(t_canvas *x) { int noutlets = 0, i, j, xmax; t_gobj *y, **vec, **vp, **maxp; --- 2812,2816 ---- extern void obj_moveoutletfirst(t_object *x, t_outlet *i); ! static void canvas_resortoutlets(t_canvas *x) { int noutlets = 0, i, j, xmax; t_gobj *y, **vec, **vp, **maxp; *************** *** 2887,2891 **** so get our screen rectangle on parent and transform. */ ! float glist_pixelstox(t_glist *x, float xpix) { int x1, y1, x2, y2; float width = x->gl_x2-x->gl_x1; --- 2905,2909 ---- so get our screen rectangle on parent and transform. */ ! static float glist_pixelstox(t_glist *x, float xpix) { int x1, y1, x2, y2; float width = x->gl_x2-x->gl_x1; *************** *** 2896,2900 **** return x->gl_x1 + width * (xpix-x1) / (x2-x1); } ! float glist_pixelstoy(t_glist *x, float ypix) { int x1, y1, x2, y2; float height = x->gl_y2-x->gl_y1; --- 2914,2918 ---- return x->gl_x1 + width * (xpix-x1) / (x2-x1); } ! static float glist_pixelstoy(t_glist *x, float ypix) { int x1, y1, x2, y2; float height = x->gl_y2-x->gl_y1; *************** *** 2907,2911 **** /* convert an x coordinate value to an x pixel location in window */ ! float glist_xtopixels(t_glist *x, float xval) { int x1, y1, x2, y2; float width = x->gl_x2-x->gl_x1; --- 2925,2929 ---- /* convert an x coordinate value to an x pixel location in window */ ! static float glist_xtopixels(t_glist *x, float xval) { int x1, y1, x2, y2; float width = x->gl_x2-x->gl_x1; *************** *** 2916,2920 **** return x1 + (x2 - x1) * (xval - x->gl_x1) / width; } ! float glist_ytopixels(t_glist *x, float yval) { int x1, y1, x2, y2; float height = x->gl_y2-x->gl_y1; --- 2934,2938 ---- return x1 + (x2 - x1) * (xval - x->gl_x1) / width; } ! static float glist_ytopixels(t_glist *x, float yval) { int x1, y1, x2, y2; float height = x->gl_y2-x->gl_y1; *************** *** 2926,2933 **** } - /* convert an X screen distance to an X coordinate increment. */ - float glist_dpixtodx(t_glist *x, float dxpix) {return dxpix*(glist_pixelstox(x, 1)-glist_pixelstox(x, 0));} - float glist_dpixtody(t_glist *x, float dypix) {return dypix*(glist_pixelstoy(x, 1)-glist_pixelstoy(x, 0));} - /* get the window location in pixels of a "text" object. The object's x and y positions are in pixels when the glist they're --- 2944,2947 ---- *************** *** 2936,2945 **** as an offset into the parent rectangle. Finally, it might be an old, proportional-style GOP. In this case we do a coordinate transformation. */ ! int text_xpix(t_text *x, t_glist *glist) { if (glist->gl_havewindow || !glist->gl_isgraph) return x->te_xpix; if (glist->gl_goprect) return glist->gl_obj.te_xpix + x->te_xpix - glist->gl_xmargin; return glist_xtopixels(glist, glist->gl_x1 + (glist->gl_x2 - glist->gl_x1) * x->te_xpix / (glist->gl_screenx2 - glist->gl_screenx1)); } ! int text_ypix(t_text *x, t_glist *glist) { if (glist->gl_havewindow || !glist->gl_isgraph) return x->te_ypix; if (glist->gl_goprect) return glist->gl_obj.te_ypix + x->te_ypix - glist->gl_ymargin; --- 2950,2959 ---- as an offset into the parent rectangle. Finally, it might be an old, proportional-style GOP. In this case we do a coordinate transformation. */ ! static int text_xpix(t_text *x, t_glist *glist) { if (glist->gl_havewindow || !glist->gl_isgraph) return x->te_xpix; if (glist->gl_goprect) return glist->gl_obj.te_xpix + x->te_xpix - glist->gl_xmargin; return glist_xtopixels(glist, glist->gl_x1 + (glist->gl_x2 - glist->gl_x1) * x->te_xpix / (glist->gl_screenx2 - glist->gl_screenx1)); } ! static int text_ypix(t_text *x, t_glist *glist) { if (glist->gl_havewindow || !glist->gl_isgraph) return x->te_ypix; if (glist->gl_goprect) return glist->gl_obj.te_ypix + x->te_ypix - glist->gl_ymargin; *************** *** 2947,2957 **** } ! /* redraw all the items in a glist. We construe this to mean ! redrawing in its own window and on parent, as needed in each case. ! This is too conservative -- for instance, when you draw an "open" ! rectangle on the parent, you shouldn't have to redraw the window! */ ! void glist_redraw(t_glist *x) { if (glist_isvisible(x)) { - /* LATER fix the graph_vis() code to handle both cases */ if (glist_istoplevel(x)) { t_gobj *g; --- 2961,2969 ---- } ! /* redraw all the items in a glist. We construe this to mean redrawing in its own window and ! on parent, as needed in each case. This is too conservative -- for instance, when you draw an ! "open" rectangle on the parent, you shouldn't have to redraw the window! */ ! static void glist_redraw(t_glist *x) { if (glist_isvisible(x)) { if (glist_istoplevel(x)) { t_gobj *g; *************** *** 3392,3397 **** } ! void glist_read(t_glist *x, t_symbol *filename, t_symbol *format) {glist_doread(x,filename,format,1);} ! void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format) {glist_doread(x,filename,format,0);} /* read text from a "properties" window, called from a gfxstub set --- 3404,3409 ---- } ! static void glist_read(t_glist *x, t_symbol *filename, t_symbol *format) {glist_doread(x,filename,format,1);} ! static void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format) {glist_doread(x,filename,format,0);} /* read text from a "properties" window, called from a gfxstub set *************** *** 3543,3547 **** /* write all "scalars" in a glist to a binbuf. */ ! t_binbuf *glist_writetobinbuf(t_glist *x, int wholething) { int i; t_symbol **templatevec = (t_symbol **)getbytes(0); --- 3555,3559 ---- /* write all "scalars" in a glist to a binbuf. */ ! static t_binbuf *glist_writetobinbuf(t_glist *x, int wholething) { int i; t_symbol **templatevec = (t_symbol **)getbytes(0); *************** *** 4206,4211 **** t_voutlet *x = (t_voutlet *)pd_new(voutlet_class); x->x_canvas = canvas_getcurrent(); ! x->x_parentoutlet = canvas_addoutlet(x->x_canvas, ! &x->x_obj.ob_pd, &s_signal); inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); x->x_endbuf = x->x_buf = (t_float *)getalignedbytes(0); --- 4218,4222 ---- t_voutlet *x = (t_voutlet *)pd_new(voutlet_class); x->x_canvas = canvas_getcurrent(); ! x->x_parentoutlet = canvas_addoutlet(x->x_canvas, &x->x_obj.ob_pd, &s_signal); inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); x->x_endbuf = x->x_buf = (t_float *)getalignedbytes(0); *************** *** 7398,7402 **** } ! void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) { if (x->te_type == T_OBJECT) { t_binbuf *b = binbuf_new(); --- 7409,7413 ---- } ! static void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) { if (x->te_type == T_OBJECT) { t_binbuf *b = binbuf_new();

1 0

pd/src desire.c, 1.1.2.143, 1.1.2.144 desire.h, 1.1.2.18, 1.1.2.19
by Mathieu Bouchard 03 Sep '06

03 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17753 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: . Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -C2 -d -r1.1.2.18 -r1.1.2.19 *** desire.h 3 Sep 2006 04:57:34 -0000 1.1.2.18 --- desire.h 3 Sep 2006 05:14:04 -0000 1.1.2.19 *************** *** 112,116 **** unsigned int gl_loading:1; /* am now loading from file */ unsigned int gl_willvis:1; /* make me visible after loading */ - unsigned int gl_edit:1; /* edit mode */ unsigned int gl_goprect:1; /* draw rectangle for graph-on-parent */ unsigned int gl_isgraph:1; /* show as graph on parent */ --- 112,115 ---- *************** *** 217,228 **** EXTERN t_canvas *glist_getcanvas(t_glist *x); EXTERN void glist_delete(t_glist *x, t_gobj *y); - - /* -------------------- TO BE SORTED OUT --------------------- */ - EXTERN void glist_retext(t_glist *x, t_text *y); EXTERN int glist_isvisible(t_glist *x); EXTERN int glist_istoplevel(t_glist *x); ! EXTERN t_glist *glist_findgraph(t_glist *x); ! EXTERN int glist_getfont(t_glist *x); ! EXTERN void glist_sort(t_glist *canvas); EXTERN void glist_read(t_glist *x, t_symbol *filename, t_symbol *format); EXTERN void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format); --- 216,228 ---- EXTERN t_canvas *glist_getcanvas(t_glist *x); EXTERN void glist_delete(t_glist *x, t_gobj *y); EXTERN int glist_isvisible(t_glist *x); EXTERN int glist_istoplevel(t_glist *x); ! EXTERN t_canvas *canvas_getcurrent(void); ! EXTERN void canvas_deletelinesfor(t_canvas *x, t_text *text); ! EXTERN void canvas_deletelinesforio(t_canvas *x, t_text *text, t_inlet *inp, t_outlet *outp); ! EXTERN void linetraverser_start(t_linetraverser *t, t_canvas *x); ! EXTERN t_outconnect *linetraverser_next(t_linetraverser *t); ! ! /* -------------------- TO BE SORTED OUT --------------------- */ EXTERN void glist_read(t_glist *x, t_symbol *filename, t_symbol *format); EXTERN void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format); *************** *** 238,255 **** float x1, float y1, float x2, float y2, float px1, float py1, float px2, float py2); - EXTERN void glist_arraydialog(t_glist *parent, t_symbol *name, - t_floatarg size, t_floatarg saveit, t_floatarg newgraph); EXTERN t_binbuf *glist_writetobinbuf(t_glist *x, int wholething); EXTERN int glist_isgraph(t_glist *x); EXTERN void glist_redraw(t_glist *x); - EXTERN void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime, - char *tag, int x1, int y1, int x2, int y2); - EXTERN void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag); EXTERN void canvas_create_editor(t_glist *x, int createit); - void canvas_deletelinesforio(t_canvas *x, t_text *text, t_inlet *inp, t_outlet *outp); - EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); - EXTERN void text_drawborder(t_text *x, t_glist *glist, char *tag, int width, int height, int firsttime); - EXTERN void text_eraseborder(t_text *x, t_glist *glist, char *tag); EXTERN int text_xcoord(t_text *x, t_glist *glist); EXTERN int text_ycoord(t_text *x, t_glist *glist); --- 238,246 ---- *************** *** 262,266 **** EXTERN t_symbol *canvas_makebindsym(t_symbol *s); EXTERN void canvas_vistext(t_canvas *x, t_text *y); - EXTERN void canvas_deletelinesfor(t_canvas *x, t_text *text); EXTERN void canvas_redraw(t_canvas *x); --- 253,256 ---- *************** *** 271,284 **** EXTERN void canvas_redrawallfortemplate(t_template *tmpl, int action); EXTERN void canvas_redrawallfortemplatecanvas(t_canvas *x, int action); - EXTERN void canvas_setusedastemplate(t_canvas *x); - EXTERN t_canvas *canvas_getcurrent(void); EXTERN t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s); EXTERN t_canvas *canvas_getrootfor(t_canvas *x); EXTERN void canvas_dirty(t_canvas *x, t_int n); - EXTERN int canvas_getfont(t_canvas *x); EXTERN void canvas_resortinlets(t_canvas *x); EXTERN void canvas_resortoutlets(t_canvas *x); EXTERN void canvas_free(t_canvas *x); - EXTERN void canvas_editmode(t_canvas *x, t_floatarg yesplease); EXTERN int canvas_isabstraction(t_canvas *x); EXTERN int canvas_istable(t_canvas *x); --- 261,270 ---- *************** *** 290,319 **** EXTERN int canvas_setdeleting(t_canvas *x, int flag); EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); - EXTERN void canvas_connect(t_canvas *x, - t_floatarg fwhoout, t_floatarg foutno,t_floatarg fwhoin, t_floatarg finno); - EXTERN void canvas_disconnect(t_canvas *x, - float index1, float outno, float index2, float inno); - EXTERN int canvas_isconnected (t_canvas *x, t_text *ob1, int n1, t_text *ob2, int n2); - EXTERN void canvas_selectinrect(t_canvas *x, int lox, int loy, int hix, int hiy); - EXTERN void canvas_fattenforscalars(t_canvas *x, int *x1, int *y1, int *x2, int *y2); EXTERN void canvas_visforscalars(t_canvas *x, t_glist *glist, int vis); EXTERN int canvas_clicksub(t_canvas *x, int xpix, int ypix, int shift, int alt, int dbl, int doit); EXTERN t_glist *canvas_getglistonsuper(void); - 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); - EXTERN t_template *garray_template(t_garray *x); - EXTERN t_garray *graph_array(t_glist *gl, t_symbol *s, t_symbol *tmpl, t_floatarg f, t_floatarg saveit); EXTERN t_array *array_new(t_symbol *templatesym, t_gpointer *parent); EXTERN void array_resize(t_array *x, int n); EXTERN void array_free(t_array *x); - EXTERN t_gstub *gstub_new(t_glist *gl, t_array *a); EXTERN void gstub_cutoff(t_gstub *gs); EXTERN void gpointer_setglist(t_gpointer *gp, t_glist *glist, t_scalar *x); - EXTERN void word_init(t_word *wp, t_template *tmpl, t_gpointer *gp); EXTERN void word_restore(t_word *wp, t_template *tmpl, int argc, t_atom *argv); --- 276,291 ---- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.143 retrieving revision 1.1.2.144 diff -C2 -d -r1.1.2.143 -r1.1.2.144 *** desire.c 3 Sep 2006 04:57:33 -0000 1.1.2.143 --- desire.c 3 Sep 2006 05:14:01 -0000 1.1.2.144 *************** *** 456,464 **** } - void linetraverser_skipobject(t_linetraverser *t) { - t->tr_nextoc = 0; - t->tr_nextoutno = t->tr_nout; - } - /* -------------------- the canvas object -------------------------- */ int glist_valid = 10000; --- 456,459 ---- *************** *** 536,540 **** } x->gl_willvis = vis; - x->gl_edit = !strncmp(x->gl_name->s_name, "Untitled", 8); x->gl_font = sys_nearestfontsize(font); pd_pushsym((t_pd *)x); --- 531,534 ---- *************** *** 791,795 **** int glist_istoplevel(t_glist *x) {return x->gl_havewindow || !x->gl_isgraph;} ! int glist_getfont(t_glist *x) { while (!x->gl_env) if (!(x = x->gl_owner)) bug("t_canvasenvironment"); return x->gl_font; --- 785,789 ---- int glist_istoplevel(t_glist *x) {return x->gl_havewindow || !x->gl_isgraph;} ! static int glist_getfont(t_glist *x) { while (!x->gl_env) if (!(x = x->gl_owner)) bug("t_canvasenvironment"); return x->gl_font; *************** *** 1379,1383 **** } ! int canvas_isconnected (t_canvas *x, t_text *ob1, int n1, t_text *ob2, int n2) { t_linetraverser t; t_outconnect *oc; --- 1373,1378 ---- } ! /* keep me */ ! static int canvas_isconnected (t_canvas *x, t_text *ob1, int n1, t_text *ob2, int n2) { t_linetraverser t; t_outconnect *oc; *************** *** 1430,1434 **** canvas_find_index2 = myindex2; vmess((t_pd *)x, gensym("menu-open"), ""); - canvas_editmode(x, 1.); return 1; } --- 1425,1428 ---- *************** *** 1484,1488 **** /* got it... now show it. */ canvas_vis(glist_getcanvas(gl), 1); - canvas_editmode(glist_getcanvas(gl), 1.); return 1; } --- 1478,1481 ---- *************** *** 1594,1604 **** #define NHIST 15 - void canvas_editmode(t_canvas *x, t_floatarg fyesplease) { - int yesplease = fyesplease; - if (yesplease && x->gl_edit) return; - x->gl_edit = !x->gl_edit; - sys_mgui(glist_getcanvas(x),"editmode=","i",x->gl_edit); - } - static t_glist *canvas_last_glist; static int canvas_last_glist_x, canvas_last_glist_y; --- 1587,1590 ---- *************** *** 1867,1873 **** } /* this is called back from the dialog window to create a garray. The otherflag requests that we find an existing graph to put it in. */ ! void glist_arraydialog(t_glist *parent, t_symbol *name, t_floatarg size, t_floatarg fflags, t_floatarg otherflag) { t_glist *gl; --- 1853,1861 ---- } + t_glist *glist_findgraph(t_glist *x); + /* this is called back from the dialog window to create a garray. The otherflag requests that we find an existing graph to put it in. */ ! static void glist_arraydialog(t_glist *parent, t_symbol *name, t_floatarg size, t_floatarg fflags, t_floatarg otherflag) { t_glist *gl; *************** *** 2681,2688 **** } - void glist_retext(t_glist *glist, t_text *y) { - if (glist->gl_editor && glist->gl_editor->e_rtext) gobj_changed(y,0); - } - t_canvas *glist_getcanvas(t_glist *x) { while (x->gl_owner && !x->gl_havewindow && x->gl_isgraph) x = x->gl_owner; --- 2669,2672 ---- *************** *** 2963,2970 **** } ! /* redraw all the items in a glist. We construe this to mean ! redrawing in its own window and on parent, as needed in each case. ! This is too conservative -- for instance, when you draw an "open" ! rectangle on the parent, you shouldn't have to redraw the window! */ void glist_redraw(t_glist *x) { if (glist_isvisible(x)) { --- 2947,2954 ---- } ! /* redraw all the items in a glist. We construe this to mean ! redrawing in its own window and on parent, as needed in each case. ! This is too conservative -- for instance, when you draw an "open" ! rectangle on the parent, you shouldn't have to redraw the window! */ void glist_redraw(t_glist *x) { if (glist_isvisible(x)) { *************** *** 2972,2977 **** if (glist_istoplevel(x)) { t_gobj *g; ! for (g = x->gl_list; g; g = g->g_next) gobj_changed(x,0); ! sys_mgui(x,"draw_canvas_wires",""); canvas_drawredrect(x, 0); if (x->gl_goprect) canvas_drawredrect(x, 1); --- 2956,2960 ---- if (glist_istoplevel(x)) { t_gobj *g; ! glist_each(g,x) gobj_changed(x,0); canvas_drawredrect(x, 0); if (x->gl_goprect) canvas_drawredrect(x, 1); *************** *** 4325,4334 **** } ! /* make a new scalar and add to the glist. We create a "gp" here which ! will be used for array items to point back here. This gp doesn't do ! reference counting or "validation" updates though; the parent won't go away ! without the contained arrays going away too. The "gp" is copied out ! by value in the word_init() routine so we can throw our copy away. */ ! t_scalar *scalar_new(t_glist *owner, t_symbol *templatesym) { t_scalar *x; --- 4308,4316 ---- } ! /* make a new scalar and add to the glist. We create a "gp" here which ! will be used for array items to point back here. This gp doesn't do ! reference counting or "validation" updates though; the parent won't go away ! without the contained arrays going away too. The "gp" is copied out ! by value in the word_init() routine so we can throw our copy away. */ t_scalar *scalar_new(t_glist *owner, t_symbol *templatesym) { t_scalar *x; *************** *** 6991,6995 **** } else { int xpix, ypix; - pd_vmess((t_pd *)glist_getcanvas(gl), gensym("editmode"), "i", 1); SETSYMBOL(&at, gensym("comment")); glist_getnextxy(gl, &xpix, &ypix); --- 6973,6976 ---- *************** *** 7040,7044 **** } else { int xpix, ypix; - pd_vmess((t_pd *)gl, gensym("editmode"), "i", 1); glist_getnextxy(gl, &xpix, &ypix); canvas_objtext(gl, xpix, ypix, 1, b); --- 7021,7024 ---- *************** *** 7050,7054 **** t_binbuf *b = binbuf_new(); int xpix, ypix; - pd_vmess((t_pd *)gl, gensym("editmode"), "i", 1); SETSYMBOL(&at, guiobjname); binbuf_restore(b, 1, &at); --- 7030,7033 ---- *************** *** 7116,7125 **** binbuf_clear(x->m_text.te_binbuf); binbuf_add(x->m_text.te_binbuf, argc, argv); ! glist_retext(x->m_glist, &x->m_text); } static void message_add2(t_message *x, t_symbol *s, int argc, t_atom *argv) { binbuf_add(x->m_text.te_binbuf, argc, argv); ! glist_retext(x->m_glist, &x->m_text); } --- 7095,7104 ---- binbuf_clear(x->m_text.te_binbuf); binbuf_add(x->m_text.te_binbuf, argc, argv); ! gobj_changed(x->m_glist,0); } static void message_add2(t_message *x, t_symbol *s, int argc, t_atom *argv) { binbuf_add(x->m_text.te_binbuf, argc, argv); ! gobj_changed(x->m_glist,0); } *************** *** 7127,7131 **** binbuf_add(x->m_text.te_binbuf, argc, argv); binbuf_addsemi(x->m_text.te_binbuf); ! glist_retext(x->m_glist, &x->m_text); } --- 7106,7110 ---- binbuf_add(x->m_text.te_binbuf, argc, argv); binbuf_addsemi(x->m_text.te_binbuf); ! gobj_changed(x->m_glist,0); } *************** *** 7134,7152 **** SETCOMMA(&a); binbuf_add(x->m_text.te_binbuf, 1, &a); ! glist_retext(x->m_glist, &x->m_text); } ! static void message_addsemi(t_message *x) { ! message_add(x, 0, 0, 0); ! } static void message_adddollar(t_message *x, t_floatarg f) { t_atom a; int n = f; ! if (n < 0) ! n = 0; SETDOLLAR(&a, n); binbuf_add(x->m_text.te_binbuf, 1, &a); ! glist_retext(x->m_glist, &x->m_text); } --- 7113,7128 ---- SETCOMMA(&a); binbuf_add(x->m_text.te_binbuf, 1, &a); ! gobj_changed(x->m_glist,0); } ! static void message_addsemi(t_message *x) {message_add(x,0,0,0);} static void message_adddollar(t_message *x, t_floatarg f) { t_atom a; int n = f; ! if (n<0) n=0; SETDOLLAR(&a, n); binbuf_add(x->m_text.te_binbuf, 1, &a); ! gobj_changed(x->m_glist,0); } *************** *** 7155,7159 **** SETDOLLSYM(&a, s); binbuf_add(x->m_text.te_binbuf, 1, &a); ! glist_retext(x->m_glist, &x->m_text); } --- 7131,7135 ---- SETDOLLSYM(&a, s); binbuf_add(x->m_text.te_binbuf, 1, &a); ! gobj_changed(x->m_glist,0); } *************** *** 7173,7177 **** } else { int xpix, ypix; - pd_vmess((t_pd *)gl, gensym("editmode"), "i", 1); glist_getnextxy(gl, &xpix, &ypix); x->m_text.te_xpix = xpix-3; --- 7149,7152 ---- *************** *** 7352,7356 **** outlet_new(&x->a_text, x->a_atom.a_type == A_FLOAT ? &s_float: &s_symbol); inlet_new(&x->a_text, &x->a_text.te_pd, 0, 0); - pd_vmess((t_pd *)gl, gensym("editmode"), "i", 1); glist_getnextxy(gl, &xpix, &ypix); x->a_text.te_xpix = xpix; --- 7327,7330 ---- *************** *** 8806,8811 **** class_addmethod3(c,canvas_close,"close","F"); - class_addmethod3(c,canvas_editmode, "editmode","F"); - class_addmethod3(c,canvas_print, "print","s"); class_addmethod3(c,canvas_find, "find","*"); --- 8780,8783 ---- *************** *** 8830,8834 **** class_addmethod3(c,graph_ylabel,"ylabel","*"); class_addmethod3(c,graph_array,"array","sfsF"); - class_addmethod3(c,glist_arraydialog,"arraydialog","sfff"); class_addmethod3(c,glist_sort,"sort",""); --- 8802,8805 ----

1 0

pd/src desire.c, 1.1.2.142, 1.1.2.143 desire.h, 1.1.2.17, 1.1.2.18
by Mathieu Bouchard 03 Sep '06

03 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10575 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: rtext is dead. Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -C2 -d -r1.1.2.17 -r1.1.2.18 *** desire.h 3 Sep 2006 04:52:39 -0000 1.1.2.17 --- desire.h 3 Sep 2006 04:57:34 -0000 1.1.2.18 *************** *** 258,267 **** EXTERN int text_shouldvis(t_text *x, t_glist *glist); - EXTERN t_rtext *rtext_new(t_glist *glist, t_text *who); - EXTERN t_rtext *glist_findrtext(t_glist *gl, t_text *who); - EXTERN void rtext_free(t_rtext *x); - EXTERN void rtext_retext(t_rtext *x); - EXTERN void rtext_gettext(t_rtext *x, char **buf, int *bufsize); - EXTERN t_class *canvas_class; EXTERN t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv); --- 258,261 ---- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.142 retrieving revision 1.1.2.143 diff -C2 -d -r1.1.2.142 -r1.1.2.143 *** desire.c 3 Sep 2006 04:52:38 -0000 1.1.2.142 --- desire.c 3 Sep 2006 04:57:33 -0000 1.1.2.143 *************** *** 716,739 **** void canvas_create_editor(t_glist *x, int createit) { t_gobj *y; - t_object *ob; if (createit) { if (x->gl_editor) bug("canvas_create_editor"); ! else { ! x->gl_editor = editor_new(x); ! glist_each(y,x) { ! ob = pd_checkobject(&y->g_pd); ! if (ob) rtext_new(x, ob); ! } ! } } else { if (!x->gl_editor) bug("canvas_create_editor"); else { - glist_each(y,x) { - ob = pd_checkobject(&y->g_pd); - if (ob) { - t_rtext *r = glist_findrtext(x, ob); - if (r) rtext_free(r); - } - } editor_free(x->gl_editor, x); x->gl_editor = 0; --- 716,725 ---- void canvas_create_editor(t_glist *x, int createit) { t_gobj *y; if (createit) { if (x->gl_editor) bug("canvas_create_editor"); ! else x->gl_editor = editor_new(x); } else { if (!x->gl_editor) bug("canvas_create_editor"); else { editor_free(x->gl_editor, x); x->gl_editor = 0; *************** *** 2654,2658 **** void glist_delete(t_glist *x, t_gobj *y) { t_gobj *g; - t_object *ob; t_gotfn chkdsp = zgetfn(&y->g_pd, gensym("dsp")); int drawcommand = class_isdrawcommand(y->g_pd); --- 2640,2643 ---- *************** *** 2667,2671 **** sys_mgui(y,"delete",""); - if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); if (x->gl_list == y) { x->gl_list = y->g_next; --- 2652,2655 ---- *************** *** 2698,2706 **** void glist_retext(t_glist *glist, t_text *y) { ! if (glist->gl_editor && glist->gl_editor->e_rtext) { ! t_rtext *rt = glist_findrtext(glist, y); ! if (rt) rtext_retext(rt); ! gobj_changed(y,0); ! } } --- 2682,2686 ---- void glist_retext(t_glist *glist, t_text *y) { ! if (glist->gl_editor && glist->gl_editor->e_rtext) gobj_changed(y,0); } *************** *** 9053,9138 **** } } - - /* ---------------------------------------------------------------- */ - /* formerly g_rtext.c */ - - struct _rtext { - char *x_buf; - int x_bufsize; - t_text *x_text; - t_glist *x_glist; - struct _rtext *x_next; - }; - - t_rtext *rtext_new(t_glist *glist, t_text *who) { - t_rtext *x = (t_rtext *)getbytes(sizeof *x); - x->x_text = who; - x->x_glist = glist; - x->x_next = glist->gl_editor->e_rtext; - binbuf_gettext(who->te_binbuf, &x->x_buf, &x->x_bufsize); - glist->gl_editor->e_rtext = x; - return x; - } - - void rtext_free(t_rtext *x) { - t_editor *e = x->x_glist->gl_editor; - if (e->e_textedfor == x) e->e_textedfor = 0; - if (e->e_rtext == x) e->e_rtext = x->x_next; - else { - t_rtext *e2; - for (e2 = e->e_rtext; e2; e2 = e2->x_next) if (e2->x_next == x) { - e2->x_next = x->x_next; - break; - } - } - freebytes(x->x_buf, x->x_bufsize); - freebytes(x, sizeof *x); - } - - /* LATER deal with tcl-significant characters */ - void rtext_retext(t_rtext *x) { - t_text *text = x->x_text; - t_freebytes(x->x_buf, x->x_bufsize); - binbuf_gettext(text->te_binbuf, &x->x_buf, &x->x_bufsize); - /* special case: for number boxes, try to pare the number down - to the specified width of the box. */ - if (text->te_width > 0 && text->te_type == T_ATOM && x->x_bufsize > text->te_width) { - t_atom *atomp = binbuf_getvec(text->te_binbuf); - int natom = binbuf_getnatom(text->te_binbuf); - 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; - if (nextchar - decimal - 1 < wantreduce) goto giveup; - for (s1 = nextchar - wantreduce, s2 = s1 + wantreduce; s2 < ebuf; s1++, s2++) *s1 = *s2; - x->x_buf = t_resizebytes(x->x_buf, bufsize, text->te_width); - bufsize = text->te_width; - goto done; - giveup: - /* give up and bash it to "+" or "-" */ - x->x_buf[0] = (atomp->a_w.w_float < 0 ? '-' : '+'); - x->x_buf = t_resizebytes(x->x_buf, bufsize, 1); - bufsize = 1; - } else if (bufsize > text->te_width) { - x->x_buf[text->te_width - 1] = '>'; - x->x_buf = t_resizebytes(x->x_buf, bufsize, text->te_width); - bufsize = text->te_width; - } - done: - x->x_bufsize = bufsize; - } - } - - /* 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; - } - --- 9033,9034 ----

1 0

pd/src desire.c, 1.1.2.141, 1.1.2.142 desire.h, 1.1.2.16, 1.1.2.17
by Mathieu Bouchard 03 Sep '06

03 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8379 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: fixed crash introduced two commits ago by a typo. else, more cleanup of desire.[ch] Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -C2 -d -r1.1.2.16 -r1.1.2.17 *** desire.h 3 Sep 2006 04:23:43 -0000 1.1.2.16 --- desire.h 3 Sep 2006 04:52:39 -0000 1.1.2.17 *************** *** 118,126 **** }; - #define gl_gobj gl_obj.te_g - #define gl_pd gl_gobj.g_pd - /* a data structure to describe a field in a pure datum */ - #define DT_FLOAT 0 #define DT_SYMBOL 1 --- 118,122 ---- *************** *** 161,165 **** char x_saveit; /* true if we should save this with parent */ char x_listviewing; /* true if list view window is open */ - double x_lastupdate; /* T.Grill - clock_getlogicaltime() of last array update */ }; --- 157,160 ---- *************** *** 192,213 **** struct _parentwidgetbehavior { ! t_parentgetrectfn w_parentgetrectfn; t_parentdisplacefn w_parentdisplacefn; ! t_parentselectfn w_parentselectfn; t_parentactivatefn w_parentactivatefn; ! t_parentvisfn w_parentvisfn; ! t_parentclickfn w_parentclickfn; }; ! /* cursor definitions; used as return value for t_parentclickfn */ #define CURSOR_RUNMODE_CLICKME 1 #define CURSOR_RUNMODE_THICKEN 2 #define CURSOR_RUNMODE_ADDPOINT 3 #define CURSOR_EDITMODE_DISCONNECT 6 ! EXTERN void canvas_setcursor(t_glist *x, unsigned int cursornum); ! ! extern t_canvas *canvas_editing; /* last canvas to start text edting */ ! extern t_canvas *canvas_whichfind; /* last canvas we did a find in */ ! extern t_canvas *canvas_list; /* list of all root canvases */ extern t_class *vinlet_class, *voutlet_class; extern int glist_valid; /* incremented when pointers might be stale */ --- 187,204 ---- struct _parentwidgetbehavior { ! t_parentgetrectfn w_parentgetrectfn; t_parentdisplacefn w_parentdisplacefn; ! t_parentselectfn w_parentselectfn; t_parentactivatefn w_parentactivatefn; ! t_parentvisfn w_parentvisfn; ! t_parentclickfn w_parentclickfn; }; ! /* cursor definitions; used as return value for t_parentclickfn */ #define CURSOR_RUNMODE_CLICKME 1 #define CURSOR_RUNMODE_THICKEN 2 #define CURSOR_RUNMODE_ADDPOINT 3 #define CURSOR_EDITMODE_DISCONNECT 6 ! extern t_canvas *canvas_list; /* list of all root canvases */ extern t_class *vinlet_class, *voutlet_class; extern int glist_valid; /* incremented when pointers might be stale */ *************** *** 217,233 **** #define PLOTSTYLE_BEZ 2 ! /* ------------------- functions on any gobj ----------------------------- */ EXTERN void gobj_save(t_gobj *x, t_binbuf *b); - EXTERN void gobj_properties(t_gobj *x, struct _glist *glist); ! /* -------------------- functions on glists --------------------- */ ! EXTERN t_glist *glist_new( void); EXTERN void glist_init(t_glist *x); EXTERN void glist_add(t_glist *x, t_gobj *g); - EXTERN void glist_cleanup(t_glist *x); - EXTERN void glist_free(t_glist *x); - EXTERN void glist_clear(t_glist *x); EXTERN t_canvas *glist_getcanvas(t_glist *x); EXTERN void glist_delete(t_glist *x, t_gobj *y); EXTERN void glist_retext(t_glist *x, t_text *y); EXTERN int glist_isvisible(t_glist *x); --- 208,222 ---- #define PLOTSTYLE_BEZ 2 ! /* from m_pd.c */ EXTERN void gobj_save(t_gobj *x, t_binbuf *b); ! /* from desire.c */ ! EXTERN t_glist *glist_new(void); EXTERN void glist_init(t_glist *x); EXTERN void glist_add(t_glist *x, t_gobj *g); EXTERN t_canvas *glist_getcanvas(t_glist *x); EXTERN void glist_delete(t_glist *x, t_gobj *y); + + /* -------------------- TO BE SORTED OUT --------------------- */ EXTERN void glist_retext(t_glist *x, t_text *y); EXTERN int glist_isvisible(t_glist *x); Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.141 retrieving revision 1.1.2.142 diff -C2 -d -r1.1.2.141 -r1.1.2.142 *** desire.c 3 Sep 2006 04:23:42 -0000 1.1.2.141 --- desire.c 3 Sep 2006 04:52:38 -0000 1.1.2.142 *************** *** 407,413 **** void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { ! if (strcmp(x->gl_name->s_name, "Pd")) pd_unbind(&x->gl_pd, canvas_makebindsym(x->gl_name)); x->gl_name = s; ! if (strcmp(x->gl_name->s_name, "Pd")) pd_bind(&x->gl_pd, canvas_makebindsym(x->gl_name)); if (dir && dir != &s_) canvas_getenv(x)->ce_dir = dir; gobj_changed(x,0); --- 407,413 ---- void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { ! if (strcmp(x->gl_name->s_name, "Pd")) pd_unbind((t_pd *)x, canvas_makebindsym(x->gl_name)); x->gl_name = s; ! if (strcmp(x->gl_name->s_name, "Pd")) pd_bind((t_pd *)x, canvas_makebindsym(x->gl_name)); if (dir && dir != &s_) canvas_getenv(x)->ce_dir = dir; gobj_changed(x,0); *************** *** 524,528 **** (canvas_newfilename ? canvas_newfilename : gensym("Pd"))); if (strcmp(x->gl_name->s_name, "Pd")) ! 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 */ --- 524,528 ---- (canvas_newfilename ? canvas_newfilename : gensym("Pd"))); if (strcmp(x->gl_name->s_name, "Pd")) ! pd_bind((t_pd *)x, canvas_makebindsym(x->gl_name)); x->gl_loading = 1; x->gl_goprect = 0; /* no GOP rectangle unless it's turned on later */ *************** *** 538,542 **** x->gl_edit = !strncmp(x->gl_name->s_name, "Untitled", 8); x->gl_font = sys_nearestfontsize(font); ! pd_pushsym(&x->gl_pd); x->gl_next_add = -1; return x; --- 538,542 ---- x->gl_edit = !strncmp(x->gl_name->s_name, "Untitled", 8); x->gl_font = sys_nearestfontsize(font); ! pd_pushsym((t_pd *)x); x->gl_next_add = -1; return x; *************** *** 550,556 **** if (argc <= 7) canvas_setgraph(x, atom_getintarg(6, argc, argv), 1); else { - x->gl_xmargin = atom_getintarg(7, argc, argv); - x->gl_ymargin = atom_getintarg(8, argc, argv); canvas_setgraph(x, atom_getintarg(6, argc, argv), 0); } } --- 550,556 ---- if (argc <= 7) canvas_setgraph(x, atom_getintarg(6, argc, argv), 1); else { canvas_setgraph(x, atom_getintarg(6, argc, argv), 0); + x->gl_xmargin = atom_getintarg(7, argc, argv); + x->gl_ymargin = atom_getintarg(8, argc, argv); } } *************** *** 597,602 **** x->gl_screenx2 = 450; x->gl_screeny2 = 300; ! if (strcmp(x->gl_name->s_name, "Pd")) ! pd_bind(&x->gl_pd, canvas_makebindsym(x->gl_name)); x->gl_owner = g; x->gl_isgraph = 1; --- 597,601 ---- x->gl_screenx2 = 450; x->gl_screeny2 = 300; ! if (strcmp(x->gl_name->s_name, "Pd")) pd_bind((t_pd *)x, canvas_makebindsym(x->gl_name)); x->gl_owner = g; x->gl_isgraph = 1; *************** *** 604,609 **** x->gl_obj.te_binbuf = binbuf_new(); binbuf_addv(x->gl_obj.te_binbuf, "s", gensym("graph")); ! if (!menu) pd_pushsym(&x->gl_pd); ! glist_add(g, &x->gl_gobj); if (glist_isvisible(g)) canvas_create_editor(x, 1); return x; --- 603,608 ---- x->gl_obj.te_binbuf = binbuf_new(); binbuf_addv(x->gl_obj.te_binbuf, "s", gensym("graph")); ! if (!menu) pd_pushsym((t_pd *)x); ! glist_add(g, (t_gobj *)x); if (glist_isvisible(g)) canvas_create_editor(x, 1); return x; *************** *** 703,707 **** x->e_glist = owner; sprintf(buf, ".x%lx", (long)owner); ! x->e_guiconnect = guiconnect_new(&owner->gl_pd, gensym(buf)); return x; } --- 702,706 ---- x->e_glist = owner; sprintf(buf, ".x%lx", (long)owner); ! x->e_guiconnect = guiconnect_new((t_pd *)owner, gensym(buf)); return x; } *************** *** 819,823 **** sys_mgui(x,"delete",""); if (strcmp(x->gl_name->s_name, "Pd")) ! pd_unbind(&x->gl_pd, canvas_makebindsym(x->gl_name)); if (x->gl_env) { freebytes(x->gl_env->ce_argv, x->gl_env->ce_argc * sizeof(t_atom)); --- 818,822 ---- sys_mgui(x,"delete",""); if (strcmp(x->gl_name->s_name, "Pd")) ! pd_unbind((t_pd *)x, canvas_makebindsym(x->gl_name)); if (x->gl_env) { freebytes(x->gl_env->ce_argv, x->gl_env->ce_argc * sizeof(t_atom)); *************** *** 825,829 **** } canvas_resume_dsp(dspstate); ! glist_cleanup(x); gfxstub_deleteforkey(x); /* probably unnecessary */ if (!x->gl_owner) canvas_takeofflist(x); --- 824,830 ---- } canvas_resume_dsp(dspstate); ! freebytes(x->gl_xlabel, x->gl_nxlabels * sizeof(*(x->gl_xlabel))); ! freebytes(x->gl_ylabel, x->gl_nylabels * sizeof(*(x->gl_ylabel))); ! gstub_cutoff(x->gl_stub); gfxstub_deleteforkey(x); /* probably unnecessary */ if (!x->gl_owner) canvas_takeofflist(x); *************** *** 861,865 **** static void canvas_pop(t_canvas *x, t_floatarg fvis) { if (fvis!=0) canvas_vis(x, 1); ! pd_popsym(&x->gl_pd); canvas_resortinlets(x); canvas_resortoutlets(x); --- 862,866 ---- static void canvas_pop(t_canvas *x, t_floatarg fvis) { if (fvis!=0) canvas_vis(x, 1); ! pd_popsym((t_pd *)x); canvas_resortinlets(x); canvas_resortoutlets(x); *************** *** 955,960 **** void canvas_popabstraction(t_canvas *x) { ! newest = &x->gl_pd; ! pd_popsym(&x->gl_pd); x->gl_loading = 0; canvas_resortinlets(x); --- 956,961 ---- void canvas_popabstraction(t_canvas *x) { ! newest = (t_pd *)x; ! pd_popsym((t_pd *)x); x->gl_loading = 0; canvas_resortinlets(x); *************** *** 1335,1339 **** if (x->gl_pixheight <= 0) x->gl_pixheight = GLIST_DEFGRAPHHEIGHT; /*if (x->gl_owner && !x->gl_loading && glist_isvisible(x->gl_owner)) ! gobj_vis(&x->gl_gobj, x->gl_owner, 0);*/ x->gl_isgraph = 1; if (!nogoprect && !x->gl_goprect) { --- 1336,1340 ---- if (x->gl_pixheight <= 0) x->gl_pixheight = GLIST_DEFGRAPHHEIGHT; /*if (x->gl_owner && !x->gl_loading && glist_isvisible(x->gl_owner)) ! gobj_vis((t_gobj *)x, x->gl_owner, 0);*/ x->gl_isgraph = 1; if (!nogoprect && !x->gl_goprect) { *************** *** 1423,1427 **** void canvas_close(t_canvas *x) { ! if (x->gl_owner) canvas_vis(x, 0); else pd_free(&x->gl_pd); } --- 1424,1428 ---- void canvas_close(t_canvas *x) { ! if (x->gl_owner) canvas_vis(x, 0); else pd_free((t_pd *)x); } *************** *** 1442,1446 **** canvas_find_index1 = myindex1; canvas_find_index2 = myindex2; ! vmess(&x->gl_pd, gensym("menu-open"), ""); canvas_editmode(x, 1.); return 1; --- 1443,1447 ---- canvas_find_index1 = myindex1; canvas_find_index2 = myindex2; ! vmess((t_pd *)x, gensym("menu-open"), ""); canvas_editmode(x, 1.); return 1; *************** *** 1557,1563 **** static void canvas_restoreconnections(t_canvas *x) { ! pd_bind(&x->gl_pd, gensym("#X")); binbuf_eval(x->gl_editor->e_connectbuf, 0, 0, 0); ! pd_unbind(&x->gl_pd, gensym("#X")); } --- 1558,1564 ---- static void canvas_restoreconnections(t_canvas *x) { ! pd_bind((t_pd *)x, gensym("#X")); binbuf_eval(x->gl_editor->e_connectbuf, 0, 0, 0); ! pd_unbind((t_pd *)x, gensym("#X")); } *************** *** 1802,1807 **** } - static void garray_update(t_garray *x) {x->x_lastupdate = clock_getlogicaltime();} - /* get the "array" structure and furthermore check it's float */ static t_array *garray_getarray_floatonly(t_garray *x, int *yonsetp, int *elemsizep) { --- 1803,1806 ---- *************** *** 1826,1830 **** t_glist *gl = x->x_glist; if (gl->gl_list == &x->x_gobj && !x->x_gobj.g_next) { ! vmess(&gl->gl_pd, gensym("bounds"), "ffff", 0., gl->gl_y1, (double)(style == PLOTSTYLE_POINTS || n == 1 ? n : n-1), gl->gl_y2); /* close any dialogs that might have the wrong info now... */ --- 1825,1829 ---- t_glist *gl = x->x_glist; if (gl->gl_list == &x->x_gobj && !x->x_gobj.g_next) { ! vmess((t_pd *)gl, gensym("bounds"), "ffff", 0., gl->gl_y1, (double)(style == PLOTSTYLE_POINTS || n == 1 ? n : n-1), gl->gl_y2); /* close any dialogs that might have the wrong info now... */ *************** *** 2309,2320 **** void garray_usedindsp(t_garray *x) {x->x_usedindsp = 1;} ! ! static void garray_doredraw(t_gobj *client, t_glist *glist) { ! t_garray *x = (t_garray *)client; ! gobj_changed(client,0); ! garray_update(x); ! } ! ! double garray_updatetime(t_garray *x) {return x->x_lastupdate;} void garray_redraw(t_garray *x) { --- 2308,2312 ---- void garray_usedindsp(t_garray *x) {x->x_usedindsp = 1;} ! static void garray_doredraw(t_gobj *client, t_glist *glist) {gobj_changed(client,0);} void garray_redraw(t_garray *x) { *************** *** 2324,2328 **** if (x->x_listviewing) sys_vgui("pdtk_array_listview_fillpage %s\n", x->x_realname->s_name); } - garray_update(x); } --- 2316,2319 ---- *************** *** 2481,2493 **** static void garray_bounds(t_garray *x, t_floatarg x1, t_floatarg y1, t_floatarg x2, t_floatarg y2) ! {vmess(&x->x_glist->gl_pd, gensym("bounds"), "ffff", x1, y1, x2, y2);} static void garray_xticks(t_garray *x, t_floatarg point, t_floatarg inc, t_floatarg f) ! {vmess(&x->x_glist->gl_pd, gensym("xticks"), "fff", point, inc, f);} static void garray_yticks(t_garray *x, t_floatarg point, t_floatarg inc, t_floatarg f) ! {vmess(&x->x_glist->gl_pd, gensym("yticks"), "fff", point, inc, f);} static void garray_xlabel(t_garray *x, t_symbol *s, int argc, t_atom *argv) ! {typedmess(&x->x_glist->gl_pd, s, argc, argv);} static void garray_ylabel(t_garray *x, t_symbol *s, int argc, t_atom *argv) ! {typedmess(&x->x_glist->gl_pd, s, argc, argv);} /* change the name of a garray. */ --- 2472,2484 ---- static void garray_bounds(t_garray *x, t_floatarg x1, t_floatarg y1, t_floatarg x2, t_floatarg y2) ! {vmess((t_pd *)x->x_glist, gensym("bounds"), "ffff", x1, y1, x2, y2);} static void garray_xticks(t_garray *x, t_floatarg point, t_floatarg inc, t_floatarg f) ! {vmess((t_pd *)x->x_glist, gensym("xticks"), "fff", point, inc, f);} static void garray_yticks(t_garray *x, t_floatarg point, t_floatarg inc, t_floatarg f) ! {vmess((t_pd *)x->x_glist, gensym("yticks"), "fff", point, inc, f);} static void garray_xlabel(t_garray *x, t_symbol *s, int argc, t_atom *argv) ! {typedmess((t_pd *)x->x_glist, s, argc, argv);} static void garray_ylabel(t_garray *x, t_symbol *s, int argc, t_atom *argv) ! {typedmess((t_pd *)x->x_glist, s, argc, argv);} /* change the name of a garray. */ *************** *** 2775,2789 **** } - void glist_cleanup(t_glist *x) { - freebytes(x->gl_xlabel, x->gl_nxlabels * sizeof(*(x->gl_xlabel))); - freebytes(x->gl_ylabel, x->gl_nylabels * sizeof(*(x->gl_ylabel))); - gstub_cutoff(x->gl_stub); - } - - void glist_free(t_glist *x) { - glist_cleanup(x); - freebytes(x, sizeof(*x)); - } - /* --------------- inlets and outlets ----------- */ --- 2766,2769 ---- *************** *** 2949,2953 **** if (x->gl_havewindow) return x->gl_x1 + width * xpix / (x->gl_screenx2-x->gl_screenx1); if (!x->gl_owner) bug("glist_pixelstox"); ! graph_graphrect(&x->gl_gobj, x->gl_owner, &x1, &y1, &x2, &y2); return x->gl_x1 + width * (xpix-x1) / (x2-x1); } --- 2929,2933 ---- if (x->gl_havewindow) return x->gl_x1 + width * xpix / (x->gl_screenx2-x->gl_screenx1); if (!x->gl_owner) bug("glist_pixelstox"); ! graph_graphrect((t_gobj *)x, x->gl_owner, &x1, &y1, &x2, &y2); return x->gl_x1 + width * (xpix-x1) / (x2-x1); } *************** *** 2958,2962 **** if (x->gl_havewindow) return x->gl_y1 + height * ypix / (x->gl_screeny2-x->gl_screeny1); if (!x->gl_owner) bug("glist_pixelstox"); ! graph_graphrect(&x->gl_gobj, x->gl_owner, &x1, &y1, &x2, &y2); return x->gl_y1 + height * (ypix-y1) / (y2-y1); } --- 2938,2942 ---- if (x->gl_havewindow) return x->gl_y1 + height * ypix / (x->gl_screeny2-x->gl_screeny1); if (!x->gl_owner) bug("glist_pixelstox"); ! graph_graphrect((t_gobj *)x, x->gl_owner, &x1, &y1, &x2, &y2); return x->gl_y1 + height * (ypix-y1) / (y2-y1); } *************** *** 2969,2973 **** if (x->gl_havewindow) return (x->gl_screenx2-x->gl_screenx1) * (xval-x->gl_x1) / width; if (!x->gl_owner) bug("glist_pixelstox"); ! graph_graphrect(&x->gl_gobj, x->gl_owner, &x1, &y1, &x2, &y2); return x1 + (x2 - x1) * (xval - x->gl_x1) / width; } --- 2949,2953 ---- if (x->gl_havewindow) return (x->gl_screenx2-x->gl_screenx1) * (xval-x->gl_x1) / width; if (!x->gl_owner) bug("glist_pixelstox"); ! graph_graphrect((t_gobj *)x, x->gl_owner, &x1, &y1, &x2, &y2); return x1 + (x2 - x1) * (xval - x->gl_x1) / width; } *************** *** 2978,2982 **** if (x->gl_havewindow) return (x->gl_screeny2-x->gl_screeny1) * (yval-x->gl_y1) / height; if (!x->gl_owner) bug("glist_pixelstox"); ! graph_graphrect(&x->gl_gobj, x->gl_owner, &x1, &y1, &x2, &y2); return y1 + (y2 - y1) * (yval - x->gl_y1) / height; } --- 2958,2962 ---- if (x->gl_havewindow) return (x->gl_screeny2-x->gl_screeny1) * (yval-x->gl_y1) / height; if (!x->gl_owner) bug("glist_pixelstox"); ! graph_graphrect((t_gobj *)x, x->gl_owner, &x1, &y1, &x2, &y2); return y1 + (y2 - y1) * (yval - x->gl_y1) / height; } *************** *** 3018,3023 **** } if (x->gl_owner && glist_isvisible(x->gl_owner)) { ! graph_vis(&x->gl_gobj, x->gl_owner, 0); ! graph_vis(&x->gl_gobj, x->gl_owner, 1); } } --- 2998,3003 ---- } if (x->gl_owner && glist_isvisible(x->gl_owner)) { ! graph_vis((t_gobj *)x, x->gl_owner, 0); ! graph_vis((t_gobj *)x, x->gl_owner, 1); } } *************** *** 3778,3782 **** post("saved to: %s/%s", dir->s_name, filename->s_name); canvas_dirty(x, 0); ! canvas_reload(filename, dir, &x->gl_gobj); } binbuf_free(b); --- 3758,3762 ---- post("saved to: %s/%s", dir->s_name, filename->s_name); canvas_dirty(x, 0); ! canvas_reload(filename, dir, (t_gobj *)x); } binbuf_free(b); *************** *** 7048,7052 **** newest = 0; binbuf_gettext(b,&s,&n); ! pd_pushsym((t_pd *)x); canvas_getargs(&argc, &argv); binbuf_eval(b, &pd_objectmaker, argc, argv); --- 7028,7032 ---- newest = 0; binbuf_gettext(b,&s,&n); ! pd_pushsym((t_pd *)gl); canvas_getargs(&argc, &argv); binbuf_eval(b, &pd_objectmaker, argc, argv); *************** *** 7080,7084 **** } else { int xpix, ypix; ! pd_vmess(&gl->gl_pd, gensym("editmode"), "i", 1); glist_getnextxy(gl, &xpix, &ypix); canvas_objtext(gl, xpix, ypix, 1, b); --- 7060,7064 ---- } else { int xpix, ypix; ! pd_vmess((t_pd *)gl, gensym("editmode"), "i", 1); glist_getnextxy(gl, &xpix, &ypix); canvas_objtext(gl, xpix, ypix, 1, b); *************** *** 7090,7094 **** t_binbuf *b = binbuf_new(); int xpix, ypix; ! pd_vmess(&gl->gl_pd, gensym("editmode"), "i", 1); SETSYMBOL(&at, guiobjname); binbuf_restore(b, 1, &at); --- 7070,7074 ---- t_binbuf *b = binbuf_new(); int xpix, ypix; ! pd_vmess((t_pd *)gl, gensym("editmode"), "i", 1); SETSYMBOL(&at, guiobjname); binbuf_restore(b, 1, &at); *************** *** 7213,7217 **** } else { int xpix, ypix; ! pd_vmess(&gl->gl_pd, gensym("editmode"), "i", 1); glist_getnextxy(gl, &xpix, &ypix); x->m_text.te_xpix = xpix-3; --- 7193,7197 ---- } else { int xpix, ypix; ! pd_vmess((t_pd *)gl, gensym("editmode"), "i", 1); glist_getnextxy(gl, &xpix, &ypix); x->m_text.te_xpix = xpix-3; *************** *** 7392,7396 **** outlet_new(&x->a_text, x->a_atom.a_type == A_FLOAT ? &s_float: &s_symbol); inlet_new(&x->a_text, &x->a_text.te_pd, 0, 0); ! pd_vmess(&gl->gl_pd, gensym("editmode"), "i", 1); glist_getnextxy(gl, &xpix, &ypix); x->a_text.te_xpix = xpix; --- 7372,7376 ---- outlet_new(&x->a_text, x->a_atom.a_type == A_FLOAT ? &s_float: &s_symbol); inlet_new(&x->a_text, &x->a_text.te_pd, 0, 0); ! pd_vmess((t_pd *)gl, gensym("editmode"), "i", 1); glist_getnextxy(gl, &xpix, &ypix); x->a_text.te_xpix = xpix; *************** *** 9110,9118 **** } - void rtext_gettext(t_rtext *x, char **buf, int *bufsize) { - *buf = x->x_buf; - *bufsize = x->x_bufsize; - } - /* LATER deal with tcl-significant characters */ void rtext_retext(t_rtext *x) { --- 9090,9093 ----

1 0

pd/src desire.c, 1.1.2.140, 1.1.2.141 desire.h, 1.1.2.15, 1.1.2.16
by Mathieu Bouchard 03 Sep '06

03 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27623 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: . Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** desire.h 3 Sep 2006 03:47:14 -0000 1.1.2.15 --- desire.h 3 Sep 2006 04:23:43 -0000 1.1.2.16 *************** *** 61,75 **** #define t_tscalar struct _tscalar EXTERN_STRUCT _canvasenvironment; ! #define t_canvasenvironment struct _canvasenvironment EXTERN_STRUCT _fielddesc; #define t_fielddesc struct _fielddesc - typedef struct _selection { - t_gobj *sel_what; - struct _selection *sel_next; - } t_selection; - /* this structure is instantiated whenever a glist becomes visible. */ - /* commented-out fields are not in DesireData */ typedef struct _editor { t_rtext *e_rtext; /* text responder linked list */ --- 61,69 ---- #define t_tscalar struct _tscalar EXTERN_STRUCT _canvasenvironment; ! #define t_canvasenvironment struct _canvasenvironment EXTERN_STRUCT _fielddesc; #define t_fielddesc struct _fielddesc /* this structure is instantiated whenever a glist becomes visible. */ typedef struct _editor { t_rtext *e_rtext; /* text responder linked list */ *************** *** 77,86 **** t_gobj *e_grab; /* object being "dragged" */ t_binbuf *e_connectbuf; /* connections to deleted objects */ - t_binbuf *e_deleted; /* last stuff we deleted */ t_guiconnect *e_guiconnect; /* GUI connection for filtering messages */ struct _glist *e_glist; /* glist which owns this */ - unsigned int e_lastmoved: 1; /* one if mouse has moved since click */ - unsigned int e_textdirty: 1; /* one if e_textedfor has changed */ - unsigned int e_selectedline: 1; /* one if a line is selected */ } t_editor; --- 71,76 ---- *************** *** 116,120 **** int gl_font; /* nominal font size in points, e.g., 10 */ struct _glist *gl_next; /* link in list of toplevels */ ! t_canvasenvironment *gl_env; /* root canvases and abstractions only */ unsigned int gl_havewindow:1; /* true if we own a window */ unsigned int gl_mapped:1; /* true if, moreover, it's "mapped" */ --- 106,110 ---- int gl_font; /* nominal font size in points, e.g., 10 */ struct _glist *gl_next; /* link in list of toplevels */ ! t_canvasenvironment *gl_env; /* for root canvases and abstractions only */ unsigned int gl_havewindow:1; /* true if we own a window */ unsigned int gl_mapped:1; /* true if, moreover, it's "mapped" */ *************** *** 123,132 **** unsigned int gl_willvis:1; /* make me visible after loading */ unsigned int gl_edit:1; /* edit mode */ - /* unsigned int gl_isdeleting:1; we're inside glist_delete -- hack! */ unsigned int gl_goprect:1; /* draw rectangle for graph-on-parent */ unsigned int gl_isgraph:1; /* show as graph on parent */ ! #ifdef DESIRE ! long gl_next_add; /* insertion point for next call to glist_add */ ! #endif }; --- 113,119 ---- unsigned int gl_willvis:1; /* make me visible after loading */ unsigned int gl_edit:1; /* edit mode */ unsigned int gl_goprect:1; /* draw rectangle for graph-on-parent */ unsigned int gl_isgraph:1; /* show as graph on parent */ ! long gl_next_add; /* insertion point for next call to glist_add (for future use!?) */ }; *************** *** 177,181 **** }; ! /* structure for traversing all the connections in a glist */ typedef struct _linetraverser { t_canvas *tr_x; --- 164,168 ---- }; ! /* structure for traversing all the connections in a glist */ typedef struct _linetraverser { t_canvas *tr_x; *************** *** 195,210 **** doesn't work on array elements... LATER reconsider this */ ! typedef void (*t_parentgetrectfn)( t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int *x1, int *y1, int *x2, int *y2); ! typedef void (*t_parentdisplacefn)(t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int dx, int dy); ! typedef void (*t_parentselectfn)( t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int state); ! typedef void (*t_parentactivatefn)(t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int state); ! typedef void (*t_parentvisfn)( t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int flag); ! typedef int (*t_parentclickfn)( t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! t_scalar *sc, t_array *ap, float basex, float basey, int xpix, int ypix, int shift, int alt, int dbl, int doit); --- 182,192 ---- doesn't work on array elements... LATER reconsider this */ ! #define STUFF t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl ! typedef void (*t_parentgetrectfn)( STUFF, float basex, float basey, int *x1, int *y1, int *x2, int *y2); ! typedef void (*t_parentdisplacefn)(STUFF, float basex, float basey, int dx, int dy); ! typedef void (*t_parentselectfn)( STUFF, float basex, float basey, int state); ! typedef void (*t_parentactivatefn)(STUFF, float basex, float basey, int state); ! typedef void (*t_parentvisfn)( STUFF, float basex, float basey, int flag); ! typedef int (*t_parentclickfn)( STUFF, t_scalar *sc, t_array *ap, float basex, float basey, int xpix, int ypix, int shift, int alt, int dbl, int doit); *************** *** 308,313 **** EXTERN void canvas_setusedastemplate(t_canvas *x); EXTERN t_canvas *canvas_getcurrent(void); - EXTERN void canvas_setcurrent(t_canvas *x); - EXTERN void canvas_unsetcurrent(t_canvas *x); EXTERN t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s); EXTERN t_canvas *canvas_getrootfor(t_canvas *x); --- 290,293 ---- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.140 retrieving revision 1.1.2.141 diff -C2 -d -r1.1.2.140 -r1.1.2.141 *** desire.c 3 Sep 2006 03:47:13 -0000 1.1.2.140 --- desire.c 3 Sep 2006 04:23:42 -0000 1.1.2.141 *************** *** 353,362 **** } ! t_canvas *canvas_getcurrent(void) { ! return ((t_canvas *)pd_findbyclass(&s__X, canvas_class)); ! } ! ! void canvas_setcurrent (t_canvas *x) {pd_pushsym(&x->gl_pd);} ! void canvas_unsetcurrent(t_canvas *x) { pd_popsym(&x->gl_pd);} t_canvasenvironment *canvas_getenv(t_canvas *x) { --- 353,357 ---- } ! t_canvas *canvas_getcurrent(void) {return ((t_canvas *)pd_findbyclass(&s__X, canvas_class));} t_canvasenvironment *canvas_getenv(t_canvas *x) { *************** *** 383,389 **** if (*name == '$' && name[1] >= '0' && name[1] <= '9') { t_canvasenvironment *env = canvas_getenv(x); ! canvas_setcurrent(x); ret = binbuf_realizedollsym(gensym(name+1), env->ce_argc, env->ce_argv, 1); ! canvas_unsetcurrent(x); } else ret = s; --- 378,384 ---- if (*name == '$' && name[1] >= '0' && name[1] <= '9') { t_canvasenvironment *env = canvas_getenv(x); ! pd_pushsym((t_pd *)x); ret = binbuf_realizedollsym(gensym(name+1), env->ce_argc, env->ce_argv, 1); ! pd_popsym((t_pd *)x); } else ret = s; *************** *** 706,710 **** t_editor *x = (t_editor *)getbytes(sizeof(*x)); x->e_connectbuf = binbuf_new(); - x->e_deleted = binbuf_new(); x->e_glist = owner; sprintf(buf, ".x%lx", (long)owner); --- 701,704 ---- *************** *** 716,720 **** guiconnect_notarget(x->e_guiconnect, 1000); binbuf_free(x->e_connectbuf); - binbuf_free(x->e_deleted); freebytes((void *)x, sizeof(*x)); } --- 710,713 ---- *************** *** 997,1003 **** else if (ac && av->a_type == A_DOLLSYM) { t_canvasenvironment *e = canvas_getenv(x); ! canvas_setcurrent(x); canvas_rename(x, binbuf_realizedollsym(av->a_w.w_symbol, e->ce_argc, e->ce_argv, 1), 0); ! canvas_unsetcurrent(x); } else canvas_rename(x, gensym("Pd"), 0); --- 990,996 ---- else if (ac && av->a_type == A_DOLLSYM) { t_canvasenvironment *e = canvas_getenv(x); ! pd_pushsym((t_pd *)x); canvas_rename(x, binbuf_realizedollsym(av->a_w.w_symbol, e->ce_argc, e->ce_argv, 1), 0); ! pd_popsym((t_pd *)x); } else canvas_rename(x, gensym("Pd"), 0); *************** *** 1700,1706 **** } static void array_resize_and_redraw(t_array *array, t_glist *glist, int n) { t_array *a2 = array; ! while (a2->a_gp.gp_stub->gs_which == GP_ARRAY) a2 = a2->a_gp.gp_stub->gs_un.gs_array; array_resize(array, n); gobj_changed(array,0); --- 1693,1701 ---- } + #define STUB(x) x->a_gp.gp_stub + static void array_resize_and_redraw(t_array *array, t_glist *glist, int n) { t_array *a2 = array; ! while (STUB(a2)->gs_which == GP_ARRAY) a2 = STUB(a2)->gs_un.gs_array; array_resize(array, n); gobj_changed(array,0); *************** *** 1876,1887 **** saveit = ((flags & 1) != 0); x = graph_scalar(gl, s, templatesym, saveit); - if (n <= 0) n = 100; array_resize(x->x_scalar->sc_vec[zonset].w_array, n); ! ! template_setfloat(template, gensym("style"), x->x_scalar->sc_vec, ! style, 1); ! template_setfloat(template, gensym("linewidth"), x->x_scalar->sc_vec, ! ((style == PLOTSTYLE_POINTS) ? 2 : 1), 1); x2 = pd_findbyclass(gensym("#A"), garray_class); if (x2) pd_unbind(x2, gensym("#A")); --- 1871,1878 ---- saveit = ((flags & 1) != 0); x = graph_scalar(gl, s, templatesym, saveit); if (n <= 0) n = 100; array_resize(x->x_scalar->sc_vec[zonset].w_array, n); ! template_setfloat(template, gensym("style"), x->x_scalar->sc_vec, style, 1); ! template_setfloat(template, gensym("linewidth"), x->x_scalar->sc_vec, style==PLOTSTYLE_POINTS?2:1, 1); x2 = pd_findbyclass(gensym("#A"), garray_class); if (x2) pd_unbind(x2, gensym("#A")); *************** *** 1904,1908 **** } ! /* this is called from the properties dialog window for an existing array */ void garray_arraydialog(t_garray *x, t_symbol *name, t_floatarg fsize, t_floatarg fflags, t_floatarg deleteit) { --- 1895,1899 ---- } ! /* this is called from the properties dialog window for an existing array */ void garray_arraydialog(t_garray *x, t_symbol *name, t_floatarg fsize, t_floatarg fflags, t_floatarg deleteit) { *************** *** 1933,1948 **** /* redraw the whole glist, just so the name change shows up */ if (x->x_glist->gl_havewindow) canvas_redraw(x->x_glist); ! else if (glist_isvisible(x->x_glist->gl_owner)) { ! gobj_changed(x,0); ! } } size = fsize; if (size < 1) size = 1; ! if (size != a->a_n) ! garray_resize(x, size); ! else if (style != stylewas) ! garray_fittograph(x, size, style); ! template_setfloat(scalartemplate, gensym("style"), ! x->x_scalar->sc_vec, (float)style, 0); garray_setsaveit(x, (saveit != 0)); garray_redraw(x); --- 1924,1934 ---- /* redraw the whole glist, just so the name change shows up */ if (x->x_glist->gl_havewindow) canvas_redraw(x->x_glist); ! else if (glist_isvisible(x->x_glist->gl_owner)) gobj_changed(x,0); } size = fsize; if (size < 1) size = 1; ! if (size != a->a_n) garray_resize(x, size); ! else if (style != stylewas) garray_fittograph(x, size, style); ! template_setfloat(scalartemplate, gensym("style"), x->x_scalar->sc_vec, (float)style, 0); garray_setsaveit(x, (saveit != 0)); garray_redraw(x); *************** *** 1962,1967 **** for (i = 0; i < ARRAYPAGESIZE && i < a->a_n; i++) { yval = *(float *)(a->a_vec + elemsize * i + yonset); ! sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", ! x->x_realname->s_name, i, i, yval); } } --- 1948,1952 ---- for (i = 0; i < ARRAYPAGESIZE && i < a->a_n; i++) { yval = *(float *)(a->a_vec + elemsize * i + yonset); ! sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", x->x_realname->s_name, i, i, yval); } } *************** *** 2007,2012 **** 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; scalar_redraw(a->a_gp.gp_un.gp_scalar, glist); } --- 1992,1996 ---- void array_redraw(t_array *a, t_glist *glist) { ! while (STUB(a)->gs_which == GP_ARRAY) a = STUB(a)->gs_un.gs_array; scalar_redraw(a->a_gp.gp_un.gp_scalar, glist); } *************** *** 2026,2030 **** wpix = glist_ytopixels(glist, basey + fielddesc_cvttocoord(yfielddesc, yval) + ! fielddesc_cvttocoord(wfielddesc, wval)) - ypix; if (wpix < 0) wpix = -wpix; } --- 2010,2014 ---- wpix = glist_ytopixels(glist, basey + fielddesc_cvttocoord(yfielddesc, yval) + ! fielddesc_cvttocoord(wfielddesc, wval)) - ypix; if (wpix < 0) wpix = -wpix; } *************** *** 2052,2058 **** static int array_motion_fatten; ! /* LATER protect against the template changing or the scalar disappearing ! probably by attaching a gpointer here ... */ ! #if 0 static void array_motion(void *z, t_floatarg dx, t_floatarg dy) { --- 2036,2041 ---- static int array_motion_fatten; ! /* LATER protect against the template changing or the scalar disappearing ! probably by attaching a gpointer here ... */ #if 0 static void array_motion(void *z, t_floatarg dx, t_floatarg dy) { *************** *** 2121,2126 **** int shift, int alt, int dbl, int doit); ! /* try clicking on an element of the array as a scalar (if clicking ! on the trace of the array failed) */ static int array_doclick_element(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, t_symbol *elemtemplatesym, float linewidth, float xloc, float xinc, float yloc, --- 2104,2109 ---- int shift, int alt, int dbl, int doit); ! /* try clicking on an element of the array as a scalar (if clicking ! on the trace of the array failed) */ static int array_doclick_element(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, t_symbol *elemtemplatesym, float linewidth, float xloc, float xinc, float yloc, *************** *** 2192,2201 **** } } if (best > 8) { ! if (scalarvis != 0) ! return array_doclick_element(array, glist, sc, ap, ! elemtemplatesym, linewidth, xloc, xinc, yloc, ! xfield, yfield, wfield, ! xpix, ypix, shift, alt, dbl, doit); ! else return 0; } best += 0.001; /* add truncation error margin */ --- 2175,2181 ---- } } if (best > 8) { ! if (scalarvis != 0) return array_doclick_element(array, glist, sc, ap, elemtemplatesym, linewidth, ! xloc, xinc, yloc, xfield, yfield, wfield, xpix, ypix, shift, alt, dbl, doit); ! return 0; } best += 0.001; /* add truncation error margin */ *************** *** 2206,2225 **** xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; ! dx = pxpix - xpix; ! if (dx < 0) dx = -dx; ! dy = pypix - ypix; ! if (dy < 0) dy = -dy; if (wonset >= 0) { ! dy2 = (pypix+pwpix) - ypix; if (dy2 < 0) dy2 = -dy2; ! dy3 = (pypix-pwpix) - ypix; if (dy3 < 0) dy3 = -dy3; if (yonset < 0) dy = 100; ! } ! else dy2 = dy3 = 100; if (dx + dy <= best || dx + dy2 <= best || dx + dy3 <= best) { ! if (dy < dy2 && dy < dy3) ! array_motion_fatten = 0; ! else if (dy2 < dy3) ! array_motion_fatten = -1; ! else array_motion_fatten = 1; if (doit) { char *elem = (char *)array->a_vec; --- 2186,2200 ---- xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; ! dx = pxpix-xpix; if (dx<0) dx=-dx; ! dy = pypix-ypix; if (dy<0) dy=-dy; if (wonset >= 0) { ! dy2 = pypix+pwpix-ypix; if (dy2<0) dy2=-dy2; ! dy3 = pypix-pwpix-ypix; if (dy3<0) dy3=-dy3; if (yonset < 0) dy = 100; ! } else dy2 = dy3 = 100; if (dx + dy <= best || dx + dy2 <= best || dx + dy3 <= best) { ! if (dy<dy2 && dy<dy3) array_motion_fatten = 0; ! else if (dy2<dy3) array_motion_fatten = -1; ! else array_motion_fatten = 1; if (doit) { char *elem = (char *)array->a_vec; *************** *** 2347,2352 **** sys_queuegui(&x->x_gobj, x->x_glist, garray_doredraw); else { ! if (x->x_listviewing) ! sys_vgui("pdtk_array_listview_fillpage %s\n", x->x_realname->s_name); } garray_update(x); --- 2322,2326 ---- sys_queuegui(&x->x_gobj, x->x_glist, garray_doredraw); else { ! if (x->x_listviewing) sys_vgui("pdtk_array_listview_fillpage %s\n", x->x_realname->s_name); } garray_update(x); *************** *** 5740,5758 **** } - static void plot_displace(t_gobj *z, t_glist *glist, t_word *data, t_template *template, - float basex, float basey, int dx, int dy) { - /* not yet */ - } - - static void plot_select(t_gobj *z, t_glist *glist, t_word *data, t_template *template, - float basex, float basey, int state) { - /* not yet */ - } - - static void plot_activate(t_gobj *z, t_glist *glist, t_word *data, t_template *template, - float basex, float basey, int state) { - /* not yet */ - } - static void plot_vis(t_gobj *z, t_glist *glist, t_word *data, t_template *template, float basex, float basey, int tovis) { --- 5714,5717 ---- *************** *** 5944,5955 **** } ! t_parentwidgetbehavior plot_widgetbehavior = { ! plot_getrect, ! plot_displace, ! plot_select, ! plot_activate, ! plot_vis, ! plot_click, ! }; static void plot_setup(void) { --- 5903,5907 ---- } ! t_parentwidgetbehavior plot_widgetbehavior = {plot_getrect,0,0,0,plot_vis,plot_click}; static void plot_setup(void) { *************** *** 6066,6073 **** } - static void drawnumber_select(t_gobj *z, t_glist *glist, t_word *data, t_template *template, - float basex, float basey, int state) {} - static void drawnumber_activate(t_gobj *z, t_glist *glist, t_word *data, t_template *template, - float basex, float basey, int state) {} static void drawnumber_vis(t_gobj *z, t_glist *glist, t_word *data, t_template *template, float basex, float basey, int vis) { --- 6018,6021 ---- *************** *** 6134,6144 **** t_parentwidgetbehavior drawnumber_widgetbehavior = { ! drawnumber_getrect, ! drawnumber_displace, ! drawnumber_select, ! drawnumber_activate, ! drawnumber_vis, ! drawnumber_click, ! }; static void drawnumber_free(t_drawnumber *x) {} --- 6082,6086 ---- t_parentwidgetbehavior drawnumber_widgetbehavior = { ! drawnumber_getrect,drawnumber_displace,0,0,drawnumber_vis,drawnumber_click}; static void drawnumber_free(t_drawnumber *x) {} *************** *** 6367,6373 **** 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 = owner_array->a_gp.gp_stub->gs_un.gs_glist; } canvas = (t_pd *)glist_getcanvas(glist); --- 6309,6315 ---- else { t_array *owner_array = gs->gs_un.gs_array; ! while (STUB(owner_array)->gs_which == GP_ARRAY) ! owner_array = STUB(owner_array)->gs_un.gs_array; ! glist = STUB(owner_array)->gs_un.gs_glist; } canvas = (t_pd *)glist_getcanvas(glist); *************** *** 6529,6534 **** else sp->gv_w.w_float = 0; if (i) { ! if (x->x_issymbol) symbolinlet_new(&x->x_obj, &sp->gv_w.w_symbol); ! else floatinlet_new(&x->x_obj, &sp->gv_w.w_float); } } --- 6471,6476 ---- else sp->gv_w.w_float = 0; if (i) { ! if (x->x_issymbol) symbolinlet_new((t_text *)x, &sp->gv_w.w_symbol); ! else floatinlet_new((t_text *)x, &sp->gv_w.w_float); } } *************** *** 6564,6571 **** 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; ! scalar_redraw(owner_array->a_gp.gp_un.gp_scalar, ! owner_array->a_gp.gp_stub->gs_un.gs_glist); } } --- 6506,6511 ---- else { t_array *owner_array = gs->gs_un.gs_array; ! while (STUB(owner_array)->gs_which == GP_ARRAY) owner_array = STUB(owner_array)->gs_un.gs_array; ! scalar_redraw(owner_array->a_gp.gp_un.gp_scalar, STUB(owner_array)->gs_un.gs_glist); } } *************** *** 6776,6781 **** } else { t_array *o = gs->gs_un.gs_array; ! while (o->a_gp.gp_stub->gs_which == GP_ARRAY) o = o->a_gp.gp_stub->gs_un.gs_array; ! if (glist_isvisible(o->a_gp.gp_stub->gs_un.gs_glist)) sys_mgui((t_gobj *)(o->a_gp.gp_un.gp_scalar), "delete",""); } --- 6716,6721 ---- } else { t_array *o = gs->gs_un.gs_array; ! while (STUB(o)->gs_which == GP_ARRAY) o = STUB(o)->gs_un.gs_array; ! if (glist_isvisible(STUB(o)->gs_un.gs_glist)) sys_mgui((t_gobj *)(o->a_gp.gp_un.gp_scalar), "delete",""); } *************** *** 6798,6803 **** } else { t_array *o = gs->gs_un.gs_array; ! while (o->a_gp.gp_stub->gs_which == GP_ARRAY) o = o->a_gp.gp_stub->gs_un.gs_array; ! if (glist_isvisible(o->a_gp.gp_stub->gs_un.gs_glist)) gobj_changed((t_gobj *)(o->a_gp.gp_un.gp_scalar),0); } --- 6738,6743 ---- } else { t_array *o = gs->gs_un.gs_array; ! while (STUB(o)->gs_which == GP_ARRAY) o = STUB(o)->gs_un.gs_array; ! if (glist_isvisible(STUB(o)->gs_un.gs_glist)) gobj_changed((t_gobj *)(o->a_gp.gp_un.gp_scalar),0); } *************** *** 7108,7112 **** newest = 0; binbuf_gettext(b,&s,&n); ! canvas_setcurrent((t_canvas *)gl); canvas_getargs(&argc, &argv); binbuf_eval(b, &pd_objectmaker, argc, argv); --- 7048,7052 ---- newest = 0; binbuf_gettext(b,&s,&n); ! pd_pushsym((t_pd *)x); canvas_getargs(&argc, &argv); binbuf_eval(b, &pd_objectmaker, argc, argv); *************** *** 7129,7133 **** 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)); ! canvas_unsetcurrent((t_canvas *)gl); } --- 7069,7073 ---- 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)); ! pd_popsym((t_pd *)gl); } *************** *** 7613,7617 **** /* canvas_reorder_last(x,i); */ gobj_changed(x,0); ! /*err: canvas_unsetcurrent(x);*/ } --- 7553,7557 ---- /* canvas_reorder_last(x,i); */ gobj_changed(x,0); ! /*err: pd_popsym((t_pd *)x);*/ }

1 0

pd/src desire.c, 1.1.2.139, 1.1.2.140 desire.h, 1.1.2.14, 1.1.2.15
by Mathieu Bouchard 03 Sep '06

03 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12056 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: . Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** desire.h 2 Sep 2006 19:10:30 -0000 1.1.2.14 --- desire.h 3 Sep 2006 03:47:14 -0000 1.1.2.15 *************** *** 1,53 **** /* ! This file is part of PureData (impd branch) ! Copyright (c) 1997-1999 Miller Puckette. Copyright 2000-2001 IEM KUG Graz Austria (Thomas Musil) ! Copyright 2004,2005 by Mathieu Bouchard For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "LICENSE.txt", in this distribution. - */ - - #ifndef __DESIRE_H - #define __DESIRE_H - - #include "m_pd.h" - - /* Copyright (c) 1997-1999 Miller Puckette. - * For information on usage and redistribution, and for a DISCLAIMER OF ALL - * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - - /* this file defines the structure for "glists" and related structures and - functions. "Glists" and "canvases" and "graphs" used to be different - structures until being unified in version 0.35. - - A glist occupies its own window if the "gl_havewindow" flag is set. Its - appearance on its "parent" or "owner" (if it has one) is as a graph if - "gl_isgraph" is set, and otherwise as a text box. ! A glist is "root" if it has no owner, i.e., a document window. In this ! case "gl_havewindow" is always set. ! We maintain a list of root windows, so that we can traverse the whole ! collection of everything in a Pd process. ! If a glist has a window it may still not be "mapped." Miniaturized ! windows aren't mapped, for example, but a window is also not mapped ! immediately upon creation. In either case gl_havewindow is true but ! gl_mapped is false. ! Closing a non-root window makes it invisible; closing a root destroys it. ! A glist that's just a text object on its parent is always "toplevel." An ! embedded glist can switch back and forth to appear as a toplevel by double- ! clicking on it. Single-clicking a text box makes the toplevel become visible ! and raises the window it's in. ! If a glist shows up as a graph on its parent, the graph is blanked while the ! glist has its own window, even if miniaturized. */ ! /* NOTE: this file describes Pd implementation details which may change ! in future releases. The public (stable) API is in m_pd.h. */ #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) --- 1,45 ---- /* ! This file is part of PureData ! Copyright 2004-2006 by Mathieu Bouchard Copyright 2000-2001 IEM KUG Graz Austria (Thomas Musil) ! Copyright (c) 1997-1999 Miller Puckette. For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "LICENSE.txt", in this distribution. ! this file declares the C interface for the second half of DesireData. ! this is where most of the differences between DesireData and PureData lie. ! SYNONYMS: ! 1. glist = graph = canvas = patcher; those were not always synonymous. ! however, graph sometimes means a canvas that is displaying an array. ! 2. outconnect = connection = patchcord = wire ! canvases have a few flags that determine their appearance: ! gl_havewindow: should open its own window (only if mapped? or...) ! gl_isgraph: the GOP flag: show as graph-on-parent, vs TextBox. ! gl_owner==0: it's a root canvas, should be in canvas_list. ! In this case "gl_havewindow" is always set. ! canvas_list is a list of root windows only, which can be traversed using glists_each. ! If a glist has a window it may still not be "mapped." Miniaturized ! windows aren't mapped, for example, but a window is also not mapped ! immediately upon creation. In either case gl_havewindow is true but ! gl_mapped is false. ! Closing a non-root window makes it invisible; closing a root destroys it. ! A glist that's just a text object on its parent is always "toplevel." An ! embedded glist can switch back and forth to appear as a toplevel by double- ! clicking on it. Single-clicking a text box makes the toplevel become visible ! and raises the window it's in. + If a glist shows up as a graph on its parent, the graph is blanked while the + glist has its own window, even if miniaturized. */ ! #ifndef __DESIRE_H ! #define __DESIRE_H ! ! #include "m_pd.h" #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) *************** *** 55,70 **** #endif #ifdef GARRAY_THREAD_LOCK #include <pthread.h> /* TB: for t_garray */ #endif - /* ----------------------- data ------------------------------- */ - - typedef struct _updateheader { - struct _updateheader *upd_next; - unsigned int upd_array:1; /* true if array, false if glist */ - unsigned int upd_queued:1; /* true if we're queued */ - } t_updateheader; - EXTERN_STRUCT _rtext; #define t_rtext struct _rtext --- 47,55 ---- #endif + /* i don't know whether this is currently used at all in DesireData. -- matju 2006.09 */ #ifdef GARRAY_THREAD_LOCK #include <pthread.h> /* TB: for t_garray */ #endif EXTERN_STRUCT _rtext; #define t_rtext struct _rtext *************** *** 88,111 **** /* commented-out fields are not in DesireData */ typedef struct _editor { - t_updateheader e_upd; /* update header structure */ - t_selection *e_updlist; /* list of objects to update */ t_rtext *e_rtext; /* text responder linked list */ - /* t_selection *e_selection; head of the selection list */ t_rtext *e_textedfor; /* the rtext if any that we are editing */ t_gobj *e_grab; /* object being "dragged" */ - /* t_glistmotionfn e_motionfn; ... motion callback */ - /* t_glistkeyfn e_keyfn; ... keypress callback */ t_binbuf *e_connectbuf; /* connections to deleted objects */ t_binbuf *e_deleted; /* last stuff we deleted */ t_guiconnect *e_guiconnect; /* GUI connection for filtering messages */ struct _glist *e_glist; /* glist which owns this */ - int e_xwas; /* xpos on last mousedown or motion event */ - int e_ywas; /* ypos, similarly */ - int e_selectline_index1; /* indices for the selected line if any */ - int e_selectline_outno; /* (only valid if e_selectedline is set) */ - int e_selectline_index2; - int e_selectline_inno; - t_outconnect *e_selectline_tag; - /* unsigned int e_onmotion: 3; action to take on motion */ unsigned int e_lastmoved: 1; /* one if mouse has moved since click */ unsigned int e_textdirty: 1; /* one if e_textedfor has changed */ --- 73,83 ---- *************** *** 113,127 **** } t_editor; - /* editor structure for "garrays". We don't bother to delete and regenerate - this structure when the "garray" becomes invisible or visible, although we - could do so if the structure gets big (like the "editor" above.) */ - - typedef struct _arrayvis { - t_updateheader av_upd; /* update header structure */ - t_garray *av_garray; /* owning structure */ - } t_arrayvis; - /* the t_tick structure describes where to draw x and y "ticks" for a glist */ - typedef struct _tick { /* where to put ticks on x or y axes */ float k_point; /* one point to draw a big tick at */ --- 85,89 ---- *************** *** 130,138 **** } t_tick; ! /* the t_glist structure, which describes a list of elements that live on an ! area of a window. ! ! */ ! struct _glist { t_object gl_obj; /* header in case we're a glist */ --- 92,96 ---- } t_tick; ! /* the t_glist structure, which describes a list of elements that live on an area of a window.*/ struct _glist { t_object gl_obj; /* header in case we're a glist */ *************** *** 141,164 **** int gl_valid; /* incremented when pointers might be stale */ struct _glist *gl_owner; /* parent glist, supercanvas, or 0 if none */ ! int gl_pixwidth; /* width in pixels (on parent, if a graph) */ ! int gl_pixheight; ! float gl_x1; /* bounding rectangle in our own coordinates */ ! float gl_y1; ! float gl_x2; ! float gl_y2; ! int gl_screenx1; /* screen coordinates when toplevel */ ! int gl_screeny1; ! int gl_screenx2; ! int gl_screeny2; ! int gl_xmargin; /* origin for GOP rectangle */ ! int gl_ymargin; ! t_tick gl_xtick; /* ticks marking X values */ ! int gl_nxlabels; /* number of X coordinate labels */ ! t_symbol **gl_xlabel; /* ... an array to hold them */ ! float gl_xlabely; /* ... and their Y coordinates */ ! t_tick gl_ytick; /* same as above for Y ticks and labels */ ! int gl_nylabels; ! t_symbol **gl_ylabel; ! float gl_ylabelx; t_editor *gl_editor; /* editor structure when visible */ t_symbol *gl_name; /* symbol bound here */ --- 99,115 ---- int gl_valid; /* incremented when pointers might be stale */ struct _glist *gl_owner; /* parent glist, supercanvas, or 0 if none */ ! /* width in pixels (on parent, if a graph) */ ! int gl_pixwidth, gl_pixheight; ! /* bounding rectangle in our own coordinates */ ! float gl_x1,gl_y1; ! float gl_x2,gl_y2; ! /* screen coordinates when toplevel */ ! int gl_screenx1, gl_screeny1; ! int gl_screenx2, gl_screeny2; ! /* origin for GOP rectangle */ ! int gl_xmargin, gl_ymargin; ! /* ticks and tick labels */ ! t_tick gl_xtick; int gl_nxlabels; t_symbol **gl_xlabel; float gl_xlabely; ! t_tick gl_ytick; int gl_nylabels; t_symbol **gl_ylabel; float gl_ylabelx; t_editor *gl_editor; /* editor structure when visible */ t_symbol *gl_name; /* symbol bound here */ *************** *** 172,176 **** unsigned int gl_willvis:1; /* make me visible after loading */ unsigned int gl_edit:1; /* edit mode */ ! unsigned int gl_isdeleting:1; /* we're inside glist_delete -- hack! */ unsigned int gl_goprect:1; /* draw rectangle for graph-on-parent */ unsigned int gl_isgraph:1; /* show as graph on parent */ --- 123,127 ---- unsigned int gl_willvis:1; /* make me visible after loading */ unsigned int gl_edit:1; /* edit mode */ ! /* unsigned int gl_isdeleting:1; we're inside glist_delete -- hack! */ unsigned int gl_goprect:1; /* draw rectangle for graph-on-parent */ unsigned int gl_isgraph:1; /* show as graph on parent */ *************** *** 229,240 **** typedef struct _linetraverser { t_canvas *tr_x; ! t_object *tr_ob; ! int tr_nout; ! int tr_outno; ! t_object *tr_ob2; ! t_outlet *tr_outlet; ! t_inlet *tr_inlet; ! int tr_nin; ! int tr_inno; t_outconnect *tr_nextoc; int tr_nextoutno; --- 180,185 ---- typedef struct _linetraverser { t_canvas *tr_x; ! t_object *tr_ob; int tr_nout; int tr_outno; t_outlet *tr_outlet; ! t_object *tr_ob2; int tr_nin; int tr_inno; t_inlet *tr_inlet; t_outconnect *tr_nextoc; int tr_nextoutno; *************** *** 274,283 **** /* cursor definitions; used as return value for t_parentclickfn */ - #define CURSOR_RUNMODE_NOTHING 0 #define CURSOR_RUNMODE_CLICKME 1 #define CURSOR_RUNMODE_THICKEN 2 #define CURSOR_RUNMODE_ADDPOINT 3 - #define CURSOR_EDITMODE_NOTHING 4 - #define CURSOR_EDITMODE_CONNECT 5 #define CURSOR_EDITMODE_DISCONNECT 6 EXTERN void canvas_setcursor(t_glist *x, unsigned int cursornum); --- 219,225 ---- *************** *** 323,327 **** 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, ! float x1, float y1, float x2, float y2, float px1, float py1, float px2, float py2); EXTERN void glist_arraydialog(t_glist *parent, t_symbol *name, --- 265,269 ---- 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, ! float x1, float y1, float x2, float y2, float px1, float py1, float px2, float py2); EXTERN void glist_arraydialog(t_glist *parent, t_symbol *name, *************** *** 337,347 **** EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); ! EXTERN void text_drawborder(t_text *x, t_glist *glist, char *tag, ! int width, int height, int firsttime); EXTERN void text_eraseborder(t_text *x, t_glist *glist, char *tag); EXTERN int text_xcoord(t_text *x, t_glist *glist); EXTERN int text_ycoord(t_text *x, t_glist *glist); ! EXTERN int text_xpix(t_text *x, t_glist *glist); ! EXTERN int text_ypix(t_text *x, t_glist *glist); EXTERN int text_shouldvis(t_text *x, t_glist *glist); --- 279,288 ---- EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); ! EXTERN void text_drawborder(t_text *x, t_glist *glist, char *tag, int width, int height, int firsttime); EXTERN void text_eraseborder(t_text *x, t_glist *glist, char *tag); EXTERN int text_xcoord(t_text *x, t_glist *glist); EXTERN int text_ycoord(t_text *x, t_glist *glist); ! EXTERN int text_xpix( t_text *x, t_glist *glist); ! EXTERN int text_ypix( t_text *x, t_glist *glist); EXTERN int text_shouldvis(t_text *x, t_glist *glist); *************** *** 352,356 **** EXTERN void rtext_gettext(t_rtext *x, char **buf, int *bufsize); - /* -------------------- functions on canvases ------------------------ */ EXTERN t_class *canvas_class; EXTERN t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv); --- 293,296 ---- *************** *** 458,466 **** EXTERN float fielddesc_cvtfromcoord(t_fielddesc *f, float coord); - /* ----------------------- guiconnects, g_guiconnect.c --------- */ EXTERN t_guiconnect *guiconnect_new(t_pd *who, t_symbol *sym); EXTERN void guiconnect_notarget(t_guiconnect *x, double timedelay); - /* ------------- IEMGUI routines used in other g_ files ---------------- */ EXTERN t_symbol *iemgui_raute2dollar(t_symbol *s); EXTERN t_symbol *iemgui_dollar2raute(t_symbol *s); --- 398,404 ---- *************** *** 477,481 **** EXTERN void pd_upload(t_gobj *self); EXTERN void sys_mgui(void *self, const char *sel, const char *fmt, ...); - EXTERN void iemgui_propertiesfn(t_gobj *x, t_glist *owner); EXTERN t_symbol *s_empty; EXTERN int convert_color2(int x); --- 415,418 ---- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.139 retrieving revision 1.1.2.140 diff -C2 -d -r1.1.2.139 -r1.1.2.140 *** desire.c 2 Sep 2006 19:00:37 -0000 1.1.2.139 --- desire.c 3 Sep 2006 03:47:13 -0000 1.1.2.140 *************** *** 455,462 **** t->tr_outno = outno; } ! t->tr_nextoc = obj_nexttraverseoutlet(rval, &t->tr_ob2, ! &t->tr_inlet, &t->tr_inno); t->tr_nin = obj_ninlets(t->tr_ob2); ! if (!t->tr_nin) bug("drawline"); return rval; } --- 455,461 ---- t->tr_outno = outno; } ! t->tr_nextoc = obj_nexttraverseoutlet(rval, &t->tr_ob2, &t->tr_inlet, &t->tr_inno); t->tr_nin = obj_ninlets(t->tr_ob2); ! if (!t->tr_nin) bug("linetraverser_next"); return rval; } *************** *** 562,567 **** } ! /* make a new glist and add it to this glist. It will appear as ! a "graph", not a text object. */ t_glist *glist_addglist(t_glist *g, t_symbol *sym, float x1, float y1, float x2, float y2, --- 561,567 ---- } ! #define GLIST_DEFGRAPHWIDTH 200 ! #define GLIST_DEFGRAPHHEIGHT 140 ! /* make a new glist and add it to this glist. It will appear as a "graph", not a text object. */ t_glist *glist_addglist(t_glist *g, t_symbol *sym, float x1, float y1, float x2, float y2, *************** *** 1320,1328 **** /* ------------------------ event handling ------------------------ */ - #define CURSOR_RUNMODE_CLICKME 1 - #define CURSOR_RUNMODE_THICKEN 2 - #define CURSOR_RUNMODE_ADDPOINT 3 - #define CURSOR_EDITMODE_DISCONNECT 6 - void canvas_inlettip(t_canvas* x,t_object* ob,int closest,int xpos,int ypos) { /* --- 1320,1323 ---- *************** *** 2691,2704 **** } - /* this is to protect against a hairy problem in which deleting - a sub-canvas might delete an inlet on a box, after the box had - been invisible-ized, so that we have to protect against redrawing it! */ - int canvas_setdeleting(t_canvas *x, int flag) { - int ret = x->gl_isdeleting; - x->gl_isdeleting = flag; - return ret; - } - - /* delete an object from a glist and free it */ void glist_delete(t_glist *x, t_gobj *y) { --- 2686,2689 ---- *************** *** 2706,2712 **** t_object *ob; t_gotfn chkdsp = zgetfn(&y->g_pd, gensym("dsp")); - t_canvas *canvas = glist_getcanvas(x); int drawcommand = class_isdrawcommand(y->g_pd); - int wasdeleting = canvas_setdeleting(canvas, 1); if (x->gl_editor && x->gl_editor->e_grab == y) x->gl_editor->e_grab = 0; --- 2691,2695 ---- *************** *** 2729,2733 **** if (drawcommand) canvas_redrawallfortemplate(template_findbyname(canvas_makebindsym(glist_getcanvas(x)->gl_name)), 1); - canvas_setdeleting(canvas, wasdeleting); x->gl_valid = ++glist_valid; } --- 2712,2715 ---- *************** *** 3009,3025 **** float glist_xtopixels(t_glist *x, float xval) { int x1, y1, x2, y2; ! if (!x->gl_isgraph) return (xval - x->gl_x1) / (x->gl_x2 - x->gl_x1); ! if (x->gl_havewindow) return (x->gl_screenx2 - x->gl_screenx1) * (xval - x->gl_x1) / (x->gl_x2 - x->gl_x1); if (!x->gl_owner) bug("glist_pixelstox"); graph_graphrect(&x->gl_gobj, x->gl_owner, &x1, &y1, &x2, &y2); ! return x1 + (x2 - x1) * (xval - x->gl_x1) / (x->gl_x2 - x->gl_x1); } float glist_ytopixels(t_glist *x, float yval) { int x1, y1, x2, y2; ! if (!x->gl_isgraph) return (yval - x->gl_y1) / (x->gl_y2 - x->gl_y1); ! if (x->gl_havewindow) return (x->gl_screeny2 - x->gl_screeny1) * (yval - x->gl_y1) / (x->gl_y2 - x->gl_y1); if (!x->gl_owner) bug("glist_pixelstox"); graph_graphrect(&x->gl_gobj, x->gl_owner, &x1, &y1, &x2, &y2); ! return y1 + (y2 - y1) * (yval - x->gl_y1) / (x->gl_y2 - x->gl_y1); } --- 2991,3009 ---- float glist_xtopixels(t_glist *x, float xval) { int x1, y1, x2, y2; ! float width = x->gl_x2-x->gl_x1; ! if (!x->gl_isgraph) return (xval - x->gl_x1) / width; ! if (x->gl_havewindow) return (x->gl_screenx2-x->gl_screenx1) * (xval-x->gl_x1) / width; if (!x->gl_owner) bug("glist_pixelstox"); graph_graphrect(&x->gl_gobj, x->gl_owner, &x1, &y1, &x2, &y2); ! return x1 + (x2 - x1) * (xval - x->gl_x1) / width; } float glist_ytopixels(t_glist *x, float yval) { int x1, y1, x2, y2; ! float height = x->gl_y2-x->gl_y1; ! if (!x->gl_isgraph) return (yval - x->gl_y1) / height; ! if (x->gl_havewindow) return (x->gl_screeny2-x->gl_screeny1) * (yval-x->gl_y1) / height; if (!x->gl_owner) bug("glist_pixelstox"); graph_graphrect(&x->gl_gobj, x->gl_owner, &x1, &y1, &x2, &y2); ! return y1 + (y2 - y1) * (yval - x->gl_y1) / height; } *************** *** 3142,3153 **** int tickpix = i%x->gl_ytick.k_lperb ? 2 : 4; int y0 = (int)glist_ytopixels(x, f); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", (long)c, x1, y0, x1 + tickpix, y0, tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", (long)c, x2, y0, x2 - tickpix, y0, tag); } for (i = 1, f = x->gl_ytick.k_point - x->gl_ytick.k_inc; f > 0.99 * lbound + 0.01 * ubound; i++, f -= x->gl_ytick.k_inc) { int tickpix = i%x->gl_ytick.k_lperb ? 2 : 4; int y0 = (int)glist_ytopixels(x, f); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", (long)c, x1, y0, x1 + tickpix, y0, tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", (long)c, x2, y0, x2 - tickpix, y0, tag); } } --- 3126,3137 ---- int tickpix = i%x->gl_ytick.k_lperb ? 2 : 4; int y0 = (int)glist_ytopixels(x, f); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", (long)c, x1, y0, x1+tickpix, y0, tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", (long)c, x2, y0, x2-tickpix, y0, tag); } for (i = 1, f = x->gl_ytick.k_point - x->gl_ytick.k_inc; f > 0.99 * lbound + 0.01 * ubound; i++, f -= x->gl_ytick.k_inc) { int tickpix = i%x->gl_ytick.k_lperb ? 2 : 4; int y0 = (int)glist_ytopixels(x, f); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", (long)c, x1, y0, x1+tickpix, y0, tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", (long)c, x2, y0, x2-tickpix, y0, tag); } } *************** *** 3247,3251 **** x->x_who = who; x->x_sym = sym; ! pd_bind(&x->x_obj.ob_pd, sym); return x; } --- 3231,3235 ---- x->x_who = who; x->x_sym = sym; ! pd_bind((t_pd *)x, sym); return x; } *************** *** 3253,3257 **** /* cleanup routine; delete any resources we have */ static void guiconnect_free(t_guiconnect *x) { ! if (x->x_sym) pd_unbind(&x->x_obj.ob_pd, x->x_sym); if (x->x_clock) clock_free(x->x_clock); } --- 3237,3241 ---- /* cleanup routine; delete any resources we have */ static void guiconnect_free(t_guiconnect *x) { ! if (x->x_sym) pd_unbind((t_pd *)x, x->x_sym); if (x->x_clock) clock_free(x->x_clock); } *************** *** 3264,3268 **** or for a timeout. */ void guiconnect_notarget(t_guiconnect *x, double timedelay) { ! if (!x->x_sym) pd_free(&x->x_obj.ob_pd); else { x->x_who = 0; --- 3248,3252 ---- or for a timeout. */ void guiconnect_notarget(t_guiconnect *x, double timedelay) { ! if (!x->x_sym) pd_free((t_pd *)x); else { x->x_who = 0; *************** *** 3283,3289 **** a timeout after which the guiconnect will disappear.) */ static void guiconnect_signoff(t_guiconnect *x) { ! if (!x->x_who) pd_free(&x->x_obj.ob_pd); else { ! pd_unbind(&x->x_obj.ob_pd, x->x_sym); x->x_sym = 0; } --- 3267,3273 ---- a timeout after which the guiconnect will disappear.) */ static void guiconnect_signoff(t_guiconnect *x) { ! if (!x->x_who) pd_free((t_pd *)x); else { ! pd_unbind((t_pd *)x, x->x_sym); x->x_sym = 0; } *************** *** 3491,3502 **** } ! void glist_read(t_glist *x, t_symbol *filename, t_symbol *format) ! {glist_doread(x, filename, format, 1);} ! void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format) ! {glist_doread(x, filename, format, 0);} ! /* read text from a "properties" window, called from a gfxstub set ! up in scalar_properties(). We try to restore the object; if successful ! we delete the scalar and put the new thing in its place on the list. */ void canvas_dataproperties(t_canvas *x, t_scalar *sc, t_binbuf *b) { int ntotal, nnew, scindex; --- 3475,3484 ---- } ! void glist_read(t_glist *x, t_symbol *filename, t_symbol *format) {glist_doread(x,filename,format,1);} ! void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format) {glist_doread(x,filename,format,0);} ! /* read text from a "properties" window, called from a gfxstub set ! up in scalar_properties(). We try to restore the object; if successful ! we delete the scalar and put the new thing in its place on the list. */ void canvas_dataproperties(t_canvas *x, t_scalar *sc, t_binbuf *b) { int ntotal, nnew, scindex;

1 0

pd/src desire.h,1.1.2.13,1.1.2.14
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-serv10190 Modified Files: Tag: devel_0_39 desire.h Log Message: . Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** desire.h 2 Sep 2006 09:01:40 -0000 1.1.2.13 --- desire.h 2 Sep 2006 19:10:30 -0000 1.1.2.14 *************** *** 59,71 **** #endif - /* --------------------- geometry ---------------------------- */ - #define IOWIDTH 7 /* width of an inlet/outlet in pixels */ - #define IOMIDDLE ((IOWIDTH-1)/2) - #define GLIST_DEFGRAPHWIDTH 200 - #define GLIST_DEFGRAPHHEIGHT 140 /* ----------------------- data ------------------------------- */ ! typedef struct _updateheader ! { struct _updateheader *upd_next; unsigned int upd_array:1; /* true if array, false if glist */ --- 59,65 ---- #endif /* ----------------------- data ------------------------------- */ ! typedef struct _updateheader { struct _updateheader *upd_next; unsigned int upd_array:1; /* true if array, false if glist */ *************** *** 73,102 **** } t_updateheader; - /* types to support glists grabbing mouse motion or keys from parent */ - /* - typedef void (*t_glistmotionfn)(void *z, t_floatarg dx, t_floatarg dy); - typedef void (*t_glistkeyfn)(void *z, t_floatarg key); - */ - EXTERN_STRUCT _rtext; #define t_rtext struct _rtext - EXTERN_STRUCT _gtemplate; #define t_gtemplate struct _gtemplate - EXTERN_STRUCT _guiconnect; #define t_guiconnect struct _guiconnect - EXTERN_STRUCT _tscalar; #define t_tscalar struct _tscalar - EXTERN_STRUCT _canvasenvironment; #define t_canvasenvironment struct _canvasenvironment - EXTERN_STRUCT _fielddesc; #define t_fielddesc struct _fielddesc ! typedef struct _selection ! { t_gobj *sel_what; struct _selection *sel_next; --- 67,84 ---- } t_updateheader; EXTERN_STRUCT _rtext; #define t_rtext struct _rtext EXTERN_STRUCT _gtemplate; #define t_gtemplate struct _gtemplate EXTERN_STRUCT _guiconnect; #define t_guiconnect struct _guiconnect EXTERN_STRUCT _tscalar; #define t_tscalar struct _tscalar EXTERN_STRUCT _canvasenvironment; #define t_canvasenvironment struct _canvasenvironment EXTERN_STRUCT _fielddesc; #define t_fielddesc struct _fielddesc ! typedef struct _selection { t_gobj *sel_what; struct _selection *sel_next; *************** *** 105,110 **** /* this structure is instantiated whenever a glist becomes visible. */ /* commented-out fields are not in DesireData */ ! typedef struct _editor ! { t_updateheader e_upd; /* update header structure */ t_selection *e_updlist; /* list of objects to update */ --- 87,91 ---- /* this structure is instantiated whenever a glist becomes visible. */ /* commented-out fields are not in DesireData */ ! typedef struct _editor { t_updateheader e_upd; /* update header structure */ t_selection *e_updlist; /* list of objects to update */ *************** *** 136,141 **** could do so if the structure gets big (like the "editor" above.) */ ! typedef struct _arrayvis ! { t_updateheader av_upd; /* update header structure */ t_garray *av_garray; /* owning structure */ --- 117,121 ---- could do so if the structure gets big (like the "editor" above.) */ ! typedef struct _arrayvis { t_updateheader av_upd; /* update header structure */ t_garray *av_garray; /* owning structure */ *************** *** 144,149 **** /* the t_tick structure describes where to draw x and y "ticks" for a glist */ ! typedef struct _tick /* where to put ticks on x or y axes */ ! { float k_point; /* one point to draw a big tick at */ float k_inc; /* x or y increment per little tick */ --- 124,128 ---- /* the t_tick structure describes where to draw x and y "ticks" for a glist */ ! typedef struct _tick { /* where to put ticks on x or y axes */ float k_point; /* one point to draw a big tick at */ float k_inc; /* x or y increment per little tick */ *************** *** 156,161 **** */ ! struct _glist ! { t_object gl_obj; /* header in case we're a glist */ t_gobj *gl_list; /* the actual data */ --- 135,139 ---- */ ! struct _glist { t_object gl_obj; /* header in case we're a glist */ t_gobj *gl_list; /* the actual data */ *************** *** 212,217 **** #define DT_ARRAY 3 ! typedef struct _dataslot ! { int ds_type; t_symbol *ds_name; --- 190,194 ---- #define DT_ARRAY 3 ! typedef struct _dataslot { int ds_type; t_symbol *ds_name; *************** *** 219,224 **** } t_dataslot; ! typedef struct _template ! { t_pd t_pdobj; /* header */ struct _gtemplate *t_list; /* list of "struct"/gtemplate objects */ --- 196,200 ---- } t_dataslot; ! typedef struct _template { t_pd t_pdobj; /* header */ struct _gtemplate *t_list; /* list of "struct"/gtemplate objects */ *************** *** 228,233 **** } t_template; ! struct _array ! { int a_n; /* number of elements */ int a_elemsize; /* size in bytes; LATER get this from template */ --- 204,208 ---- } t_template; ! struct _array { int a_n; /* number of elements */ int a_elemsize; /* size in bytes; LATER get this from template */ *************** *** 239,244 **** }; ! struct _garray ! { t_gobj x_gobj; t_scalar *x_scalar; /* scalar "containing" the array */ --- 214,218 ---- }; ! struct _garray { t_gobj x_gobj; t_scalar *x_scalar; /* scalar "containing" the array */ *************** *** 253,258 **** /* structure for traversing all the connections in a glist */ ! typedef struct _linetraverser ! { t_canvas *tr_x; t_object *tr_ob; --- 227,231 ---- /* structure for traversing all the connections in a glist */ ! typedef struct _linetraverser { t_canvas *tr_x; t_object *tr_ob; *************** *** 268,305 **** } t_linetraverser; - /* function types used to define graphical behavior for gobjs, a bit like X - widgets. We don't use Pd methods because Pd's typechecking can't specify the - types of pointer arguments. Also it's more convenient this way, since - every "patchable" object can just get the "text" behaviors. */ - - /* 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); - /* field a mouse click (when not in "edit" mode) */ - typedef int (*t_clickfn)(t_gobj *x, struct _glist *glist, - int xpix, int ypix, int shift, int alt, int dbl, int doit); - /* ... and later, resizing; getting/setting font or color... */ - - 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; - }; - /* -------- behaviors for scalars defined by objects in template --------- */ /* these are set by "drawing commands" in g_template.c which add appearance to --- 241,244 ---- *************** *** 311,342 **** doesn't work on array elements... LATER reconsider this */ ! /* bounding rectangle: */ ! typedef void (*t_parentgetrectfn)(t_gobj *x, struct _glist *glist, ! t_word *data, t_template *tmpl, float basex, float basey, ! int *x1, int *y1, int *x2, int *y2); ! /* displace it */ ! typedef void (*t_parentdisplacefn)(t_gobj *x, struct _glist *glist, ! t_word *data, t_template *tmpl, float basex, float basey, ! int dx, int dy); ! /* change color to show selection */ ! typedef void (*t_parentselectfn)(t_gobj *x, struct _glist *glist, ! t_word *data, t_template *tmpl, float basex, float basey, ! int state); ! /* change appearance to show activation/deactivation: */ ! typedef void (*t_parentactivatefn)(t_gobj *x, struct _glist *glist, ! t_word *data, t_template *tmpl, float basex, float basey, ! int state); ! /* making visible or invisible */ ! typedef void (*t_parentvisfn)(t_gobj *x, struct _glist *glist, ! t_word *data, t_template *tmpl, float basex, float basey, ! int flag); ! /* field a mouse click */ ! typedef int (*t_parentclickfn)(t_gobj *x, struct _glist *glist, ! t_word *data, t_template *tmpl, t_scalar *sc, t_array *ap, ! float basex, float basey, ! int xpix, int ypix, int shift, int alt, int dbl, int doit); ! struct _parentwidgetbehavior ! { t_parentgetrectfn w_parentgetrectfn; t_parentdisplacefn w_parentdisplacefn; --- 250,268 ---- doesn't work on array elements... LATER reconsider this */ ! typedef void (*t_parentgetrectfn)( t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int *x1, int *y1, int *x2, int *y2); ! typedef void (*t_parentdisplacefn)(t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int dx, int dy); ! typedef void (*t_parentselectfn)( t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int state); ! typedef void (*t_parentactivatefn)(t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int state); ! typedef void (*t_parentvisfn)( t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! float basex, float basey, int flag); ! typedef int (*t_parentclickfn)( t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, ! t_scalar *sc, t_array *ap, ! float basex, float basey, int xpix, int ypix, int shift, int alt, int dbl, int doit); ! struct _parentwidgetbehavior { t_parentgetrectfn w_parentgetrectfn; t_parentdisplacefn w_parentdisplacefn; *************** *** 368,385 **** /* ------------------- 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); - 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, - int xpix, int ypix, int shift, int alt, int dbl, int doit); 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); /* -------------------- functions on glists --------------------- */ --- 294,299 ---- *************** *** 389,406 **** EXTERN void glist_cleanup(t_glist *x); EXTERN void glist_free(t_glist *x); - EXTERN void glist_clear(t_glist *x); EXTERN t_canvas *glist_getcanvas(t_glist *x); - - /* dead: - EXTERN int glist_isselected(t_glist *x, t_gobj *y); - EXTERN void glist_select(t_glist *x, t_gobj *y); - EXTERN void glist_deselect(t_glist *x, t_gobj *y); - EXTERN void glist_noselect(t_glist *x); - EXTERN void glist_selectall(t_glist *x); - EXTERN void glist_grab(t_glist *x, t_gobj *y, t_glistmotionfn motionfn, - t_glistkeyfn keyfn, int xpos, int ypos); - */ - EXTERN void glist_delete(t_glist *x, t_gobj *y); EXTERN void glist_retext(t_glist *x, t_text *y); --- 303,308 ---- *************** *** 412,416 **** EXTERN void glist_read(t_glist *x, t_symbol *filename, t_symbol *format); EXTERN void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format); - EXTERN float glist_pixelstox(t_glist *x, float xpix); EXTERN float glist_pixelstoy(t_glist *x, float ypix); --- 314,317 ---- *************** *** 419,423 **** EXTERN float glist_dpixtodx(t_glist *x, float dxpix); EXTERN float glist_dpixtody(t_glist *x, float dypix); - 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); --- 320,323 ---- *************** *** 434,441 **** EXTERN void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag); EXTERN void canvas_create_editor(t_glist *x, int createit); ! void canvas_deletelinesforio(t_canvas *x, t_text *text, ! t_inlet *inp, t_outlet *outp); - /* -------------------- functions on texts ------------------------- */ EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); EXTERN void text_drawborder(t_text *x, t_glist *glist, char *tag, --- 334,339 ---- EXTERN void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag); EXTERN void canvas_create_editor(t_glist *x, int createit); ! void canvas_deletelinesforio(t_canvas *x, t_text *text, t_inlet *inp, t_outlet *outp); EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); EXTERN void text_drawborder(t_text *x, t_glist *glist, char *tag, *************** *** 448,452 **** EXTERN int text_shouldvis(t_text *x, t_glist *glist); - /* -------------------- functions on rtexts ------------------------- */ EXTERN t_rtext *rtext_new(t_glist *glist, t_text *who); EXTERN t_rtext *glist_findrtext(t_glist *gl, t_text *who); --- 346,349 ---- *************** *** 457,469 **** /* -------------------- functions on canvases ------------------------ */ EXTERN t_class *canvas_class; - EXTERN t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv); EXTERN t_symbol *canvas_makebindsym(t_symbol *s); EXTERN void canvas_vistext(t_canvas *x, t_text *y); EXTERN void canvas_deletelinesfor(t_canvas *x, t_text *text); - /* now private: - EXTERN void canvas_stowconnections(t_canvas *x); - EXTERN void canvas_restoreconnections(t_canvas *x); - */ EXTERN void canvas_redraw(t_canvas *x); --- 354,361 ---- *************** *** 474,478 **** EXTERN void canvas_redrawallfortemplate(t_template *tmpl, int action); EXTERN void canvas_redrawallfortemplatecanvas(t_canvas *x, int action); - EXTERN void canvas_zapallfortemplate(t_canvas *tmpl); EXTERN void canvas_setusedastemplate(t_canvas *x); EXTERN t_canvas *canvas_getcurrent(void); --- 366,369 ---- *************** *** 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); --- 377,380 ---- *************** *** 497,562 **** 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); - EXTERN void canvas_connect(t_canvas *x, t_floatarg fwhoout, t_floatarg foutno,t_floatarg fwhoin, t_floatarg finno); EXTERN void canvas_disconnect(t_canvas *x, float index1, float outno, float index2, float inno); ! EXTERN int canvas_isconnected (t_canvas *x, ! t_text *ob1, int n1, t_text *ob2, int n2); EXTERN void canvas_selectinrect(t_canvas *x, int lox, int loy, int hix, int hiy); ! ! /* ---- functions on canvasses as objects --------------------- */ ! ! EXTERN void canvas_fattenforscalars(t_canvas *x, ! int *x1, int *y1, int *x2, int *y2); EXTERN void canvas_visforscalars(t_canvas *x, t_glist *glist, int vis); ! EXTERN int canvas_clicksub(t_canvas *x, int xpix, int ypix, int shift, ! int alt, int dbl, int doit); EXTERN t_glist *canvas_getglistonsuper(void); - 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 garrays (graphical arrays) -------------------- */ - EXTERN t_template *garray_template(t_garray *x); ! /* -------------------- arrays --------------------- */ ! EXTERN t_garray *graph_array(t_glist *gl, t_symbol *s, t_symbol *tmpl, ! t_floatarg f, t_floatarg saveit); EXTERN t_array *array_new(t_symbol *templatesym, t_gpointer *parent); EXTERN void array_resize(t_array *x, int n); EXTERN void array_free(t_array *x); - /* --------------------- gpointers and stubs ---------------- */ EXTERN t_gstub *gstub_new(t_glist *gl, t_array *a); EXTERN void gstub_cutoff(t_gstub *gs); EXTERN void gpointer_setglist(t_gpointer *gp, t_glist *glist, t_scalar *x); - /* --------------------- scalars ------------------------- */ EXTERN void word_init(t_word *wp, t_template *tmpl, t_gpointer *gp); ! EXTERN void word_restore(t_word *wp, t_template *tmpl, ! int argc, t_atom *argv); ! 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, ! t_symbol *elemtemplatesym, float linewidth, float xloc, float xinc, float yloc, float scalarvis, t_fielddesc *xfield, t_fielddesc *yfield, t_fielddesc *wfield, int xpix, int ypix, int shift, int alt, int dbl, int doit); - EXTERN void array_getcoordinate(t_glist *glist, char *elem, int xonset, int yonset, int wonset, int indx, --- 385,427 ---- EXTERN void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir); EXTERN void canvas_loadbang(t_canvas *x); EXTERN int canvas_setdeleting(t_canvas *x, int flag); EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); EXTERN void canvas_connect(t_canvas *x, t_floatarg fwhoout, t_floatarg foutno,t_floatarg fwhoin, t_floatarg finno); EXTERN void canvas_disconnect(t_canvas *x, float index1, float outno, float index2, float inno); ! EXTERN int canvas_isconnected (t_canvas *x, t_text *ob1, int n1, t_text *ob2, int n2); EXTERN void canvas_selectinrect(t_canvas *x, int lox, int loy, int hix, int hiy); ! EXTERN void canvas_fattenforscalars(t_canvas *x, int *x1, int *y1, int *x2, int *y2); EXTERN void canvas_visforscalars(t_canvas *x, t_glist *glist, int vis); ! EXTERN int canvas_clicksub(t_canvas *x, int xpix, int ypix, int shift, int alt, int dbl, int doit); EXTERN t_glist *canvas_getglistonsuper(void); 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); EXTERN t_template *garray_template(t_garray *x); ! EXTERN t_garray *graph_array(t_glist *gl, t_symbol *s, t_symbol *tmpl, t_floatarg f, t_floatarg saveit); EXTERN t_array *array_new(t_symbol *templatesym, t_gpointer *parent); EXTERN void array_resize(t_array *x, int n); EXTERN void array_free(t_array *x); EXTERN t_gstub *gstub_new(t_glist *gl, t_array *a); EXTERN void gstub_cutoff(t_gstub *gs); EXTERN void gpointer_setglist(t_gpointer *gp, t_glist *glist, t_scalar *x); EXTERN void word_init(t_word *wp, t_template *tmpl, t_gpointer *gp); ! EXTERN void word_restore(t_word *wp, t_template *tmpl, int argc, t_atom *argv); ! 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); ! EXTERN int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, t_symbol *elemtemplatesym, float linewidth, float xloc, float xinc, float yloc, float scalarvis, t_fielddesc *xfield, t_fielddesc *yfield, t_fielddesc *wfield, int xpix, int ypix, int shift, int alt, int dbl, int doit); EXTERN void array_getcoordinate(t_glist *glist, char *elem, int xonset, int yonset, int wonset, int indx, *************** *** 564,568 **** t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, float *xp, float *yp, float *wp); - EXTERN int array_getfields(t_symbol *elemtemplatesym, t_canvas **elemtemplatecanvasp, --- 429,432 ---- *************** *** 571,575 **** int *xonsetp, int *yonsetp, int *wonsetp); - /* --------------------- templates ------------------------- */ EXTERN t_template *template_new(t_symbol *sym, int argc, t_atom *argv); EXTERN void template_free(t_template *x); --- 435,438 ---- *************** *** 586,591 **** EXTERN void template_notify(t_template *, t_symbol *s, int argc, t_atom *argv); ! EXTERN t_float template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp, int loud); ! EXTERN void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud); EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud); EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); --- 449,454 ---- EXTERN void template_notify(t_template *, t_symbol *s, int argc, t_atom *argv); ! EXTERN t_float template_getfloat( t_template *x, t_symbol *fieldname, t_word *wp, int loud); ! EXTERN void template_setfloat( t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud); EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud); EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); *************** *** 618,622 **** EXTERN int convert_color2(int x); //EXTERN void binbuf_update(t_iemgui *x, t_symbol *qlass, int argc, t_atom *argv); - //EXTERN int pd_saveargs(t_binbuf *b, char *fmt, ...); //EXTERN int pd_savehead(t_binbuf *b, t_iemgui *x, char *name); EXTERN void iemgui_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2); --- 481,484 ----

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
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