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

Modified Files: Tag: devel_0_39 desire.h Log Message: bringing desire.h into the 21st century... somewhat

Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** desire.h 13 Oct 2005 07:16:01 -0000 1.1.2.5 --- desire.h 21 Aug 2006 02:37:39 -0000 1.1.2.6 *************** *** 107,111 **** --- 107,113 ---- t_selection *e_updlist; /* list of objects to update */ t_rtext *e_rtext; /* text responder linked list */ + #ifndef DESIRE t_selection *e_selection; /* head of the selection list */ + #endif t_rtext *e_textedfor; /* the rtext if any that we are editing */ t_gobj *e_grab; /* object being "dragged" */ *************** *** 285,289 **** /* 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) */ --- 287,291 ---- /* 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) */ *************** *** 391,394 **** --- 393,398 ---- 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); *************** *** 396,399 **** --- 400,405 ---- EXTERN void glist_noselect(t_glist *x); EXTERN void glist_selectall(t_glist *x); + */ + EXTERN void glist_delete(t_glist *x, t_gobj *y); EXTERN void glist_retext(t_glist *x, t_text *y); *************** *** 432,436 **** t_inlet *inp, t_outlet *outp);

- /* -------------------- functions on texts ------------------------- */ EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); --- 438,441 ---- *************** *** 445,471 ****

/* -------------------- functions on rtexts ------------------------- */ - #define RTEXT_DOWN 1 - #define RTEXT_DRAG 2 - #define RTEXT_DBL 3 - #define RTEXT_SHIFT 4 - 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_draw(t_rtext *x); - EXTERN void rtext_erase(t_rtext *x); - EXTERN t_rtext *rtext_remove(t_rtext *first, t_rtext *x); - EXTERN int rtext_height(t_rtext *x); - EXTERN void rtext_displace(t_rtext *x, int dx, int dy); - EXTERN void rtext_select(t_rtext *x, int state); - EXTERN void rtext_activate(t_rtext *x, int state); EXTERN void rtext_free(t_rtext *x); - EXTERN void rtext_key(t_rtext *x, int n, t_symbol *s); - EXTERN void rtext_mouse(t_rtext *x, int xval, int yval, int flag); EXTERN void rtext_retext(t_rtext *x); - EXTERN int rtext_width(t_rtext *x); - EXTERN int rtext_height(t_rtext *x); - EXTERN char *rtext_gettag(t_rtext *x); EXTERN void rtext_gettext(t_rtext *x, char **buf, int *bufsize); - EXTERN void rtext_getseltext(t_rtext *x, char **buf, int *bufsize);

/* -------------------- functions on canvases ------------------------ */ --- 450,458 ---- *************** *** 496,504 **** EXTERN void canvas_dirty(t_canvas *x, t_int n); EXTERN int canvas_getfont(t_canvas *x); - typedef int (*t_canvasapply)(t_canvas *x, t_int x1, t_int x2, t_int x3); - - EXTERN t_int *canvas_recurapply(t_canvas *x, t_canvasapply *fn, - t_int x1, t_int x2, t_int x3); - EXTERN void canvas_resortinlets(t_canvas *x); EXTERN void canvas_resortoutlets(t_canvas *x); --- 483,486 ---- *************** *** 516,528 **** int *x1p, int *y1p, int *x2p, int *y2p); EXTERN int canvas_setdeleting(t_canvas *x, int flag); - - typedef void (*t_undofn)(t_canvas *canvas, void *buf, - int action); /* a function that does UNDO/REDO */ - #define UNDO_FREE 0 /* free current undo/redo buffer */ - #define UNDO_UNDO 1 /* undo */ - #define UNDO_REDO 2 /* redo */ - EXTERN void canvas_setundo(t_canvas *x, t_undofn undofn, void *buf, - const char *name); - EXTERN void canvas_noundo(t_canvas *x); EXTERN int canvas_getindex(t_canvas *x, t_gobj *y);

--- 498,501 ---- *************** *** 591,595 **** t_canvas **elemtemplatecanvasp, t_template **elemtemplatep, int *elemsizep, ! t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, int *xonsetp, int *yonsetp, int *wonsetp);

--- 564,568 ---- t_canvas **elemtemplatecanvasp, t_template **elemtemplatep, int *elemsizep, ! t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, int *xonsetp, int *yonsetp, int *wonsetp);

*************** *** 600,617 **** EXTERN int template_find_field(t_template *x, t_symbol *name, int *p_onset, int *p_type, t_symbol **p_arraytype); ! 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); ! EXTERN t_template *gtemplate_get(t_gtemplate *x); EXTERN t_template *template_findbyname(t_symbol *s); 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); --- 573,584 ---- EXTERN int template_find_field(t_template *x, t_symbol *name, int *p_onset, int *p_type, t_symbol **p_arraytype); ! 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); EXTERN t_template *gtemplate_get(t_gtemplate *x); EXTERN t_template *template_findbyname(t_symbol *s); 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); *************** *** 624,628 **** EXTERN float fielddesc_cvtfromcoord(t_fielddesc *f, float coord);

- /* ----------------------- guiconnects, g_guiconnect.c --------- */ EXTERN t_guiconnect *guiconnect_new(t_pd *who, t_symbol *sym); --- 591,594 ----