Pd-cvs November 2007

pd-cvs@lists.iem.at

14 participants
212 discussions

externals/tkwidgets text-test.pd,1.1,1.2 text.c,1.2,1.3
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26617 Modified Files: text-test.pd text.c Log Message: got bulk and individual querying working Index: text-test.pd =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/text-test.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** text-test.pd 14 Nov 2007 02:53:03 -0000 1.1 --- text-test.pd 14 Nov 2007 06:16:12 -0000 1.2 *************** *** 2,6 **** #X obj 130 117 text 130 60; #X msg 47 29 size 100 100; ! #X obj 73 543 text 200 50; #X msg 130 30 size 400 200; #X obj 310 11 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 --- 2,6 ---- #X obj 130 117 text 130 60; #X msg 47 29 size 100 100; ! #X obj 48 540 text 130 60; #X msg 130 30 size 400 200; #X obj 310 11 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 *************** *** 20,25 **** --- 20,35 ---- #X msg 272 425 size 200 50; #X msg 89 490 font Arial 16; + #X obj 200 612 print QUERY; + #X floatatom 309 620 5 0 0 0 - - -; + #X obj 309 596 route highlightthickness font; + #X obj 396 624 pddp/print; + #X msg 421 372 width 8; + #X obj 309 642 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 + -1 -1; + #X msg 114 435 query highlightthickness; + #X msg 143 458 query; #X connect 0 1 6 0; #X connect 1 0 0 0; + #X connect 2 1 18 0; #X connect 3 0 0 0; #X connect 4 0 5 0; *************** *** 33,34 **** --- 43,50 ---- #X connect 14 0 2 0; #X connect 15 0 2 0; + #X connect 17 0 21 0; + #X connect 18 0 17 0; + #X connect 18 1 19 0; + #X connect 20 0 2 0; + #X connect 22 0 2 0; + #X connect 23 0 2 0; Index: text.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/text.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** text.c 14 Nov 2007 03:51:35 -0000 1.2 --- text.c 14 Nov 2007 06:16:12 -0000 1.3 *************** *** 48,51 **** --- 48,54 ---- t_symbol* receive_name; + int optionc; + t_atom* optionv; + int x_height; int x_width; *************** *** 150,153 **** --- 153,186 ---- /* widget helper functions */ + + static void save_options(t_textwidget *x, int argc, char** argv) + { + int i; + post("total options: %d", argc); + for(i = 0; i < argc; i++) + { + // sys_vgui("lappend ::%s::optionsList %s \n", x->tcl_namespace, argv[i]); + sys_vgui("pd [concat %s query_callback %s [%s cget -%s] \\;]\n", + x->receive_name->s_name, argv[i], x->text_id, argv[i]); + post("option %d: %s", i, argv[i]); + } + /* sys_vgui("foreach ::%s::option $::%s::optionsList {\n",x->tcl_namespace,x->tcl_namespace); */ + /* sys_vgui("pd [concat %s query_callback $::%s::option [%s cget [format \"-%%s\" $::%s::option]] \\;]\n", */ + /* x->receive_name->s_name, x->tcl_namespace, x->text_id, x->tcl_namespace); */ + // sys_vgui("puts stderr [concat %s query_callback $::%s::option [%s cget [format \"-%%s\" $::%s::option]] \\;] \n", + // x->receive_name->s_name, x->tcl_namespace, x->text_id, x->tcl_namespace); + /* sys_gui("}\n"); */ + /* sys_vgui("unset ::%s::optionsList \n", x->tcl_namespace); */ + } + + static void query_options(t_textwidget *x, int argc, char** argv) + { + int i; + post("total options: %d", argc); + for(i = 0; i < argc; i++) + sys_vgui("pd [concat %s query_callback %s [%s cget -%s] \\;]\n", + x->receive_name->s_name, argv[i], x->text_id, argv[i]); + } + static void set_tk_widget_ids(t_textwidget *x, t_canvas *canvas) { *************** *** 632,635 **** --- 665,677 ---- } + static void textwidget_query(t_textwidget *x, t_symbol *s) + { + post("textwidget_query %s", s->s_name); + if(s == &s_) + query_options(x, sizeof(textwidget_tk_options)/sizeof(char *), textwidget_tk_options); + else + query_options(x, 1, &(s->s_name)); + } + static void textwidget_scrollbar(t_textwidget *x, t_float f) { *************** *** 671,674 **** --- 713,731 ---- /* callback functions */ + + static void textwidget_query_callback(t_textwidget *x, t_symbol *s, int argc, t_atom *argv) + { + t_symbol *tmp_symbol = atom_getsymbolarg(0, argc, argv); + if(tmp_symbol != &s_) + { + post("tmp_symbol %s argc %d", tmp_symbol->s_name, argc); + outlet_anything(x->x_status_outlet, tmp_symbol, argc - 1, argv + 1); + } + else + { + post("textwidget_query_callback %s %d", s->s_name, argc); + } + } + static void textwidget_click_callback(t_textwidget *x, t_floatarg f) { *************** *** 760,771 **** x->x_glist = canvas_getcurrent(); set_tk_widget_ids(x, x->x_glist); - - int i; - int option_argc = sizeof(textwidget_tk_options)/sizeof(char *); - post("total options: %d", option_argc); - for(i = 0; i < option_argc; i++) - { - post("option %d: %s", i, textwidget_tk_options[i]); - } return (x); --- 817,820 ---- *************** *** 781,784 **** --- 830,835 ---- + class_addmethod(textwidget_class, (t_method)textwidget_query, + gensym("query"), A_DEFSYMBOL, 0); class_addmethod(textwidget_class, (t_method)textwidget_scrollbar, gensym("scrollbar"), A_DEFFLOAT, 0); *************** *** 798,801 **** --- 849,854 ---- gensym("clear"), 0); /* callbacks */ + class_addmethod(textwidget_class, (t_method)textwidget_query_callback, + gensym("query_callback"), A_GIMME, 0); class_addmethod(textwidget_class, (t_method)textwidget_keyup_callback, gensym("keyup"), A_DEFFLOAT, 0);

1 0

