Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8955

Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: removed gobj_select, gobj_activate, canvas_startmotion.

Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** desire.h 2 Sep 2006 08:08:25 -0000 1.1.2.11 --- desire.h 2 Sep 2006 08:13:32 -0000 1.1.2.12 *************** *** 372,378 **** int *x2, int *y2); EXTERN void gobj_displace(t_gobj *x, t_glist *owner, int dx, int dy); - */ EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_delete(t_gobj *x, t_glist *owner); EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag); --- 372,378 ---- int *x2, int *y2); EXTERN void gobj_displace(t_gobj *x, t_glist *owner, int dx, int dy); EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); + */ EXTERN void gobj_delete(t_gobj *x, t_glist *owner); EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag);

Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.135 retrieving revision 1.1.2.136 diff -C2 -d -r1.1.2.135 -r1.1.2.136 *** desire.c 2 Sep 2006 08:08:24 -0000 1.1.2.135 --- desire.c 2 Sep 2006 08:13:32 -0000 1.1.2.136 *************** *** 686,691 **** if (!x->gl_havewindow) {bug("canvas_map"); canvas_vis(x,1);} glist_each(y,x) gobj_changed(y,0); - /*for (sel = x->gl_editor->e_selection; sel; sel = sel->sel_next) - gobj_select(sel->sel_what, x, 1);*/ x->gl_mapped = 1; canvas_drawlines(x); --- 686,689 ---- *************** *** 1256,1269 **** /* ---------------- generic widget behavior ------------------------- */

- void gobj_select(t_gobj *x, t_glist *glist, int state) { - t_widgetbehavior *w = x->g_pd->c_wb; - if (w && w->w_selectfn) w->w_selectfn(x, glist, state); - } - - void gobj_activate(t_gobj *x, t_glist *glist, int state) { - t_widgetbehavior *w = x->g_pd->c_wb; - if (w && w->w_activatefn) w->w_activatefn(x, glist, state); - } - void gobj_delete(t_gobj *x, t_glist *glist) { t_widgetbehavior *w = x->g_pd->c_wb; --- 1254,1257 ---- *************** *** 1489,1512 **** while ((oc = linetraverser_next(&t))) if (t.tr_ob == ob1 && t.tr_outno == n1 && ! t.tr_ob2 == ob2 && t.tr_inno == n2) ! return (1); ! return (0); ! } ! ! /*DIE*/ ! void canvas_startmotion(t_canvas *x) ! { ! int xval, yval; ! if (!x->gl_editor) return; ! glist_getnextxy(x, &xval, &yval); ! if (xval == 0 && yval == 0) return; ! x->gl_editor->e_xwas = xval; ! x->gl_editor->e_ywas = yval; }

/* ----------------------------- window stuff ----------------------- */

! void canvas_print(t_canvas *x, t_symbol *s) ! { sys_vgui(".x%lx.c postscript -file %s\n", (long)x, *s->s_name ? s->s_name : "x.ps"); } --- 1477,1488 ---- while ((oc = linetraverser_next(&t))) if (t.tr_ob == ob1 && t.tr_outno == n1 && ! t.tr_ob2 == ob2 && t.tr_inno == n2) ! return 1; ! return 0; }

/* ----------------------------- window stuff ----------------------- */

! void canvas_print(t_canvas *x, t_symbol *s) { sys_vgui(".x%lx.c postscript -file %s\n", (long)x, *s->s_name ? s->s_name : "x.ps"); } *************** *** 3476,3490 **** }

- static void graph_select(t_gobj *z, t_glist *glist, int state) { - t_glist *x = (t_glist *)z; - if (!x->gl_isgraph) text_widgetbehavior.w_selectfn(z, glist, state); - } - - static void graph_activate(t_gobj *z, t_glist *glist, int state) { - t_glist *x = (t_glist *)z; - if (canvas_showtext(x)) - text_widgetbehavior.w_activatefn(z, glist, state); - } - static void graph_delete(t_gobj *z, t_glist *glist) { --- 3452,3455 ---- *************** *** 3563,3569 **** }

! t_widgetbehavior graph_widgetbehavior = {0,0, ! graph_select, ! graph_activate, graph_delete, graph_vis, --- 3528,3532 ---- }

! t_widgetbehavior graph_widgetbehavior = {0,0,0,0, graph_delete, graph_vis, *************** *** 8103,8107 **** static void text_vis(t_gobj *z, t_glist *glist, int vis);

- void canvas_startmotion(t_canvas *x); extern t_widgetbehavior text_widgetbehavior; void pd_upload(t_gobj *self); --- 8066,8069 ---- *************** *** 8131,8135 **** binbuf_restore(x->te_binbuf, 1, &at); glist_add(gl, &x->te_g); - canvas_startmotion(glist_getcanvas(gl)); } } --- 8093,8096 ---- *************** *** 8161,8165 **** x->te_type = T_OBJECT; glist_add(gl, &x->te_g); - if (selected) gobj_activate(&x->te_g, gl, 1); if (pd_class(&x->ob_pd) == vinlet_class) canvas_resortinlets(glist_getcanvas(gl)); if (pd_class(&x->ob_pd) == voutlet_class) canvas_resortoutlets(glist_getcanvas(gl)); --- 8122,8125 ---- *************** *** 8178,8182 **** glist_getnextxy(gl, &xpix, &ypix); canvas_objtext(gl, xpix, ypix, 1, b); - canvas_startmotion(glist_getcanvas(gl)); } } --- 8138,8141 ---- *************** *** 8191,8195 **** glist_getnextxy(gl, &xpix, &ypix); canvas_objtext(gl, xpix, ypix, 1, b); - canvas_startmotion(glist_getcanvas(gl)); }

--- 8150,8153 ---- *************** *** 8315,8320 **** x->m_text.te_ypix = ypix-3; glist_add(gl, &x->m_text.te_g); - gobj_activate(&x->m_text.te_g, gl, 1); - canvas_startmotion(glist_getcanvas(gl)); } } --- 8273,8276 ---- *************** *** 8496,8500 **** x->a_text.te_ypix = ypix; glist_add(gl, &x->a_text.te_g); - canvas_startmotion(glist_getcanvas(gl)); } } --- 8452,8455 ---- *************** *** 8510,8515 **** }

- static void text_select(t_gobj *z, t_glist *glist, int state) {} - static void text_activate(t_gobj *z, t_glist *glist, int state) {} static void text_delete(t_gobj *z, t_glist *glist) {sys_mgui(z,"delete","");}

--- 8465,8468 ---- *************** *** 8576,8580 ****

/* this one is for everyone but "gatoms"; it's imposed in m_class.c */ ! t_widgetbehavior text_widgetbehavior = {0, 0, text_select, text_activate, text_delete, text_vis, 0};

void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) { --- 8529,8533 ----

/* this one is for everyone but "gatoms"; it's imposed in m_class.c */ ! t_widgetbehavior text_widgetbehavior = {0, 0, 0, 0, text_delete, text_vis, 0};

void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) {