Pd-cvs November 2007

pd-cvs@lists.iem.at

14 participants
212 discussions

externals/tkwidgets/shared tkwidgets.c, 1.10, 1.11 tkwidgets.h, 1.9, 1.10
by Hans-Christoph Steiner 24 Nov '07

24 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10569/shared Modified Files: tkwidgets.c tkwidgets.h Log Message: moved inlet/outlet counts to tkwidgets.h Index: tkwidgets.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/shared/tkwidgets.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tkwidgets.c 24 Nov 2007 00:33:42 -0000 1.10 --- tkwidgets.c 24 Nov 2007 04:07:23 -0000 1.11 *************** *** 170,177 **** } void tkwidgets_draw_iolets(t_object *x, t_glist *glist, t_symbol *canvas_id, t_symbol *iolets_tag, t_symbol *all_tag, ! int width, int height, ! int total_inlets, int total_outlets) { int i, onset; --- 170,180 ---- } + /* standard method for drawing inlets and outlets. Currently, the number of + * inlets and outlets is set in tkwidgets.h since I think all of the + * objectclasses will have the same ones. If that needs to change, then this + * function can use obj_ninlets() and obj_noutlets() */ void tkwidgets_draw_iolets(t_object *x, t_glist *glist, t_symbol *canvas_id, t_symbol *iolets_tag, t_symbol *all_tag, ! int width, int height) { int i, onset; *************** *** 180,186 **** /* TODO: make inlets draw on top of widget */ ! for (i = 0; i < total_inlets; i++) /* inlets */ { ! onset = calculate_onset(x_location, width, i, total_inlets); sys_vgui("%s create rectangle %d %d %d %d -tags {%s %s}\n", canvas_id->s_name, onset, y_location - 2, --- 183,189 ---- /* TODO: make inlets draw on top of widget */ ! for (i = 0; i < TOTAL_INLETS; i++) /* inlets */ { ! onset = calculate_onset(x_location, width, i, TOTAL_INLETS); sys_vgui("%s create rectangle %d %d %d %d -tags {%s %s}\n", canvas_id->s_name, onset, y_location - 2, *************** *** 189,195 **** sys_vgui("%s raise %s\n", canvas_id->s_name, iolets_tag->s_name); } ! for (i = 0; i < total_outlets; i++) /* outlets */ { ! onset = calculate_onset(x_location, width, i, total_outlets); sys_vgui("%s create rectangle %d %d %d %d -tags {%s %s}\n", canvas_id->s_name, onset, y_location + height, --- 192,198 ---- sys_vgui("%s raise %s\n", canvas_id->s_name, iolets_tag->s_name); } ! for (i = 0; i < TOTAL_OUTLETS; i++) /* outlets */ { ! onset = calculate_onset(x_location, width, i, TOTAL_OUTLETS); sys_vgui("%s create rectangle %d %d %d %d -tags {%s %s}\n", canvas_id->s_name, onset, y_location + height, Index: tkwidgets.h =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/shared/tkwidgets.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tkwidgets.h 24 Nov 2007 00:33:42 -0000 1.9 --- tkwidgets.h 24 Nov 2007 04:07:23 -0000 1.10 *************** *** 34,37 **** --- 34,41 ---- #endif + /* so far, all of the tkwidgets objects have the same inlets/outlets */ + #define TOTAL_INLETS 1 + #define TOTAL_OUTLETS 2 + /* size and offset for the resizing handle */ #define TKW_HANDLE_HEIGHT 15 *************** *** 93,98 **** void tkwidgets_draw_iolets(t_object *x, t_glist *glist, t_symbol *canvas_id, t_symbol *iolets_tag, t_symbol *all_tag, ! int width, int height, ! int total_inlets, int total_outlets); void tkwidgets_erase_iolets(t_symbol* canvas_id, t_symbol* iolets_tag); --- 97,101 ---- void tkwidgets_draw_iolets(t_object *x, t_glist *glist, t_symbol *canvas_id, t_symbol *iolets_tag, t_symbol *all_tag, ! int width, int height); void tkwidgets_erase_iolets(t_symbol* canvas_id, t_symbol* iolets_tag);

1 0

externals/tkwidgets checkbutton.c, 1.5, 1.6 text.c, 1.12, 1.13
by Hans-Christoph Steiner 24 Nov '07

24 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10569 Modified Files: checkbutton.c text.c Log Message: moved inlet/outlet counts to tkwidgets.h Index: checkbutton.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/checkbutton.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** checkbutton.c 24 Nov 2007 00:33:42 -0000 1.5 --- checkbutton.c 24 Nov 2007 04:07:23 -0000 1.6 *************** *** 122,126 **** tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); sys_vgui("%s create window %d %d -anchor nw -window %s -tags {%s %s}\n", x->canvas_id->s_name, --- 122,126 ---- tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height); sys_vgui("%s create window %d %d -anchor nw -window %s -tags {%s %s}\n", x->canvas_id->s_name, *************** *** 219,224 **** sys_vgui("%s itemconfigure %s -width %d -height %d\n", x->canvas_id->s_name, x->window_tag->s_name, x->width, x->height); - // erase_inlets(x); - // tkwidgets_draw_iolets(x, x->x_glist, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } --- 219,222 ---- *************** *** 262,266 **** x->x_glist = canvas_getcurrent(); - set_tkwidgets_ids(x, x->x_glist); x->iolets_tag = tkwidgets_gen_iolets_tag((t_object*)x); x->all_tag = tkwidgets_gen_all_tag((t_object*)x); --- 260,263 ---- Index: text.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/text.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** text.c 24 Nov 2007 00:33:42 -0000 1.12 --- text.c 24 Nov 2007 04:07:23 -0000 1.13 *************** *** 38,44 **** #define TEXT_MIN_HEIGHT 20 - #define TOTAL_INLETS 1 - #define TOTAL_OUTLETS 2 - #define DEBUG(x) x --- 38,41 ---- *************** *** 110,113 **** --- 107,112 ---- "width", "wrap", + // "xscrollcommand", /* problematic since it uses the canvas_id, etc. */ + // "yscrollcommand", /* problematic since it uses the canvas_id, etc. */ }; *************** *** 188,192 **** tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); if(x->have_scrollbars) draw_scrollbar(x); sys_vgui("%s create window %d %d -anchor nw -window %s \ --- 187,191 ---- tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height); if(x->have_scrollbars) draw_scrollbar(x); sys_vgui("%s create window %d %d -anchor nw -window %s \ *************** *** 558,562 **** tkwidgets_draw_iolets((t_object*)x, x->x_glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } --- 557,561 ---- tkwidgets_draw_iolets((t_object*)x, x->x_glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } *************** *** 606,610 **** tkwidgets_draw_iolets((t_object*)x, canvas, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } --- 605,609 ---- tkwidgets_draw_iolets((t_object*)x, canvas, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet }

1 0

externals/tkwidgets/shared tkwidgets.c, 1.9, 1.10 tkwidgets.h, 1.8, 1.9
by Hans-Christoph Steiner 24 Nov '07

24 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv820/shared Modified Files: tkwidgets.c tkwidgets.h Log Message: - created tkwidgets_list_options() to query which Tk options are supported - removed set_tk_widgets_ids() from places where it wasn't need AFAIK - minor renames and cleanups Index: tkwidgets.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/shared/tkwidgets.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tkwidgets.c 23 Nov 2007 23:47:00 -0000 1.9 --- tkwidgets.c 24 Nov 2007 00:33:42 -0000 1.10 *************** *** 52,60 **** for(i = 0; i < argc; i++) { ! sys_vgui("set ::%s::ret [%s cget -%s]\n", tcl_namespace->s_name, widget_id->s_name, argv[i]); ! sys_vgui("if {[string length $::%s::ret] > 0} {\n", tcl_namespace->s_name); ! sys_vgui("lappend ::%s::list -%s; lappend ::%s::list $::%s::ret}\n", tcl_namespace->s_name, argv[i], tcl_namespace->s_name, tcl_namespace->s_name); --- 52,60 ---- for(i = 0; i < argc; i++) { ! sys_vgui("set ::%s::tmp [%s cget -%s]\n", tcl_namespace->s_name, widget_id->s_name, argv[i]); ! sys_vgui("if {[string length $::%s::tmp] > 0} {\n", tcl_namespace->s_name); ! sys_vgui("lappend ::%s::list -%s; lappend ::%s::list $::%s::tmp}\n", tcl_namespace->s_name, argv[i], tcl_namespace->s_name, tcl_namespace->s_name); *************** *** 65,70 **** } ! void tkwidgets_restore_options(t_symbol *receive_name, t_symbol *tcl_namespace, ! t_symbol *widget_id, t_binbuf *options_binbuf) { int length; --- 65,69 ---- } ! void tkwidgets_restore_options(t_symbol *widget_id, t_binbuf *options_binbuf) { int length; *************** *** 75,78 **** --- 74,91 ---- } + /* output a list of available options for this widget */ + void tkwidgets_list_options(t_outlet *status_outlet, int argc, char** argv) + { + int i; + t_binbuf *bb = binbuf_new(); + for(i = 0; i < argc; ++i) + { + binbuf_addv(bb, "s", gensym(argv[i])); + } + outlet_anything(status_outlet, gensym("options"), + binbuf_getnatom(bb), binbuf_getvec(bb)); + } + + /* -------------------- generate names for various elements ----------------- */ Index: tkwidgets.h =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/shared/tkwidgets.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tkwidgets.h 23 Nov 2007 22:44:03 -0000 1.8 --- tkwidgets.h 24 Nov 2007 00:33:42 -0000 1.9 *************** *** 72,80 **** void tkwidgets_store_options(t_symbol *receive_name, t_symbol *tcl_namespace, t_symbol *widget_id, int argc, char **argv); ! void tkwidgets_restore_options(t_symbol *receive_name, t_symbol *tcl_namespace, ! t_symbol *widget_id, t_binbuf *options_binbuf); void tkwidgets_query_options(t_symbol *receive_name, t_symbol *widget_id, int argc, char** argv); ! /* generate ID and tag names for using in Tcl/Tk space */ --- 72,79 ---- void tkwidgets_store_options(t_symbol *receive_name, t_symbol *tcl_namespace, t_symbol *widget_id, int argc, char **argv); ! void tkwidgets_restore_options(t_symbol *widget_id, t_binbuf *options_binbuf); void tkwidgets_query_options(t_symbol *receive_name, t_symbol *widget_id, int argc, char** argv); ! void tkwidgets_list_options(t_outlet *status_outlet, int argc, char** argv); /* generate ID and tag names for using in Tcl/Tk space */

1 0

externals/tkwidgets checkbutton.c, 1.4, 1.5 text.c, 1.11, 1.12
by Hans-Christoph Steiner 24 Nov '07

24 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv820 Modified Files: checkbutton.c text.c Log Message: - created tkwidgets_list_options() to query which Tk options are supported - removed set_tk_widgets_ids() from places where it wasn't need AFAIK - minor renames and cleanups Index: checkbutton.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/checkbutton.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** checkbutton.c 23 Nov 2007 23:47:00 -0000 1.4 --- checkbutton.c 24 Nov 2007 00:33:42 -0000 1.5 *************** *** 116,120 **** static void checkbutton_drawme(t_checkbutton *x, t_glist *glist) { - set_tkwidgets_ids(x,glist_getcanvas(glist)); sys_vgui("destroy %s\n", x->widget_id->s_name); /* just in case it exists */ --- 116,119 ---- *************** *** 129,138 **** x->widget_id->s_name, x->window_tag->s_name, x->all_tag->s_name); } ! static void checkbutton_erase(t_checkbutton* x, t_glist* glist) { - set_tkwidgets_ids(x, glist_getcanvas(glist)); sys_vgui("destroy %s\n", x->widget_id->s_name); sys_vgui("%s delete %s\n", x->canvas_id->s_name, x->all_tag->s_name); --- 128,138 ---- x->widget_id->s_name, x->window_tag->s_name, x->all_tag->s_name); + tkwidgets_bind_key_events(x->canvas_id, x->widget_id); + tkwidgets_bind_mouse_events(x->canvas_id, x->widget_id); } ! static void checkbutton_erase(t_checkbutton* x) { sys_vgui("destroy %s\n", x->widget_id->s_name); sys_vgui("%s delete %s\n", x->canvas_id->s_name, x->all_tag->s_name); *************** *** 186,191 **** if (glist_isvisible(glist)) { ! set_tkwidgets_ids(x,glist_getcanvas(glist)); ! sys_vgui("%s move %s %d %d\n", x->canvas_id->s_name, x->all_tag->s_name, dx, dy); sys_vgui("%s move RSZ %d %d\n", x->canvas_id->s_name, dx, dy); canvas_fixlinesfor(glist_getcanvas(glist), (t_text*) x); --- 186,191 ---- if (glist_isvisible(glist)) { ! sys_vgui("%s move %s %d %d\n", ! x->canvas_id->s_name, x->all_tag->s_name, dx, dy); sys_vgui("%s move RSZ %d %d\n", x->canvas_id->s_name, dx, dy); canvas_fixlinesfor(glist_getcanvas(glist), (t_text*) x); *************** *** 205,209 **** checkbutton_drawme(s, glist); else ! checkbutton_erase(s, glist); } --- 205,209 ---- checkbutton_drawme(s, glist); else ! checkbutton_erase(s); } Index: text.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/text.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** text.c 23 Nov 2007 23:47:00 -0000 1.11 --- text.c 24 Nov 2007 00:33:42 -0000 1.12 *************** *** 28,31 **** --- 28,32 ---- /* TODO: window name "handle1376fc00" already exists in parent */ /* TODO: figure out window vs. text width/height */ + /* TODO: handle bg color on select/deselect */ *************** *** 194,199 **** x->frame_id->s_name, x->window_tag->s_name, x->all_tag->s_name, x->width, x->height); ! tkwidgets_restore_options(x->receive_name, x->tcl_namespace, ! x->widget_id, x->options_binbuf); } --- 195,199 ---- x->frame_id->s_name, x->window_tag->s_name, x->all_tag->s_name, x->width, x->height); ! tkwidgets_restore_options(x->widget_id, x->options_binbuf); } *************** *** 229,233 **** if (glist_isvisible(glist)) { ! set_tkwidgets_ids(x,glist_getcanvas(glist)); sys_vgui("%s move %s %d %d\n", x->canvas_id->s_name, x->all_tag->s_name, dx, dy); sys_vgui("%s move RESIZE %d %d\n", x->canvas_id->s_name, dx, dy); --- 229,233 ---- if (glist_isvisible(glist)) { ! // set_tkwidgets_ids(x,glist_getcanvas(glist)); /* TODO is this needed here? */ sys_vgui("%s move %s %d %d\n", x->canvas_id->s_name, x->all_tag->s_name, dx, dy); sys_vgui("%s move RESIZE %d %d\n", x->canvas_id->s_name, dx, dy); *************** *** 472,476 **** } ! static void textwidget_option(t_textwidget *x, t_symbol *s, int argc, t_atom *argv) { if(s != &s_list) --- 472,478 ---- } ! /* this function uses the selector as the Tk option and applies the whole ! * message directly to the Tk widget itself using Tk's "configure" */ ! static void textwidget_set_option(t_textwidget *x, t_symbol *s, int argc, t_atom *argv) { if(s != &s_list) *************** *** 484,488 **** binbuf_free(argument_binbuf); argument_buffer[buffer_length] = 0; - post("argument_buffer: %s", argument_buffer); sys_vgui("%s configure -%s {%s} \n", x->widget_id->s_name, s->s_name, argument_buffer); --- 486,489 ---- *************** *** 493,496 **** --- 494,504 ---- } + static void textwidget_options(t_textwidget *x) + { + tkwidgets_list_options(x->x_status_outlet, + sizeof(textwidget_tk_options)/sizeof(char *), + (char **)&textwidget_tk_options); + } + static void query_scrollbars(t_textwidget *x) { *************** *** 666,670 **** x->x_glist = canvas_getcurrent(); ! set_tkwidgets_ids(x, x->x_glist); x->iolets_tag = tkwidgets_gen_iolets_tag((t_object*)x); x->all_tag = tkwidgets_gen_all_tag((t_object*)x); --- 674,678 ---- x->x_glist = canvas_getcurrent(); ! // set_tkwidgets_ids(x, x->x_glist); /* TODO: is this needed here? */ x->iolets_tag = tkwidgets_gen_iolets_tag((t_object*)x); x->all_tag = tkwidgets_gen_all_tag((t_object*)x); *************** *** 682,686 **** class_addbang(textwidget_class, (t_method)textwidget_bang_output); ! class_addanything(textwidget_class, (t_method)textwidget_option); class_addmethod(textwidget_class, (t_method)textwidget_append, --- 690,694 ---- class_addbang(textwidget_class, (t_method)textwidget_bang_output); ! class_addanything(textwidget_class, (t_method)textwidget_set_option); class_addmethod(textwidget_class, (t_method)textwidget_append, *************** *** 690,693 **** --- 698,703 ---- class_addmethod(textwidget_class, (t_method)textwidget_key, gensym("key"), A_GIMME, 0); + class_addmethod(textwidget_class, (t_method)textwidget_options, + gensym("options"), 0); class_addmethod(textwidget_class, (t_method)textwidget_query, gensym("query"), A_DEFSYMBOL, 0); *************** *** 698,701 **** --- 708,712 ---- class_addmethod(textwidget_class, (t_method)textwidget_size, gensym("size"), A_DEFFLOAT, A_DEFFLOAT, 0); + /* callbacks */ class_addmethod(textwidget_class, (t_method)textwidget_store_callback,

1 0

externals Makefile,1.167,1.168
by Hans-Christoph Steiner 24 Nov '07

24 Nov '07

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17325 Modified Files: Makefile Log Message: hack to statically link shared code until I figure out all the shared DLL stuff Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** Makefile 15 Nov 2007 17:27:02 -0000 1.167 --- Makefile 23 Nov 2007 23:47:44 -0000 1.168 *************** *** 104,107 **** --- 104,108 ---- `test -f $*.libs && cat $*.libs` \ `my_dylib=$(patsubst $(externals_src)/%,%,$(@D)); test -f $((a)D)/lib$${my_dylib}.$(DYLIB_EXTENSION) && echo -L$(@D) -l$$my_dylib` \ + `my_obj=$(patsubst $(externals_src)/%,%,$(@D)); test -f $((a)D)/shared/$${my_obj}.o && echo $((a)D)/shared/$${my_obj}.o` \ `test -f $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs && \ cat $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs` *************** *** 2169,2175 **** TKWIDGETS_SHARED := $(wildcard $(externals_src)/tkwidgets/shared/*.c) tkwidgets_shared: $(TKWIDGETS_SHARED:.c=.o) ! $(CC) $(DYLIB_LDFLAGS) \ ! -o $(externals_src)/tkwidgets/libtkwidgets.$(DYLIB_EXTENSION) \ ! $(TKWIDGETS_SHARED:.c=.o) tkwidgets: tkwidgets_shared $(TKWIDGETS_OBJECTS:.c=.$(EXTENSION)) --- 2170,2176 ---- TKWIDGETS_SHARED := $(wildcard $(externals_src)/tkwidgets/shared/*.c) tkwidgets_shared: $(TKWIDGETS_SHARED:.c=.o) ! # $(CC) $(DYLIB_LDFLAGS) \ ! # -o $(externals_src)/tkwidgets/libtkwidgets.$(DYLIB_EXTENSION) \ ! # $(TKWIDGETS_SHARED:.c=.o) tkwidgets: tkwidgets_shared $(TKWIDGETS_OBJECTS:.c=.$(EXTENSION))

1 0

externals/tkwidgets/shared tkwidgets.c,1.8,1.9
by Hans-Christoph Steiner 24 Nov '07

24 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16952/shared Modified Files: tkwidgets.c Log Message: Fixed these: /* TODO: add size to query and save */ /* TODO: add scrollbars to query and save */ /* TODO: remove glist from _erase() args */ Index: tkwidgets.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/shared/tkwidgets.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tkwidgets.c 23 Nov 2007 22:44:03 -0000 1.8 --- tkwidgets.c 23 Nov 2007 23:47:00 -0000 1.9 *************** *** 166,169 **** --- 166,170 ---- int y_location = text_ypix(x, glist); + /* TODO: make inlets draw on top of widget */ for (i = 0; i < total_inlets; i++) /* inlets */ {

1 0

externals/tkwidgets checkbutton.c, 1.3, 1.4 text.c, 1.10, 1.11
by Hans-Christoph Steiner 24 Nov '07

24 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16952 Modified Files: checkbutton.c text.c Log Message: Fixed these: /* TODO: add size to query and save */ /* TODO: add scrollbars to query and save */ /* TODO: remove glist from _erase() args */ Index: checkbutton.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/checkbutton.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** checkbutton.c 22 Nov 2007 02:50:23 -0000 1.3 --- checkbutton.c 23 Nov 2007 23:47:00 -0000 1.4 *************** *** 121,125 **** sys_vgui("checkbutton %s\n", x->widget_id->s_name); ! tkwidgets_draw_inlets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); --- 121,125 ---- sys_vgui("checkbutton %s\n", x->widget_id->s_name); ! tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); *************** *** 220,224 **** x->canvas_id->s_name, x->window_tag->s_name, x->width, x->height); // erase_inlets(x); ! // tkwidgets_draw_inlets(x, x->x_glist, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } --- 220,224 ---- x->canvas_id->s_name, x->window_tag->s_name, x->width, x->height); // erase_inlets(x); ! // tkwidgets_draw_iolets(x, x->x_glist, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } Index: text.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/text.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** text.c 23 Nov 2007 22:44:03 -0000 1.10 --- text.c 23 Nov 2007 23:47:00 -0000 1.11 *************** *** 26,32 **** /* TODO: get Ctrl-A working to select all */ /* TODO: set message doesnt work with a loadbang */ - /* TODO: add size to query and save */ - /* TODO: add scrollbars to query and save */ - /* TODO: remove glist from _erase() args */ /* TODO: window name "handle1376fc00" already exists in parent */ /* TODO: figure out window vs. text width/height */ --- 26,29 ---- *************** *** 35,39 **** #define DEFAULT_COLOR "grey70" ! #define TEXT_DEFAULT_WIDTH 130 #define TEXT_DEFAULT_HEIGHT 60 #define TEXT_MIN_WIDTH 40 --- 32,36 ---- #define DEFAULT_COLOR "grey70" ! #define TEXT_DEFAULT_WIDTH 200 #define TEXT_DEFAULT_HEIGHT 60 #define TEXT_MIN_WIDTH 40 *************** *** 201,209 **** } ! static void textwidget_erase(t_textwidget* x,t_glist* glist) { ! DEBUG(post("textwidget_erase: canvas %lx glist %lx", x->x_canvas, glist);); ! ! set_tkwidgets_ids(x,glist_getcanvas(glist)); tkwidgets_erase_iolets(x->canvas_id, x->iolets_tag); sys_vgui("destroy %s\n", x->frame_id->s_name); --- 198,204 ---- } ! static void textwidget_erase(t_textwidget* x) { ! DEBUG(post("textwidget_erase: canvas %lx", x->x_canvas);); tkwidgets_erase_iolets(x->canvas_id, x->iolets_tag); sys_vgui("destroy %s\n", x->frame_id->s_name); *************** *** 316,320 **** else { y = glist_findrtext(glist, (t_text *)z); ! textwidget_erase(x, glist); rtext_free(y); } --- 311,315 ---- else { y = glist_findrtext(glist, (t_text *)z); ! textwidget_erase(x); rtext_free(y); }

1 0

externals/tkwidgets text.c,1.9,1.10
by Hans-Christoph Steiner 23 Nov '07

23 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26612 Modified Files: text.c Log Message: - fixed bug that caused the iolets to multiply whenever resizing, I forgot to add the ->s_name to a symbol used in the sys_vgui, so it was using the pointer value. - moved standard key/mouse binding functions to tkwidgets.[ch] - minor code cleanups for legibility Index: text.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/text.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** text.c 22 Nov 2007 05:57:45 -0000 1.9 --- text.c 23 Nov 2007 22:44:03 -0000 1.10 *************** *** 31,36 **** /* TODO: window name "handle1376fc00" already exists in parent */ /* TODO: figure out window vs. text width/height */ ! /* TODO: move bind_* to tkwidgets.c */ ! /* TODO: erase iolets on resize, they are leaving old ones behind */ #define DEFAULT_COLOR "grey70" --- 31,35 ---- /* TODO: window name "handle1376fc00" already exists in parent */ /* TODO: figure out window vs. text width/height */ ! #define DEFAULT_COLOR "grey70" *************** *** 160,212 **** } - static void bind_standard_keys(t_textwidget *x) - { - #ifdef __APPLE__ - sys_vgui("bind %s <Mod1-Key> {pdtk_canvas_ctrlkey %s %%K 0}\n", - x->widget_id->s_name, x->canvas_id->s_name); - sys_vgui("bind %s <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %s %%K 1}\n", - x->widget_id->s_name, x->canvas_id->s_name); - #else - sys_vgui("bind %s <Control-Key> {pdtk_canvas_ctrlkey %s %%K 0}\n", - x->widget_id->s_name, x->canvas_id->s_name); - sys_vgui("bind %s <Control-Shift-Key> {pdtk_canvas_ctrlkey %s %%K 1}\n", - x->widget_id->s_name, x->canvas_id->s_name); - #endif - } - - static void bind_button_events(t_textwidget *x) - { - /* mouse buttons */ - sys_vgui("bind %s <Button> {pdtk_canvas_sendclick %s \ - [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b 0}\n", - x->widget_id->s_name, x->canvas_id->s_name, - x->canvas_id->s_name, x->canvas_id->s_name); - sys_vgui("bind %s <ButtonRelease> {pdtk_canvas_mouseup %s \ - [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", - x->widget_id->s_name, x->canvas_id->s_name, - x->canvas_id->s_name, x->canvas_id->s_name); - sys_vgui("bind %s <Shift-Button> {pdtk_canvas_click %s \ - [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b 1}\n", - x->widget_id->s_name, x->canvas_id->s_name, - x->canvas_id->s_name, x->canvas_id->s_name); - sys_vgui("bind %s <Button-2> {pdtk_canvas_rightclick %s \ - [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", - x->widget_id->s_name, x->canvas_id->s_name, - x->canvas_id->s_name, x->canvas_id->s_name); - sys_vgui("bind %s <Button-3> {pdtk_canvas_rightclick %s \ - [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", - x->widget_id->s_name, x->canvas_id->s_name, - x->canvas_id->s_name, x->canvas_id->s_name); - sys_vgui("bind %s <Control-Button> {pdtk_canvas_rightclick %s \ - [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", - x->widget_id->s_name, x->canvas_id->s_name, - x->canvas_id->s_name, x->canvas_id->s_name); - /* mouse motion */ - sys_vgui("bind %s <Motion> {pdtk_canvas_motion %s \ - [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] 0}\n", - x->widget_id->s_name, x->canvas_id->s_name, - x->canvas_id->s_name, x->canvas_id->s_name); - } - static void create_widget(t_textwidget *x) { --- 159,162 ---- *************** *** 226,231 **** sys_vgui("pack %s -side bottom -fill both -expand 1 \n", x->frame_id->s_name); ! bind_standard_keys(x); ! bind_button_events(x); sys_vgui("bind %s <KeyRelease> {+pd %s keyup %%N \\;} \n", x->widget_id->s_name, x->receive_name->s_name); --- 176,182 ---- sys_vgui("pack %s -side bottom -fill both -expand 1 \n", x->frame_id->s_name); ! tkwidgets_bind_key_events(x->canvas_id, x->widget_id); ! tkwidgets_bind_mouse_events(x->canvas_id, x->widget_id); ! /* bind to KeyRelease events to send out right outlet one key at a time */ sys_vgui("bind %s <KeyRelease> {+pd %s keyup %%N \\;} \n", x->widget_id->s_name, x->receive_name->s_name); *************** *** 331,334 **** --- 282,286 ---- /* sys_vgui("%s create line %d %d %d %d -fill black -tags RESIZE_LINES\n", */ /* x->handle_id->s_name, handle_x2, handle_y1, handle_x1, handle_y2); */ + /* TODO split out the handle and the handle binding into common functions */ sys_vgui("%s create window %d %d -anchor nw -width %d -height %d -window %s -tags RESIZE\n", x->canvas_id->s_name, handle_x1, handle_y1, *************** *** 646,651 **** { t_canvas *canvas = (glist_isvisible(x->x_glist) ? x->x_canvas : 0); ! int newstate = (int)f; ! if (x->x_resizing && !newstate && canvas) { tkwidgets_draw_iolets((t_object*)x, canvas, --- 598,603 ---- { t_canvas *canvas = (glist_isvisible(x->x_glist) ? x->x_canvas : 0); ! int button_state = (int)f; ! if (x->x_resizing && !button_state && canvas) { tkwidgets_draw_iolets((t_object*)x, canvas, *************** *** 654,662 **** canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } ! if (!x->x_resizing && newstate) { tkwidgets_erase_iolets(x->canvas_id, x->iolets_tag); } ! x->x_resizing = newstate; } --- 606,614 ---- canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } ! if (!x->x_resizing && button_state) { tkwidgets_erase_iolets(x->canvas_id, x->iolets_tag); } ! x->x_resizing = button_state; }

1 0

externals/tkwidgets/shared tkwidgets.c, 1.7, 1.8 tkwidgets.h, 1.7, 1.8
by Hans-Christoph Steiner 23 Nov '07

23 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26612/shared Modified Files: tkwidgets.c tkwidgets.h Log Message: - fixed bug that caused the iolets to multiply whenever resizing, I forgot to add the ->s_name to a symbol used in the sys_vgui, so it was using the pointer value. - moved standard key/mouse binding functions to tkwidgets.[ch] - minor code cleanups for legibility Index: tkwidgets.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/shared/tkwidgets.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tkwidgets.c 22 Nov 2007 05:57:45 -0000 1.7 --- tkwidgets.c 23 Nov 2007 22:44:03 -0000 1.8 *************** *** 188,192 **** void tkwidgets_erase_iolets(t_symbol* canvas_id, t_symbol* iolets_tag) { ! sys_vgui("%s delete %s\n", canvas_id->s_name, iolets_tag); } --- 188,244 ---- void tkwidgets_erase_iolets(t_symbol* canvas_id, t_symbol* iolets_tag) { ! sys_vgui("%s delete %s\n", canvas_id->s_name, iolets_tag->s_name); ! } ! ! ! /* -------------------- bind to keys and mouse events ----------------------- */ ! ! void tkwidgets_bind_key_events(t_symbol *canvas_id, t_symbol *widget_id) ! { ! #ifdef __APPLE__ ! sys_vgui("bind %s <Mod1-Key> {pdtk_canvas_ctrlkey %s %%K 0}\n", ! widget_id->s_name, canvas_id->s_name); ! sys_vgui("bind %s <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %s %%K 1}\n", ! widget_id->s_name, canvas_id->s_name); ! #else ! sys_vgui("bind %s <Control-Key> {pdtk_canvas_ctrlkey %s %%K 0}\n", ! widget_id->s_name, canvas_id->s_name); ! sys_vgui("bind %s <Control-Shift-Key> {pdtk_canvas_ctrlkey %s %%K 1}\n", ! widget_id->s_name, canvas_id->s_name); ! #endif ! } ! ! void tkwidgets_bind_mouse_events(t_symbol *canvas_id, t_symbol *widget_id) ! { ! /* mouse buttons */ ! sys_vgui("bind %s <Button> {pdtk_canvas_sendclick %s \ ! [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b 0}\n", ! widget_id->s_name, canvas_id->s_name, ! canvas_id->s_name, canvas_id->s_name); ! sys_vgui("bind %s <ButtonRelease> {pdtk_canvas_mouseup %s \ ! [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", ! widget_id->s_name, canvas_id->s_name, ! canvas_id->s_name, canvas_id->s_name); ! sys_vgui("bind %s <Shift-Button> {pdtk_canvas_click %s \ ! [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b 1}\n", ! widget_id->s_name, canvas_id->s_name, ! canvas_id->s_name, canvas_id->s_name); ! sys_vgui("bind %s <Button-2> {pdtk_canvas_rightclick %s \ ! [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", ! widget_id->s_name, canvas_id->s_name, ! canvas_id->s_name, canvas_id->s_name); ! sys_vgui("bind %s <Button-3> {pdtk_canvas_rightclick %s \ ! [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", ! widget_id->s_name, canvas_id->s_name, ! canvas_id->s_name, canvas_id->s_name); ! sys_vgui("bind %s <Control-Button> {pdtk_canvas_rightclick %s \ ! [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", ! widget_id->s_name, canvas_id->s_name, ! canvas_id->s_name, canvas_id->s_name); ! /* mouse motion */ ! sys_vgui("bind %s <Motion> {pdtk_canvas_motion %s \ ! [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] 0}\n", ! widget_id->s_name, canvas_id->s_name, ! canvas_id->s_name, canvas_id->s_name); } Index: tkwidgets.h =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/shared/tkwidgets.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tkwidgets.h 22 Nov 2007 05:57:45 -0000 1.7 --- tkwidgets.h 23 Nov 2007 22:44:03 -0000 1.8 *************** *** 101,107 **** void tkwidgets_draw_resize_window(); // TODO draw the resize window while resizing ! ! ! --- 101,109 ---- void tkwidgets_draw_resize_window(); // TODO draw the resize window while resizing ! /* bind this widget to Cmd/Ctrl keys and mouse events to support things like ! * then standard keys and right-click to bring up the Properties/Open/Help ! * menu when the Tk widgets have focus */ ! void tkwidgets_bind_key_events(t_symbol *canvas_id, t_symbol *widget_id); ! void tkwidgets_bind_mouse_events(t_symbol *canvas_id, t_symbol *widget_id);

1 0

externals/tkwidgets Makefile,1.1,1.2
by Hans-Christoph Steiner 23 Nov '07

23 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13565 Modified Files: Makefile Log Message: added shared files to etags Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 14 Nov 2007 02:47:49 -0000 1.1 --- Makefile 23 Nov 2007 19:03:31 -0000 1.2 *************** *** 15,17 **** etags: ! etags *.[ch] ../../pd/src/*.[ch] /usr/include/*.h /usr/include/sys/*.h --- 15,18 ---- etags: ! etags *.[ch] ../../pd/src/*.[ch] /usr/include/*.h /usr/include/sys/*.h \ ! shared/*.[ch]

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
22
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 November 2007