externals/tkwidgets/shared tkwidgets.c, 1.1, 1.2 tkwidgets.h, 1.1, 1.2
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6801/shared Modified Files: tkwidgets.c tkwidgets.h Log Message: got a quick working example pretty much straight from ggee's image.c; I need to get the shared dylib working before working on a new objectclass Index: tkwidgets.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/shared/tkwidgets.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tkwidgets.c 14 Nov 2007 02:47:49 -0000 1.1 --- tkwidgets.c 14 Nov 2007 03:51:35 -0000 1.2 *************** *** 23,26 **** --- 23,27 ---- #include "tkwidgets.h" #include <stdio.h> + #include <string.h> /* this should be part of the Pd API */ *************** *** 32,35 **** --- 33,51 ---- } + /* + I think I'll probably have to follow Krzsztof and make structs to make this work + tkwidgets_setcallbackname(void *x, char *widget_name) + { + char buf[MAXPDSTRING]; + + sprintf(buf,"%s%lx", widget_name, (long unsigned int)x); + x->tcl_namespace = getbytes(strlen(buf)); + strcpy(x->tcl_namespace, buf); + + sprintf(buf,"#%s", x->tcl_namespace); + x->receive_name = gensym(buf); + pd_bind(&x->x_obj.ob_pd, x->receive_name); + } + */ void draw_inlets(t_object *x, t_glist *glist, int firsttime, Index: tkwidgets.h =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/shared/tkwidgets.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tkwidgets.h 14 Nov 2007 02:47:49 -0000 1.1 --- tkwidgets.h 14 Nov 2007 03:51:35 -0000 1.2 *************** *** 41,44 **** --- 41,46 ---- /* this should be part of the Pd API */ t_symbol *canvas_getname(t_canvas *canvas); + void tkwidgets_setcallbackname(void *x, char *widget_name); + // TODO perhaps I should try to use glist_drawiofor() from g_text.c void draw_inlets(t_object *x, t_glist *glist, int firsttime,

1 0

externals/tkwidgets frosch.gif, NONE, 1.1 photo-help.pd, NONE, 1.1 photo.c, NONE, 1.1 volga.gif, NONE, 1.1 text.c, 1.1, 1.2
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6801 Modified Files: text.c Added Files: frosch.gif photo-help.pd photo.c volga.gif Log Message: got a quick working example pretty much straight from ggee's image.c; I need to get the shared dylib working before working on a new objectclass --- NEW FILE: frosch.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: volga.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: photo.c --- /* [photo] object for dislaying images in a patch Copyright (C) 2002-2004 Guenter Geiger Copyright (C) 2007 Hans-Christoph Steiner <hans(a)at.or.at> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. This is part of the tkwidgets library for Pd. */ #include "shared/tkwidgets.h" /* ------------------------ photo ----------------------------- */ static t_class *photo_class; typedef struct _photo { t_object x_obj; t_glist* x_glist; t_symbol* receive_name; int x_width; int x_height; t_symbol* filename; } t_photo; static char *photo_tk_options[] = { "activeimage", "disabledimage", "gamma", "image", "state" }; /* widget helper functions */ void photo_drawme(t_photo *x, t_glist *glist, int firsttime) { if (firsttime) { char fname[MAXPDSTRING]; canvas_makefilename(glist_getcanvas(x->x_glist), x->filename->s_name, fname, MAXPDSTRING); sys_vgui("image create photo img%x -file {%s}\n", x, fname); sys_vgui(".x%x.c create image %d %d -image img%x -anchor nw -tags %xS\n", glist_getcanvas(glist),text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),x,x); /* TODO callback from gui sys_vgui("photo_size logo"); */ } else { sys_vgui(".x%x.c coords %xS %d %d\n", glist_getcanvas(glist), x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist)); } } void photo_erase(t_photo* x,t_glist* glist) { int n; sys_vgui(".x%x.c delete %xS\n", glist_getcanvas(glist), x); } /* ------------------------ photo widgetbehaviour----------------------------- */ static void photo_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) { t_photo* x = (t_photo*)z; *xp1 = text_xpix(&x->x_obj, glist); *yp1 = text_ypix(&x->x_obj, glist); *xp2 = text_xpix(&x->x_obj, glist) + x->x_width; *yp2 = text_ypix(&x->x_obj, glist) + x->x_height; } static void photo_displace(t_gobj *z, t_glist *glist, int dx, int dy) { t_photo *x = (t_photo *)z; x->x_obj.te_xpix += dx; x->x_obj.te_ypix += dy; sys_vgui(".x%x.c coords %xSEL %d %d %d %d\n", glist_getcanvas(glist), x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist), text_xpix(&x->x_obj, glist) + x->x_width, text_ypix(&x->x_obj, glist) + x->x_height); photo_drawme(x, glist, 0); canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x); } static void photo_select(t_gobj *z, t_glist *glist, int state) { t_photo *x = (t_photo *)z; if (state) { sys_vgui(".x%x.c create rectangle \ %d %d %d %d -tags %xSEL -outline blue\n", glist_getcanvas(glist), text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist), text_xpix(&x->x_obj, glist) + x->x_width, text_ypix(&x->x_obj, glist) + x->x_height, x); } else { sys_vgui(".x%x.c delete %xSEL\n", glist_getcanvas(glist), x); } } static void photo_activate(t_gobj *z, t_glist *glist, int state) { /* t_text *x = (t_text *)z; t_rtext *y = glist_findrtext(glist, x); if (z->g_pd != gatom_class) rtext_activate(y, state);*/ } static void photo_delete(t_gobj *z, t_glist *glist) { t_text *x = (t_text *)z; canvas_deletelinesfor(glist_getcanvas(glist), x); } static void photo_vis(t_gobj *z, t_glist *glist, int vis) { t_photo* s = (t_photo*)z; if (vis) photo_drawme(s, glist, 1); else photo_erase(s,glist); } /* can we use the normal text save function ?? */ static void photo_save(t_gobj *z, t_binbuf *b) { t_photo *x = (t_photo *)z; binbuf_addv(b, "ssiiss;", gensym("#X"), gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix, atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)), x->filename); } void photo_size(t_photo* x,t_floatarg w,t_floatarg h) { x->x_width = w; x->x_height = h; } void photo_open(t_photo* x, t_symbol* fname) { x->filename = fname; photo_erase(x, x->x_glist); photo_drawme(x, x->x_glist, 1); } static void photo_free(t_photo *x) { pd_unbind(&x->x_obj.ob_pd, x->receive_name); } static void *photo_new(t_symbol* s) { t_photo *x = (t_photo *)pd_new(photo_class); x->x_glist = (t_glist*) canvas_getcurrent(); x->x_width = 15; x->x_height = 15; x->x_glist = canvas_getcurrent(); x->filename = s; outlet_new(&x->x_obj, &s_float); return (x); } static t_widgetbehavior photo_widgetbehavior = { w_getrectfn: photo_getrect, w_displacefn: photo_displace, w_selectfn: photo_select, w_activatefn: photo_activate, w_deletefn: photo_delete, w_visfn: photo_vis, w_clickfn: NULL, }; void photo_setup(void) { photo_class = class_new(gensym("photo"), (t_newmethod)photo_new, (t_method)photo_free, sizeof(t_photo), 0, A_DEFSYM,0); class_addmethod(photo_class, (t_method)photo_size, gensym("size"), A_FLOAT, A_FLOAT, 0); /* class_addmethod(photo_class, (t_method)photo_color, gensym("color"), A_SYMBOL, 0); */ class_addmethod(photo_class, (t_method)photo_open, gensym("open"), A_SYMBOL, 0); class_setwidget(photo_class, &photo_widgetbehavior); class_setsavefn(photo_class, &photo_save); } Index: text.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/text.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** text.c 14 Nov 2007 02:53:03 -0000 1.1 --- text.c 14 Nov 2007 03:51:35 -0000 1.2 *************** *** 46,50 **** t_glist* x_glist; ! t_symbol* x_receive_name; int x_height; --- 46,50 ---- t_glist* x_glist; ! t_symbol* receive_name; int x_height; *************** *** 77,81 **** static t_class *textwidget_class; ! static char *tk_options[] = { "autoseparators", "background", --- 77,81 ---- static t_class *textwidget_class; ! static char *textwidget_tk_options[] = { "autoseparators", "background", *************** *** 309,313 **** bind_button_events(x); sys_vgui("bind %s <KeyRelease> {+pd %s keyup %%N \\;} \n", ! x->text_id, x->x_receive_name->s_name); } --- 309,313 ---- bind_button_events(x); sys_vgui("bind %s <KeyRelease> {+pd %s keyup %%N \\;} \n", ! x->text_id, x->receive_name->s_name); } *************** *** 428,436 **** sys_vgui("raise %s\n", x->handle_id); sys_vgui("bind %s <Button> {pd [concat %s resize_click 1 \\;]}\n", ! x->handle_id, x->x_receive_name->s_name); sys_vgui("bind %s <ButtonRelease> {pd [concat %s resize_click 0 \\;]}\n", ! x->handle_id, x->x_receive_name->s_name); sys_vgui("bind %s <Motion> {pd [concat %s resize_motion %%x %%y \\;]}\n", ! x->handle_id, x->x_receive_name->s_name); } } --- 428,436 ---- sys_vgui("raise %s\n", x->handle_id); sys_vgui("bind %s <Button> {pd [concat %s resize_click 1 \\;]}\n", ! x->handle_id, x->receive_name->s_name); sys_vgui("bind %s <ButtonRelease> {pd [concat %s resize_click 0 \\;]}\n", ! x->handle_id, x->receive_name->s_name); sys_vgui("bind %s <Motion> {pd [concat %s resize_motion %%x %%y \\;]}\n", ! x->handle_id, x->receive_name->s_name); } } *************** *** 552,556 **** sys_vgui("pd [concat %s output [string map {\",\" \"\\\\,\" \";\" \"\\\\;\"} \ [%s get 0.0 end]] \\;]\n", ! x->x_receive_name->s_name, x->text_id); } --- 552,556 ---- sys_vgui("pd [concat %s output [string map {\",\" \"\\\\,\" \";\" \"\\\\;\"} \ [%s get 0.0 end]] \\;]\n", ! x->receive_name->s_name, x->text_id); } *************** *** 719,723 **** static void textwidget_free(t_textwidget *x) { ! pd_unbind(&x->x_obj.ob_pd, x->x_receive_name); } --- 719,723 ---- static void textwidget_free(t_textwidget *x) { ! pd_unbind(&x->x_obj.ob_pd, x->receive_name); } *************** *** 755,770 **** sprintf(buf,"#%s", x->tcl_namespace); ! x->x_receive_name = gensym(buf); ! pd_bind(&x->x_obj.ob_pd, x->x_receive_name); x->x_glist = canvas_getcurrent(); set_tk_widget_ids(x, x->x_glist); ! int i; ! int option_argc = sizeof(tk_options)/sizeof(char *); post("total options: %d", option_argc); for(i = 0; i < option_argc; i++) { ! post("option %d: %s", i, tk_options[i]); } --- 755,770 ---- sprintf(buf,"#%s", x->tcl_namespace); ! x->receive_name = gensym(buf); ! pd_bind(&x->x_obj.ob_pd, x->receive_name); x->x_glist = canvas_getcurrent(); set_tk_widget_ids(x, x->x_glist); ! int i; ! int option_argc = sizeof(textwidget_tk_options)/sizeof(char *); post("total options: %d", option_argc); for(i = 0; i < option_argc; i++) { ! post("option %d: %s", i, textwidget_tk_options[i]); } --- NEW FILE: photo-help.pd --- #N canvas 140 178 568 628 10; #X text 19 18 Incorporate images. This is instantiated with; #X msg 86 132 open \$1; #X obj 86 88 bng 15 250 50 0 empty empty empty 0 -6 0 10 -4034 -1 -1 ; #X obj 86 109 openpanel; #X obj 66 555 bng 15 250 50 0 empty empty empty 0 -6 0 10 -262144 -1 -1; #X msg 265 152 size \$1 \$2; #X obj 265 129 pack 0 0; #X obj 313 106 hsl 128 15 0 127 0 0 empty empty y 7 7 0 10 -203904 -1 -1 0 1; #X obj 263 88 hsl 128 15 0 127 0 0 empty empty x 7 7 0 10 -204800 -1 -1 0 1; #X obj 309 337 photo frosch.gif; #X obj 101 336 photo volga.gif; #X text 19 34 [photo volga.gif]; #X text 17 57 [photo] works with .gif \, .ppm \, and .pgm image formats only.; #X connect 1 0 10 0; #X connect 2 0 3 0; #X connect 3 0 1 0; #X connect 5 0 10 0; #X connect 6 0 5 0; #X connect 7 0 6 1; #X connect 8 0 6 0; #X connect 10 0 4 0;

1 0

externals/tkwidgets tkwidgets.c,1.1,NONE
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18388 Removed Files: tkwidgets.c Log Message: removed false start --- tkwidgets.c DELETED ---

1 0

externals/tkwidgets text.c, NONE, 1.1 text-help.pd, NONE, 1.1 text-test.pd, NONE, 1.1
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18245 Added Files: text.c text-help.pd text-test.pd Log Message: working version of [text] from bbogart's [entry], which I heavily modified; got options working from the inlet, including using multiple atoms in one optiion --- NEW FILE: text-test.pd --- #N canvas 165 195 721 672 10; #X obj 130 117 text 130 60; #X msg 47 29 size 100 100; #X obj 73 543 text 200 50; #X msg 130 30 size 400 200; #X obj 310 11 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; #X msg 309 31 scrollbar \$1; #X msg 376 479; #X obj 310 269 hcs/sys_gui; #X msg 310 221 puts stderr [concat [.x6a74d0.c.frame6a7af0.text6a7af0 find all]]; #X msg 23 315 highlightthickness \$1; #X obj 26 289 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; #X msg 76 402 padx \$1; #X obj 79 381 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; #X msg 132 515 font "Lucida Sans" 18 bold; #X msg 272 425 size 200 50; #X msg 89 490 font Arial 16; #X connect 0 1 6 0; #X connect 1 0 0 0; #X connect 3 0 0 0; #X connect 4 0 5 0; #X connect 5 0 0 0; #X connect 8 0 7 0; #X connect 9 0 2 0; #X connect 10 0 9 0; #X connect 11 0 2 0; #X connect 12 0 11 0; #X connect 13 0 2 0; #X connect 14 0 2 0; #X connect 15 0 2 0; --- NEW FILE: text.c --- /* text widget for Pd Copyright 2003 Guenter Geiger Copyright 2004 Ben Bogart <ben(a)ekran.org> Copyright 2007 Hans-Christoph Steiner <hans(a)at.or.at> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <stdio.h> #include <string.h> #include "shared/tkwidgets.h" /* TODO: get Ctrl-A working to select all */ /* TODO: set message doesnt work with a loadbang */ #define DEFAULT_COLOR "grey70" #define TEXT_DEFAULT_WIDTH 130 #define TEXT_DEFAULT_HEIGHT 60 #define TEXT_MIN_WIDTH 40 #define TEXT_MIN_HEIGHT 20 #define TOTAL_INLETS 1 #define TOTAL_OUTLETS 2 #define DEBUG(x) x typedef struct _textwidget { t_object x_obj; t_canvas* x_canvas; t_glist* x_glist; t_symbol* x_receive_name; int x_height; int x_width; int x_resizing; t_symbol* x_font_face; t_int x_font_size; t_symbol* x_font_weight; t_float x_border; t_symbol* x_relief; t_int x_have_scrollbar; t_int x_selected; /* IDs for Tk widgets */ char* tcl_namespace; char* canvas_id; char* frame_id; char* text_id; char* scrollbar_id; char* handle_id; char* window_tag; char* all_tag; t_outlet* x_data_outlet; t_outlet* x_status_outlet; } t_textwidget; static t_class *textwidget_class; static char *tk_options[] = { "autoseparators", "background", "borderwidth", "cursor", "exportselection", "font", "foreground", "height", "highlightbackground", "highlightcolor", "highlightthickness", "insertbackground", "insertborderwidth", "insertofftime", "insertontime", "insertwidth", "maxundo", "padx", "pady", "relief", "selectbackground", "selectborderwidth", "selectforeground", "setgrid", "spacing1", "spacing2", "spacing3", "state", "tabs", "takefocus", "undo", "width", "wrap", "xscrollcommand", "yscrollcommand" }; /* move these to tkwidgets.c */ static t_symbol *backspace_symbol; static t_symbol *return_symbol; static t_symbol *space_symbol; static t_symbol *tab_symbol; static t_symbol *escape_symbol; static t_symbol *left_symbol; static t_symbol *right_symbol; static t_symbol *up_symbol; static t_symbol *down_symbol; /* function prototypes */ static void textwidget_getrect(t_gobj *z, t_glist *owner, int *xp1, int *yp1, int *xp2, int *yp2); static void textwidget_displace(t_gobj *z, t_glist *glist, int dx, int dy); static void textwidget_select(t_gobj *z, t_glist *glist, int state); static void textwidget_activate(t_gobj *z, t_glist *glist, int state); static void textwidget_delete(t_gobj *z, t_glist *glist); static void textwidget_vis(t_gobj *z, t_glist *glist, int vis); //static int textwidget_click(t_gobj *z, t_glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit); static void textwidget_save(t_gobj *z, t_binbuf *b); static t_widgetbehavior textwidget_widgetbehavior = { w_getrectfn: textwidget_getrect, w_displacefn: textwidget_displace, w_selectfn: textwidget_select, w_activatefn: textwidget_activate, w_deletefn: textwidget_delete, w_visfn: textwidget_vis, w_clickfn: NULL, }; /* widget helper functions */ static void set_tk_widget_ids(t_textwidget *x, t_canvas *canvas) { char buf[MAXPDSTRING]; x->x_canvas = canvas; /* Tk ID for the current canvas that this object is drawn in */ sprintf(buf,".x%lx.c", (long unsigned int) canvas); x->canvas_id = getbytes(strlen(buf)); strcpy(x->canvas_id, buf); /* Tk ID for the "frame" the other things are drawn in */ sprintf(buf,"%s.frame%lx", x->canvas_id, (long unsigned int)x); x->frame_id = getbytes(strlen(buf)); strcpy(x->frame_id, buf); sprintf(buf,"%s.text%lx", x->frame_id, (long unsigned int)x); x->text_id = getbytes(strlen(buf)); strcpy(x->text_id, buf); /* Tk ID for the "text", the meat! */ sprintf(buf,"%s.window%lx", x->canvas_id, (long unsigned int)x); x->window_tag = getbytes(strlen(buf)); strcpy(x->window_tag, buf); /* Tk ID for the resizing "window" */ post(""); sprintf(buf,"%s.handle%lx", x->canvas_id, (long unsigned int)x); x->handle_id = getbytes(strlen(buf)); strcpy(x->handle_id, buf); /* Tk ID for the resizing "handle" */ sprintf(buf,"%s.scrollbar%lx", x->frame_id, (long unsigned int)x); x->scrollbar_id = getbytes(strlen(buf)); strcpy(x->scrollbar_id, buf); /* Tk ID for the optional "scrollbar" */ sprintf(buf,"all%lx", (long unsigned int)x); x->all_tag = getbytes(strlen(buf)); strcpy(x->all_tag, buf); /* Tk ID for the optional "scrollbar" */ } static int calculate_onset(t_textwidget *x, t_glist *glist, int current_iolet, int total_iolets) { post("calculate_onset"); return(text_xpix(&x->x_obj, glist) + (x->x_width - IOWIDTH) \ * current_iolet / (total_iolets == 1 ? 1 : total_iolets - 1)); } static void textwidget_draw_inlets(t_textwidget *x, t_glist *glist, int firsttime, int total_inlets, int total_outlets) { DEBUG(post("textwidget_draw_inlets in: %d out: %d", total_inlets, total_outlets);); int i, onset; for (i = 0; i < total_inlets; i++) /* inlets */ { onset = calculate_onset(x, glist, i, total_inlets); sys_vgui("%s create rectangle %d %d %d %d -tags {%xi%d %xi %s}\n", x->canvas_id, onset, text_ypix(&x->x_obj, glist) - 2, onset + IOWIDTH, text_ypix(&x->x_obj, glist), x, i, x, x->all_tag); } for (i = 0; i < total_outlets; i++) /* outlets */ { onset = calculate_onset(x, glist, i, total_outlets); sys_vgui("%s create rectangle %d %d %d %d -tags {%xo%d %xo %s}\n", x->canvas_id, onset, text_ypix(&x->x_obj, glist) + x->x_height, onset + IOWIDTH, text_ypix(&x->x_obj, glist) + x->x_height + 2, x, i, x, x->all_tag); } } static void erase_inlets(t_textwidget *x) { DEBUG(post("erase_inlets");); /* Added tag for all inlets/outlets of one instance */ sys_vgui("%s delete %xi\n", x->canvas_id, x); sys_vgui("%s delete %xo\n", x->canvas_id, x); } static void draw_scrollbar(t_textwidget *x) { sys_vgui("pack %s -side right -fill y -before %s \n", x->scrollbar_id, x->text_id); x->x_have_scrollbar = 1; } static void erase_scrollbar(t_textwidget *x) { sys_vgui("pack forget %s \n", x->scrollbar_id); x->x_have_scrollbar = 0; } static void bind_standard_keys(t_textwidget *x) { #ifdef __APPLE__ sys_vgui("bind %s <Mod1-Key> {pdtk_canvas_ctrlkey %s %%K 0}\n", x->text_id, x->canvas_id); sys_vgui("bind %s <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %s %%K 1}\n", x->text_id, x->canvas_id); #else sys_vgui("bind %s <Control-Key> {pdtk_canvas_ctrlkey %s %%K 0}\n", x->text_id, x->canvas_id); sys_vgui("bind %s <Control-Shift-Key> {pdtk_canvas_ctrlkey %s %%K 1}\n", x->text_id, x->canvas_id); #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->text_id, x->canvas_id, x->canvas_id, x->canvas_id); sys_vgui("bind %s <ButtonRelease> {pdtk_canvas_mouseup %s \ [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", x->text_id, x->canvas_id, x->canvas_id, x->canvas_id); sys_vgui("bind %s <Shift-Button> {pdtk_canvas_click %s \ [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b 1}\n", x->text_id, x->canvas_id, x->canvas_id, x->canvas_id); sys_vgui("bind %s <Button-2> {pdtk_canvas_rightclick %s \ [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", x->text_id, x->canvas_id, x->canvas_id, x->canvas_id); sys_vgui("bind %s <Button-3> {pdtk_canvas_rightclick %s \ [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", x->text_id, x->canvas_id, x->canvas_id, x->canvas_id); sys_vgui("bind %s <Control-Button> {pdtk_canvas_rightclick %s \ [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] %%b}\n", x->text_id, x->canvas_id, x->canvas_id, x->canvas_id); /* mouse motion */ sys_vgui("bind %s <Motion> {pdtk_canvas_motion %s \ [expr %%X - [winfo rootx %s]] [expr %%Y - [winfo rooty %s]] 0}\n", x->text_id, x->canvas_id, x->canvas_id, x->canvas_id); } static void create_widget(t_textwidget *x) { DEBUG(post("create_widget");); /* I guess this is for fine-tuning of the rect size based on width and height? */ sys_vgui("namespace eval text%lx {} \n", x); /* Seems we have to delete the widget in case it already exists (Provided by Guenter)*/ sys_vgui("destroy %s\n", x->frame_id); sys_vgui("frame %s \n", x->frame_id); sys_vgui("text %s -font {%s %d %s} -border 1 \ -highlightthickness 1 -relief sunken -bg \"%s\" -fg \"%s\" \ -yscrollcommand {%s set} \n", x->text_id, x->x_font_face->s_name, x->x_font_size, x->x_font_weight->s_name, DEFAULT_COLOR, "black", x->scrollbar_id); sys_vgui("scrollbar %s -command {%s yview}\n", x->scrollbar_id, x->text_id); sys_vgui("pack %s -side left -fill both -expand 1 \n", x->text_id); sys_vgui("pack %s -side bottom -fill both -expand 1 \n", x->frame_id); bind_standard_keys(x); bind_button_events(x); sys_vgui("bind %s <KeyRelease> {+pd %s keyup %%N \\;} \n", x->text_id, x->x_receive_name->s_name); } static void textwidget_drawme(t_textwidget *x, t_glist *glist, int firsttime) { DEBUG(post("textwidget_drawme: firsttime %d canvas %lx glist %lx", firsttime, x->x_canvas, glist);); set_tk_widget_ids(x,glist_getcanvas(glist)); if (firsttime) { create_widget(x); textwidget_draw_inlets(x, glist, firsttime, TOTAL_INLETS, TOTAL_OUTLETS); if(x->x_have_scrollbar) draw_scrollbar(x); sys_vgui("%s create window %d %d -anchor nw -window %s \ -tags {%s %s} -width %d -height %d \n", x->canvas_id, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist), x->frame_id, x->window_tag, x->all_tag, x->x_width, x->x_height); } else { post("NO MORE COORDS"); // sys_vgui("%s coords %s %d %d\n", x->canvas_id, x->all_tag, // text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist)); } } static void textwidget_erase(t_textwidget* x,t_glist* glist) { DEBUG(post("textwidget_erase: canvas %lx glist %lx", x->x_canvas, glist);); set_tk_widget_ids(x,glist_getcanvas(glist)); erase_inlets(x); sys_vgui("destroy %s\n", x->frame_id); sys_vgui("%s delete %s\n", x->canvas_id, x->all_tag); } /* ------------------------ text widgetbehaviour----------------------------- */ static void textwidget_getrect(t_gobj *z, t_glist *owner, int *xp1, int *yp1, int *xp2, int *yp2) { // DEBUG(post("textwidget_getrect");); /* this one is very chatty :D */ t_textwidget *x = (t_textwidget*)z; *xp1 = text_xpix(&x->x_obj, owner); *yp1 = text_ypix(&x->x_obj, owner); *xp2 = *xp1 + x->x_width; *yp2 = *yp1 + x->x_height + 2; // add 2 to give space for outlets } static void textwidget_displace(t_gobj *z, t_glist *glist, int dx, int dy) { t_textwidget *x = (t_textwidget *)z; DEBUG(post("textwidget_displace: canvas %lx glist %lx", x->x_canvas, glist);); x->x_obj.te_xpix += dx; x->x_obj.te_ypix += dy; if (glist_isvisible(glist)) { set_tk_widget_ids(x,glist_getcanvas(glist)); sys_vgui("%s move %s %d %d\n", x->canvas_id, x->all_tag, dx, dy); sys_vgui("%s move RSZ %d %d\n", x->canvas_id, dx, dy); /* sys_vgui("%s coords %s %d %d %d %d\n", x->canvas_id, x->all_tag, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist)-1, text_xpix(&x->x_obj, glist) + x->x_width, text_ypix(&x->x_obj, glist) + x->x_height-2);*/ // textwidget_drawme(x, glist, 0); canvas_fixlinesfor(glist_getcanvas(glist), (t_text*) x); } DEBUG(post("displace end");); } static void textwidget_select(t_gobj *z, t_glist *glist, int state) { t_textwidget *x = (t_textwidget *)z; DEBUG(post("textwidget_select: canvas %lx glist %lx state %d", x->x_canvas, glist, state);); if( (state) && (!x->x_selected)) { sys_vgui("%s configure -bg #bdbddd -state disabled -cursor $cursor_editmode_nothing\n", x->text_id); x->x_selected = 1; } else if (!state) { sys_vgui("%s configure -bg grey -state normal -cursor xterm\n", x->text_id); /* activatefn never gets called with 0, so destroy here */ sys_vgui("destroy %s\n", x->handle_id); x->x_selected = 0; } } static void textwidget_activate(t_gobj *z, t_glist *glist, int state) { DEBUG(post("textwidget_activate");); t_textwidget *x = (t_textwidget *)z; int x1, y1, x2, y2; if(state) { textwidget_getrect(z, glist, &x1, &y1, &x2, &y2); sys_vgui("canvas %s -width %d -height %d -bg #ddd -bd 0 \ -highlightthickness 3 -highlightcolor {#f00} -cursor bottom_right_corner\n", x->handle_id, TKW_HANDLE_WIDTH, TKW_HANDLE_HEIGHT); int handle_x1 = x2 - TKW_HANDLE_WIDTH; int handle_y1 = y2 - (TKW_HANDLE_HEIGHT - TKW_HANDLE_INSET); // int handle_x2 = x2; // int handle_y2 = y2 - TKW_HANDLE_INSET; /* no worky, this should draw MAC OS X style lines on the resize handle */ /* sys_vgui("%s create line %d %d %d %d -fill black -tags RESIZE_LINES\n", */ /* x->handle_id, handle_x2, handle_y1, handle_x1, handle_y2); */ sys_vgui("%s create window %d %d -anchor nw -width %d -height %d -window %s -tags RSZ\n", x->canvas_id, handle_x1, handle_y1, TKW_HANDLE_WIDTH, TKW_HANDLE_HEIGHT, x->handle_id, x->all_tag); sys_vgui("raise %s\n", x->handle_id); sys_vgui("bind %s <Button> {pd [concat %s resize_click 1 \\;]}\n", x->handle_id, x->x_receive_name->s_name); sys_vgui("bind %s <ButtonRelease> {pd [concat %s resize_click 0 \\;]}\n", x->handle_id, x->x_receive_name->s_name); sys_vgui("bind %s <Motion> {pd [concat %s resize_motion %%x %%y \\;]}\n", x->handle_id, x->x_receive_name->s_name); } } static void textwidget_delete(t_gobj *z, t_glist *glist) { DEBUG(post("textwidget_delete: glist %lx", glist);); t_text *x = (t_text *)z; canvas_deletelinesfor(glist_getcanvas(glist), x); } static void textwidget_vis(t_gobj *z, t_glist *glist, int vis) { t_textwidget *x = (t_textwidget*)z; DEBUG(post("textwidget_vis: vis %d canvas %lx glist %lx", vis, x->x_canvas, glist);); t_rtext *y; if (vis) { y = (t_rtext *) rtext_new(glist, (t_text *)z); textwidget_drawme(x, glist, 1); } else { y = glist_findrtext(glist, (t_text *)z); textwidget_erase(x, glist); rtext_free(y); } } /* the clickfn is only called in run mode static int textwidget_click(t_gobj *z, t_glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) { t_textwidget *x = (t_textwidget *)z; DEBUG(post("textwidget_click x:%d y:%d edit: %d", xpix, ypix, x->x_canvas->gl_edit);); return 0; } */ static void textwidget_append(t_textwidget* x, t_symbol *s, int argc, t_atom *argv) { DEBUG(post("textwidget_append");); int i; t_symbol *tmp_symbol = s; /* <-- this gets rid of the unused variable warning */ t_float tmp_float; for(i=0; i<argc ; i++) { tmp_symbol = atom_getsymbolarg(i, argc, argv); if(tmp_symbol == &s_) { tmp_float = atom_getfloatarg(i, argc , argv); sys_vgui("lappend ::%s::list %g \n", x->tcl_namespace, tmp_float ); } else { sys_vgui("lappend ::%s::list %s \n", x->tcl_namespace, tmp_symbol->s_name ); } } sys_vgui("append ::%s::list \" \"\n", x->tcl_namespace); sys_vgui("%s insert end $::%s::list ; unset ::%s::list \n", x->text_id, x->tcl_namespace, x->tcl_namespace ); sys_vgui("%s yview end-2char \n", x->text_id ); } static void textwidget_key(t_textwidget* x, t_symbol *s, int argc, t_atom *argv) { DEBUG(post("textwidget_key");); t_symbol *tmp_symbol = s; /* <-- this gets rid of the unused variable warning */ t_int tmp_int; tmp_symbol = atom_getsymbolarg(0, argc, argv); if(tmp_symbol == &s_) { tmp_int = (t_int) atom_getfloatarg(0, argc , argv); if(tmp_int < 10) { sys_vgui("%s insert end %d\n", x->text_id, tmp_int); } else if(tmp_int == 10) { sys_vgui("%s insert end {\n}\n", x->text_id); } else { sys_vgui("%s insert end [format \"%c\" %d]\n", x->text_id, tmp_int); } } else { sys_vgui("%s insert end %s\n", x->text_id, tmp_symbol->s_name ); } sys_vgui("%s yview end-2char \n", x->text_id ); } /* Clear the contents of the text widget */ static void textwidget_clear(t_textwidget* x) { sys_vgui("%s delete 0.0 end \n", x->text_id); } /* Function to reset the contents of the textwidget box */ static void textwidget_set(t_textwidget* x, t_symbol *s, int argc, t_atom *argv) { DEBUG(post("textwidget_set");); textwidget_clear(x); textwidget_append(x, s, argc, argv); } static void textwidget_output(t_textwidget* x, t_symbol *s, int argc, t_atom *argv) { outlet_list(x->x_data_outlet, s, argc, argv ); } /* Pass the contents of the text widget onto the textwidget_output fuction above */ static void textwidget_bang_output(t_textwidget* x) { /* With "," and ";" escaping thanks to JMZ */ sys_vgui("pd [concat %s output [string map {\",\" \"\\\\,\" \";\" \"\\\\;\"} \ [%s get 0.0 end]] \\;]\n", x->x_receive_name->s_name, x->text_id); } static void textwidget_keyup_callback(t_textwidget *x, t_float f) { /* DEBUG(post("textwidget_keyup_callback");); */ int keycode = (int) f; char buf[10]; t_symbol *output_symbol; if( (keycode > 32 ) && (keycode < 65288) ) { snprintf(buf, 2, "%c", keycode); output_symbol = gensym(buf); } else switch(keycode) { case 32: /* space */ output_symbol = space_symbol; break; case 65293: /* return */ output_symbol = return_symbol; break; case 65288: /* backspace */ output_symbol = backspace_symbol; break; case 65289: /* tab */ output_symbol = tab_symbol; break; case 65307: /* escape */ output_symbol = escape_symbol; break; case 65361: /* left */ output_symbol = left_symbol; break; case 65363: /* right */ output_symbol = right_symbol; break; case 65362: /* up */ output_symbol = up_symbol; break; case 65364: /* down */ output_symbol = down_symbol; break; default: snprintf(buf, 10, "key_%d", keycode); DEBUG(post("keyup: %d", keycode);); output_symbol = gensym(buf); } outlet_symbol(x->x_status_outlet, output_symbol); } static void textwidget_save(t_gobj *z, t_binbuf *b) { t_textwidget *x = (t_textwidget *)z; binbuf_addv(b, "ssiisii;", &s__X, gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix, atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)), x->x_width, x->x_height); } static void textwidget_option(t_textwidget *x, t_symbol *s, int argc, t_atom *argv) { if(s != &s_list) { t_binbuf *argument_binbuf = binbuf_new(); char *argument_buffer; int buffer_length; binbuf_add(argument_binbuf, argc, argv); binbuf_gettext(argument_binbuf, &argument_buffer, &buffer_length); binbuf_free(argument_binbuf); argument_buffer[buffer_length] = 0; post("argument_buffer: %s", argument_buffer); sys_vgui("%s configure -%s {%s} \n", x->text_id, s->s_name, argument_buffer); } } static void textwidget_scrollbar(t_textwidget *x, t_float f) { if(f > 0) draw_scrollbar(x); else erase_scrollbar(x); } static void textwidget_fontsize(t_textwidget *x, t_float font_size) { DEBUG(post("textwidget_fontsize");); if(font_size > 8) { x->x_font_size = (t_int)font_size; sys_vgui("%s configure -font {%s %d %s} \n", x->text_id, x->x_font_face->s_name, x->x_font_size, x->x_font_weight->s_name); } else pd_error(x,"textwidget: invalid font size: %f",font_size); } static void textwidget_size(t_textwidget *x, t_float width, t_float height) { DEBUG(post("textwidget_size");); x->x_height = height; x->x_width = width; if(glist_isvisible(x->x_glist)) { sys_vgui("%s itemconfigure %s -width %d -height %d\n", x->canvas_id, x->window_tag, x->x_width, x->x_height); erase_inlets(x); textwidget_draw_inlets(x, x->x_glist, 1, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } } /* callback functions */ static void textwidget_click_callback(t_textwidget *x, t_floatarg f) { if( (x->x_glist->gl_edit) && (x->x_glist == x->x_canvas) ) { textwidget_select((t_gobj *)x, x->x_glist, f); } } static void textwidget_resize_click_callback(t_textwidget *x, t_floatarg f) { t_canvas *canvas = (glist_isvisible(x->x_glist) ? x->x_canvas : 0); int newstate = (int)f; if (x->x_resizing && newstate == 0) { if (canvas) { textwidget_draw_inlets(x, canvas, 1, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } } else if (!x->x_resizing && newstate) { erase_inlets(x); } x->x_resizing = newstate; } static void textwidget_resize_motion_callback(t_textwidget *x, t_floatarg f1, t_floatarg f2) { DEBUG(post("textwidget_resize_motion_callback");); if (x->x_resizing) { int dx = (int)f1, dy = (int)f2; if (glist_isvisible(x->x_glist)) { x->x_width += dx; x->x_height += dy; sys_vgui("%s itemconfigure %s -width %d -height %d\n", x->canvas_id, x->window_tag, x->x_width, x->x_height); sys_vgui("%s move RSZ %d %d\n", x->canvas_id, dx, dy); } } } static void textwidget_free(t_textwidget *x) { pd_unbind(&x->x_obj.ob_pd, x->x_receive_name); } static void *textwidget_new(t_symbol *s, int argc, t_atom *argv) { DEBUG(post("textwidget_new");); t_textwidget *x = (t_textwidget *)pd_new(textwidget_class); char buf[MAXPDSTRING]; x->x_height = 1; x->x_font_face = gensym("helvetica"); x->x_font_size = 10; x->x_font_weight = gensym("normal"); x->x_have_scrollbar = 0; x->x_selected = 0; if (argc < 4) { post("textwidget: You must enter at least 4 arguments. Default values used."); x->x_width = TEXT_DEFAULT_WIDTH; x->x_height = TEXT_DEFAULT_HEIGHT; } else { /* Copy args into structure */ x->x_width = atom_getint(argv); x->x_height = atom_getint(argv+1); } x->x_data_outlet = outlet_new(&x->x_obj, &s_float); x->x_status_outlet = outlet_new(&x->x_obj, &s_symbol); sprintf(buf,"text%lx",(long unsigned int)x); x->tcl_namespace = getbytes(strlen(buf)); strcpy(x->tcl_namespace, buf); sprintf(buf,"#%s", x->tcl_namespace); x->x_receive_name = gensym(buf); pd_bind(&x->x_obj.ob_pd, x->x_receive_name); x->x_glist = canvas_getcurrent(); set_tk_widget_ids(x, x->x_glist); int i; int option_argc = sizeof(tk_options)/sizeof(char *); post("total options: %d", option_argc); for(i = 0; i < option_argc; i++) { post("option %d: %s", i, tk_options[i]); } return (x); } void text_setup(void) { textwidget_class = class_new(gensym("text"), (t_newmethod)textwidget_new, (t_method)textwidget_free,sizeof(t_textwidget), 0, A_GIMME, 0); class_addbang(textwidget_class, (t_method)textwidget_bang_output); class_addanything(textwidget_class, (t_method)textwidget_option); class_addmethod(textwidget_class, (t_method)textwidget_scrollbar, gensym("scrollbar"), A_DEFFLOAT, 0); class_addmethod(textwidget_class, (t_method)textwidget_size, gensym("size"), A_DEFFLOAT, A_DEFFLOAT, 0); class_addmethod(textwidget_class, (t_method)textwidget_fontsize, gensym("fontsize"), A_DEFFLOAT, 0); class_addmethod(textwidget_class, (t_method)textwidget_output, gensym("output"), A_GIMME, 0); class_addmethod(textwidget_class, (t_method)textwidget_set, gensym("set"), A_GIMME, 0); class_addmethod(textwidget_class, (t_method)textwidget_append, gensym("append"), A_GIMME, 0); class_addmethod(textwidget_class, (t_method)textwidget_key, gensym("key"), A_GIMME, 0); class_addmethod(textwidget_class, (t_method)textwidget_clear, gensym("clear"), 0); /* callbacks */ class_addmethod(textwidget_class, (t_method)textwidget_keyup_callback, gensym("keyup"), A_DEFFLOAT, 0); class_addmethod(textwidget_class, (t_method)textwidget_click_callback, gensym("click"), A_FLOAT, 0); class_addmethod(textwidget_class, (t_method)textwidget_resize_click_callback, gensym("resize_click"), A_FLOAT, 0); class_addmethod(textwidget_class, (t_method)textwidget_resize_motion_callback, gensym("resize_motion"), A_FLOAT, A_FLOAT, 0); class_setwidget(textwidget_class,&textwidget_widgetbehavior); class_setsavefn(textwidget_class,&textwidget_save); /* commonly used symbols */ backspace_symbol = gensym("backspace"); return_symbol = gensym("return"); space_symbol = gensym("space"); tab_symbol = gensym("tab"); escape_symbol = gensym("escape"); left_symbol = gensym("left"); right_symbol = gensym("right"); up_symbol = gensym("up"); down_symbol = gensym("down"); } --- NEW FILE: text-help.pd --- #N canvas 343 45 785 704 10; #X obj 52 -48 text 130 60; #X obj 53 -198 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 12 60 print; #X msg 89 -183 clear; #X msg 107 -162 set one two three four five six; #X obj 36 137 text 130 60; #X obj 231 -2 select return; #X obj 59 61 pddp/print; #X obj 198 -91 trigger bang bang; #X msg 198 -70 clear; #X symbolatom 196 63 10 0 0 1 last_key_typed - -; #X text 235 19 ^-- hit return to output; #X msg 118 -139 append seven eight nine; #X msg 122 -119 append ten eleven.; #X obj 554 -176 text 130 60; #X obj 581 -218 symbol; #X msg 479 -245 flat; #X msg 514 -245 groove; #X msg 561 -245 raised; #X msg 609 -246 ridge; #X msg 650 -246 solid; #X msg 691 -246 sunken; #X obj 653 276 symbol; #X obj 557 278 symbol; #X msg 540 254 on; #X msg 574 253 off; #X msg 634 251 normal; #X msg 680 251 disabled; #X msg 26 105 size 100 50; #X text 633 231 disable editing; #X obj 582 -39 text 130 60; #X obj 581 -84 symbol; #X obj 513 147 text 130 60; #X obj 577 102 symbol; #X msg 539 -109 none; #X msg 574 -109 char; #X msg 611 -109 word; #X text 628 -85 word wrapping; #X msg 612 70 purple; #X msg 659 70 orange; #X msg 707 69 magenta; #X obj 452 40 pddp/pddplink http://en.wikipedia.org/wiki/X11_color_names ; #X obj 394 -39 text 130 60; #X obj 396 -89 hsl 128 15 0 127 0 0 empty empty empty -2 -6 0 10 -262144 -1 -1 0 1; #X obj 62 345 text 130 60; #X obj 61 300 symbol; #X obj 49 409 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/cursors.htm ; #X msg 59 265 boat; #X msg 19 265 clock; #X msg 162 265 gumby; #X msg 205 265 gobbler; #X obj 404 -217 hsl 128 15 0 127 0 0 empty empty empty -2 -6 0 10 -262144 -1 -1 0 1; #X msg 471 119 scrollbar \$1; #X obj 471 99 tgl 15 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 1; #X msg 109 -85 key a; #X msg 150 -85 key 32; #X obj 352 254 keyup; #X msg 352 293 key \$1; #X floatatom 369 275 5 0 0 0 - - -; #X msg 249 -46 key 3322; #X obj 560 330 text 130 60; #X obj 352 328 text 130 60; #X text 347 232 type single chars:; #X msg 421 279 key a; #X msg 422 301 key 9; #X text 204 387 for more cursors:; #X text 337 393 for more keynums:; #X msg 413 260 key 65228; #X msg 94 265 coffee_mug; #X msg 62 321 cursor \$1; #X msg 578 123 selectbackground \$1; #X msg 401 -197 borderwidth \$1; #X msg 582 -197 relief \$1; #X msg 582 -63 wrap \$1; #X msg 394 -62 insertwidth \$1; #X msg 557 300 undo \$1; #X msg 652 299 state \$1; #X msg 113 105 size 200 100; #X msg 577 70 #00f; #X text 528 231 turn off undo; #X obj 261 152 text 130 60; #X msg 285 128 font "Lucida Sans" 18 bold; #X msg 261 103 font Arial 16; #X obj 339 407 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/keysyms.htm ; #X obj 140 -258 pddp/pddplink http://puredata.info/dev/TkWidget -text TkWidget library; #X text 22 -258 This is part of the; #X obj 186 -234 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/text.htm -text text; #X text 37 -234 This object is based on:; #X connect 0 0 2 0; #X connect 0 0 7 0; #X connect 0 1 6 0; #X connect 0 1 10 0; #X connect 1 0 0 0; #X connect 3 0 0 0; #X connect 4 0 0 0; #X connect 6 0 8 0; #X connect 8 0 9 0; #X connect 8 1 0 0; #X connect 9 0 0 0; #X connect 12 0 0 0; #X connect 13 0 0 0; #X connect 15 0 72 0; #X connect 16 0 15 0; #X connect 17 0 15 0; #X connect 18 0 15 0; #X connect 19 0 15 0; #X connect 20 0 15 0; #X connect 21 0 15 0; #X connect 22 0 76 0; #X connect 23 0 75 0; #X connect 24 0 23 0; #X connect 25 0 23 0; #X connect 26 0 22 0; #X connect 27 0 22 0; #X connect 28 0 5 0; #X connect 31 0 73 0; #X connect 33 0 70 0; #X connect 34 0 31 0; #X connect 35 0 31 0; #X connect 36 0 31 0; #X connect 38 0 33 0; #X connect 39 0 33 0; #X connect 40 0 33 0; #X connect 43 0 74 0; #X connect 45 0 69 0; #X connect 47 0 45 0; #X connect 48 0 45 0; #X connect 49 0 45 0; #X connect 50 0 45 0; #X connect 51 0 71 0; #X connect 52 0 32 0; #X connect 53 0 52 0; #X connect 54 0 0 0; #X connect 55 0 0 0; #X connect 56 0 57 0; #X connect 56 0 58 0; #X connect 57 0 61 0; #X connect 59 0 0 0; #X connect 63 0 61 0; #X connect 64 0 61 0; #X connect 67 0 61 0; #X connect 68 0 45 0; #X connect 69 0 44 0; #X connect 70 0 32 0; #X connect 71 0 14 0; #X connect 72 0 14 0; #X connect 73 0 30 0; #X connect 74 0 42 0; #X connect 75 0 60 0; #X connect 76 0 60 0; #X connect 77 0 5 0; #X connect 78 0 33 0; #X connect 81 0 80 0; #X connect 82 0 80 0;

1 0

packages Makefile.buildlayout,1.36,1.37
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16576 Modified Files: Makefile.buildlayout Log Message: added var to support building shared libraries for libdirs Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Makefile.buildlayout 3 Nov 2007 02:14:12 -0000 1.36 --- Makefile.buildlayout 14 Nov 2007 02:48:46 -0000 1.37 *************** *** 41,56 **** --- 41,60 ---- OS_NAME = linux EXTENSION = pd_linux + DYLIB_EXTENSION = so endif ifeq ($(UNAME),Darwin) OS_NAME = darwin EXTENSION = pd_darwin + DYLIB_EXTENSION = dylib endif ifeq (MINGW,$(findstring MINGW,$(UNAME))) OS_NAME = windows EXTENSION = dll + DYLIB_EXTENSION = dll endif ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) OS_NAME = windows EXTENSION = dll + DYLIB_EXTENSION = dll endif # which CPU to compile for

