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 ----