1 0

externals/tkwidgets Makefile,NONE,1.1
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16202/tkwidgets Added Files: Makefile Log Message: added tkwidgets build targets from template; made target to build shared library, but it's not used yet --- NEW FILE: Makefile --- TARGET := $(shell pwd | sed 's|.*/$.*$$$|\1|') EXTERNALS_ROOT := $(shell pwd | sed 's|^$/.*externals$.*|\1|') default: make -C $(EXTERNALS_ROOT) $(TARGET) install: make -C $(EXTERNALS_ROOT) $(TARGET)_install clean: make -C $(EXTERNALS_ROOT) $(TARGET)_clean test_locations: make -C $(EXTERNALS_ROOT) test_locations etags: etags *.[ch] ../../pd/src/*.[ch] /usr/include/*.h /usr/include/sys/*.h

1 0

externals/tkwidgets/shared tkwidgets.c, NONE, 1.1 tkwidgets.h, NONE, 1.1
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/externals/tkwidgets/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16202/tkwidgets/shared Added Files: tkwidgets.c tkwidgets.h Log Message: added tkwidgets build targets from template; made target to build shared library, but it's not used yet --- NEW FILE: tkwidgets.c --- /* Copyright (C) 2007 Free Software Foundation written by Hans-Christoph Steiner <hans(a)at.or.at> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. This is the shared library for the tkwidgets library for Pd. */ #include "tkwidgets.h" #include <stdio.h> /* this should be part of the Pd API */ t_symbol *canvas_getname(t_canvas *canvas) { char buf[MAXPDSTRING]; snprintf(buf, MAXPDSTRING, ".x%lx", (unsigned long)glist_getcanvas(canvas)); return gensym(buf); } void draw_inlets(t_object *x, t_glist *glist, int firsttime, int total_inlets, int total_outlets) { // TODO perhaps I should try to use glist_drawiofor() from g_text.c } void draw_handle() { // TODO draw resize handle when selected in editmode } void draw_resize_window() { // TODO draw the resize window while resizing } --- NEW FILE: tkwidgets.h --- /* Copyright (C) 2007 Free Software Foundation written by Hans-Christoph Steiner <hans(a)at.or.at> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. This is the shared library for the tkwidgets library for Pd. */ #ifndef __TKWIDGETS_H #define __TKWIDGETS_H #include "m_pd.h" #include "m_imp.h" #include "g_canvas.h" #ifdef _MSC_VER #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) #endif /* size and offset for the resizing handle */ #define TKW_HANDLE_HEIGHT 15 #define TKW_HANDLE_WIDTH 15 #define TKW_HANDLE_INSET -2 /* this should be part of the Pd API */ t_symbol *canvas_getname(t_canvas *canvas); // TODO perhaps I should try to use glist_drawiofor() from g_text.c void draw_inlets(t_object *x, t_glist *glist, int firsttime, int total_inlets, int total_outlets); void draw_handle(); // TODO draw resize handle when selected in editmode void draw_resize_window(); // TODO draw the resize window while resizing #endif /* NOT g_TK_WIDGETS_H */

1 0

externals Makefile,1.163,1.164
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16202 Modified Files: Makefile Log Message: added tkwidgets build targets from template; made target to build shared library, but it's not used yet Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.163 retrieving revision 1.164 diff -C2 -d -r1.163 -r1.164 *** Makefile 1 Nov 2007 03:46:46 -0000 1.163 --- Makefile 14 Nov 2007 02:47:49 -0000 1.164 *************** *** 22,26 **** default: all ! .SUFFIXES: .$(EXTENSION) --- 22,26 ---- default: all ! .SUFFIXES: .$(EXTENSION) .$(SHARED_LIB) *************** *** 52,57 **** LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib LIBS += -lc ! DYLIB_LDFLAGS = -dynamiclib -read_only_relocs warning -L/sw/lib ! DYLIB_EXTENSION = dylib STRIP = strip -x endif --- 52,56 ---- LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib LIBS += -lc ! DYLIB_LDFLAGS = -dynamiclib -undefined dynamic_lookup -read_only_relocs warning -L/sw/lib STRIP = strip -x endif *************** *** 61,65 **** LIBS += -lc DYLIB_LDFLAGS = $(LDFLAGS) - DYLIB_EXTENSION = so STRIP = strip --strip-unneeded -R .note -R .comment endif --- 60,63 ---- *************** *** 79,83 **** -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex DYLIB_LDFLAGS = -shared - DYLIB_EXTENSION = dll STRIP = strip --strip-unneeded -R .note -R .comment endif --- 77,80 ---- *************** *** 2132,2135 **** --- 2129,2170 ---- #------------------------------------------------------------------------------# + # TKWIDGETS + TKWIDGETS_NAME=tkwidgets + TKWIDGETS_OBJECTS := $(wildcard $(externals_src)/tkwidgets/*.c) + 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)) + + tkwidgets_install: tkwidgets + install -d $(objectsdir)/$(TKWIDGETS_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(TKWIDGETS_NAME) \ + --author "Hans-Christoph Steiner and other" \ + --description "a collection of objects based on Tk widgets" \ + --license "GPLv2 or later" + install -p $(TKWIDGETS_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(TKWIDGETS_NAME) + install -d $(helpdir)/$(TKWIDGETS_NAME) + install -p $(externals_src)/tkwidgets/*.pd \ + $(helpdir)/$(TKWIDGETS_NAME) + # install -d $(manualsdir)/$(TKWIDGETS_NAME) + # install -p $(externals_src)/tkwidgets/manual.txt \ + # $(manualsdir)/$(TKWIDGETS_NAME) + # install -d $(readmesdir) + # install -p $(externals_src)/tkwidgets/README \ + # $(readmesdir)/$(TKWIDGETS_NAME).txt + # install -d $(examplesdir)/$(TKWIDGETS_NAME) + # install -p $(externals_src)/tkwidgets/examples/*.pd \ + # $(examplesdir)/$(TKWIDGETS_NAME) + + tkwidgets_clean: + -rm -f -- $(TKWIDGETS_OBJECTS:.c=.$(EXTENSION)) + -rm -f -- $(TKWIDGETS_OBJECTS:.c=.o) + -rm -f -- $(externals_src)/tkwidgets/*.bak + -rm -f -- $(externals_src)/tkwidgets/*.*~ + + #------------------------------------------------------------------------------# # TOF TOF_NAME=tof

1 0

pd/src u_main.tk,1.25.6.9,1.25.6.10
by Hans-Christoph Steiner 14 Nov '07

14 Nov '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25392 Modified Files: Tag: branch-v0-40-extended u_main.tk Log Message: checked in changes from patch #1551825 to fix bug #1830767 Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.25.6.9 retrieving revision 1.25.6.10 diff -C2 -d -r1.25.6.9 -r1.25.6.10 *** u_main.tk 13 Nov 2007 23:52:55 -0000 1.25.6.9 --- u_main.tk 14 Nov 2007 00:13:47 -0000 1.25.6.10 *************** *** 1076,1081 **** -orient horizontal ! pack $name.scrollhort -side bottom -fill x ! pack $name.scrollvert -side right -fill y pack $name.c -side left -expand 1 -fill both wm minsize $name 50 20 --- 1076,1081 ---- -orient horizontal ! # pack $name.scrollhort -side bottom -fill x ! # pack $name.scrollvert -side right -fill y pack $name.c -side left -expand 1 -fill both wm minsize $name 50 20 *************** *** 1365,1369 **** # We don't handle multiple clicks yet. ! bind $name.c <Configure> { pdtk_canvas_autoscrollbars %W %w %h } bind $name.c <Button> {pdtk_canvas_click %W %x %y %b 0} bind $name.c <Shift-Button> {pdtk_canvas_click %W %x %y %b 1} --- 1365,1369 ---- # We don't handle multiple clicks yet. ! bind $name.c <Configure> { pdtk_canvas_getscroll %W } bind $name.c <Button> {pdtk_canvas_click %W %x %y %b 0} bind $name.c <Shift-Button> {pdtk_canvas_click %W %x %y %b 1} *************** *** 1758,1761 **** --- 1758,1774 ---- if {$x2 > 100} {set xmaxval $x2} if {$y2 > 100} {set ymaxval $y2} + + set parentname [winfo parent $name] + set winwidth [winfo width $parentname] + set winheight [winfo height $parentname] + set canvaswidth [ expr {abs($xminval)+$xmaxval} ] + set canvasheight [ expr {abs($yminval)+$ymaxval} ] + + if {$winwidth > $canvaswidth} {pack forget $parentname.scrollhort} + if {$winheight > $canvasheight} {pack forget $parentname.scrollvert} + if {$winwidth < $canvaswidth} {pack $parentname.scrollhort -fill x \ + -side bottom -before $parentname.c} + if {$winheight < $canvasheight} {pack $parentname.scrollvert -fill y \ + -side right -before $parentname.c} if {$pdtk_canvas_mouseup_name != $name || \ *************** *** 2027,2032 **** pack $name.radiof.radio36 -side top -anchor w ! set current_radiobutton [format "$name.radiof.radio%d" $initsize] ! $current_radiobutton select frame $name.stretchf --- 2040,2045 ---- pack $name.radiof.radio36 -side top -anchor w ! set current_radiobutton [format "$name.radiof.radio%d" $initsize] ! $current_radiobutton select frame $name.stretchf

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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