Pd-cvs February 2004

pd-cvs@lists.iem.at

11 participants
161 discussions

externals/grill/flext config-pd-cygwin.txt,1.9,1.10 config-pd-mingw.txt,1.1,1.2 makefile.pd-cygwin,1.11,1.12 makefile.pd-linux,1.17,1.18 makefile.pd-mingw,1.1,1.2
by xovo＠users.sourceforge.net 23 Feb '04

23 Feb '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2122 Modified Files: config-pd-cygwin.txt config-pd-mingw.txt makefile.pd-cygwin makefile.pd-linux makefile.pd-mingw Log Message: "" Index: config-pd-cygwin.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/config-pd-cygwin.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** config-pd-cygwin.txt 12 Dec 2003 03:32:56 -0000 1.9 --- config-pd-cygwin.txt 23 Feb 2004 03:27:45 -0000 1.10 *************** *** 1,4 **** # flext - C++ layer for Max/MSP and pd (pure data) externals ! # Copyright (c) 2001-2003 Thomas Grill (xovo(a)gmx.net) # --- 1,4 ---- # flext - C++ layer for Max/MSP and pd (pure data) externals ! # Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) # *************** *** 11,19 **** # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) ! SNDOBJ=/cygdrive/f/prog/audio/sndobj/include # where is the STK include directory? # (leave blank or comment out to disable STK support) ! STK=/cygdrive/f/prog/audio/stk/include # where should flext libraries be built? --- 11,19 ---- # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) ! # SNDOBJ=/cygdrive/f/prog/audio/sndobj/include # where is the STK include directory? # (leave blank or comment out to disable STK support) ! # STK=/cygdrive/f/prog/audio/stk/include # where should flext libraries be built? Index: config-pd-mingw.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/config-pd-mingw.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config-pd-mingw.txt 22 Feb 2004 03:33:59 -0000 1.1 --- config-pd-mingw.txt 23 Feb 2004 03:27:45 -0000 1.2 *************** *** 11,19 **** # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) ! #SNDOBJ=/cygdrive/f/prog/audio/sndobj/include # where is the STK include directory? # (leave blank or comment out to disable STK support) ! #STK=/cygdrive/f/prog/audio/stk/include # where should flext libraries be built? --- 11,19 ---- # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) ! #SNDOBJ=f:/prog/audio/sndobj/include # where is the STK include directory? # (leave blank or comment out to disable STK support) ! #STK=f:/prog/audio/stk/include # where should flext libraries be built? Index: makefile.pd-cygwin =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-cygwin,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.pd-cygwin 22 Feb 2004 03:33:59 -0000 1.11 --- makefile.pd-cygwin 23 Feb 2004 03:27:45 -0000 1.12 *************** *** 7,16 **** # to build run "make -f makefile.pd-cygwin" # ! # --------------------------------------------- ! # ! # compiling for threaded usage is not supported ! # CONFIG=config-pd-cygwin.txt include $(CONFIG) --- 7,15 ---- # to build run "make -f makefile.pd-cygwin" # ! # ----------------------------------------------------------- ! CONFIG=config-pd-cygwin.txt + MAKEFILE=makefile.pd-cygwin include $(CONFIG) *************** *** 18,22 **** # compiler+linker stuff ! INCLUDES=$(PDPATH)/src # /usr/include FLAGS=-DFLEXT_SYS=2 $(UFLAGS) --- 17,22 ---- # compiler+linker stuff ! # /usr/include before the PD path is necessary to include the right pthread files! ! INCLUDES=/usr/include $(PDPATH)/src FLAGS=-DFLEXT_SYS=2 $(UFLAGS) *************** *** 24,29 **** CFLAGS_D=-DFLEXT_DEBUG -g CFLAGS_T=-DFLEXT_THREADS ! CFLAGS_S=-DFLEXT_SHARED ! LIBS= INSTDIR=$(PDPATH)/flext --- 24,30 ---- CFLAGS_D=-DFLEXT_DEBUG -g CFLAGS_T=-DFLEXT_THREADS ! CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS ! ! PDLIBS=$(PDPATH)/bin/pd.dll $(PDPATH)/bin/pthreadVC.dll INSTDIR=$(PDPATH)/flext *************** *** 51,55 **** endif ! MAKEFILE=makefile.pd-cygwin TARGET=$(TARGDIR)/$(NAME)-pdwin.lib TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib --- 52,56 ---- endif ! TARGET=$(TARGDIR)/$(NAME)-pdwin.lib TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib *************** *** 59,63 **** TARGET_SD=$(TARGDIR)/$(NAME)_d.dll ! TARGETS=$(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) # $(TARGET_S) $(TARGET_SD) --- 60,64 ---- TARGET_SD=$(TARGDIR)/$(NAME)_d.dll ! TARGETS=$(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD) *************** *** 70,74 **** touch $@ ! $(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ --- 71,75 ---- touch $@ ! $(TARGDIR)/%.ro : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ *************** *** 76,80 **** $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ ! $(TARGDIR)/%.to : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ --- 77,81 ---- $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ ! $(TARGDIR)/%.tro : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ *************** *** 82,86 **** $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ ! $(TARGDIR)/%.so : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ --- 83,87 ---- $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ ! $(TARGDIR)/%.sro : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ *************** *** 89,114 **** ! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(AR) rc $@ $^ ! chmod 755 $@ $(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) $(AR) rc $@ $^ ! chmod 755 $@ ! $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.to,$(SRCS)) $(AR) rc $@ $^ ! chmod 755 $@ $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS)) $(AR) rc $@ $^ ! chmod 755 $@ ! $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS)) ! $(CXX) -o $@ $^ chmod 755 $@ $(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS)) ! $(CXX) -o $@ $^ chmod 755 $@ --- 90,116 ---- ! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@ $(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@ ! $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@ $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@ ! $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.sro,$(SRCS)) ! $(CXX) -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS) ! strip --strip-unneeded $@ chmod 755 $@ $(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS)) ! $(CXX) -g -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS) chmod 755 $@ Index: makefile.pd-linux =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-linux,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** makefile.pd-linux 7 Nov 2003 03:32:53 -0000 1.17 --- makefile.pd-linux 23 Feb 2004 03:27:45 -0000 1.18 *************** *** 107,123 **** $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS)) ! ar rc $@ $^ chmod 644 $@ $(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) ! ar rc $@ $^ chmod 644 $@ $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS)) ! ar rc $@ $^ chmod 644 $@ $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS)) ! ar rc $@ $^ chmod 644 $@ --- 107,123 ---- $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS)) ! $(AR) rc $@ $^ chmod 644 $@ $(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) ! $(AR) rc $@ $^ chmod 644 $@ $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS)) ! $(AR) rc $@ $^ chmod 644 $@ $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS)) ! $(AR) rc $@ $^ chmod 644 $@ Index: makefile.pd-mingw =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-mingw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.pd-mingw 22 Feb 2004 03:33:59 -0000 1.1 --- makefile.pd-mingw 23 Feb 2004 03:27:45 -0000 1.2 *************** *** 8,16 **** # # --------------------------------------------- ! # ! # compiling for threaded usage is not supported ! # CONFIG=config-pd-mingw.txt include $(CONFIG) --- 8,15 ---- # # --------------------------------------------- ! CONFIG=config-pd-mingw.txt + MAKEFILE=makefile.pd-mingw include $(CONFIG) *************** *** 18,22 **** # compiler+linker stuff ! INCLUDES=$(PDPATH)/src # /usr/include FLAGS=-DFLEXT_SYS=2 $(UFLAGS) --- 17,21 ---- # compiler+linker stuff ! INCLUDES=$(PDPATH)/src FLAGS=-DFLEXT_SYS=2 $(UFLAGS) *************** *** 24,29 **** CFLAGS_D=-DFLEXT_DEBUG -g CFLAGS_T=-DFLEXT_THREADS ! CFLAGS_S=-DFLEXT_SHARED ! LIBS= INSTDIR=$(PDPATH)/flext --- 23,29 ---- CFLAGS_D=-DFLEXT_DEBUG -g CFLAGS_T=-DFLEXT_THREADS ! CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS ! ! PDLIBS=$(PDPATH)/bin/pd.dll $(PDPATH)/bin/pthreadVC.dll INSTDIR=$(PDPATH)/flext *************** *** 51,72 **** endif ! MAKEFILE=makefile.pd-mingw TARGET=$(TARGDIR)/$(NAME)-pdwin.lib TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib TARGET_T=$(TARGDIR)/$(NAME)_t-pdwin.lib TARGET_TD=$(TARGDIR)/$(NAME)_td-pdwin.lib ! TARGETS=$(TARGET) $(TARGET_D) # $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD) all: $(TARGDIR) $(TARGETS) $(TARGDIR): -mkdir $(TARGDIR) $(SRCS): $(HDRS) $(IHDRS) $(MAKEFILE) $(CONFIG) ! touch $@ ! ! $(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ --- 51,74 ---- endif ! TARGET=$(TARGDIR)/$(NAME)-pdwin.lib TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib TARGET_T=$(TARGDIR)/$(NAME)_t-pdwin.lib TARGET_TD=$(TARGDIR)/$(NAME)_td-pdwin.lib + TARGET_S=$(TARGDIR)/$(NAME).dll + TARGET_SD=$(TARGDIR)/$(NAME)_d.dll ! TARGETS=$(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD) all: $(TARGDIR) $(TARGETS) + $(TARGDIR): -mkdir $(TARGDIR) $(SRCS): $(HDRS) $(IHDRS) $(MAKEFILE) $(CONFIG) ! # echo touch $@ # minGW has no touch ! $(TARGDIR)/%.ro : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ *************** *** 74,78 **** $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ ! $(TARGDIR)/%.to : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ --- 76,80 ---- $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ ! $(TARGDIR)/%.tro : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ *************** *** 80,84 **** $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ ! $(TARGDIR)/%.so : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ --- 82,86 ---- $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ ! $(TARGDIR)/%.sro : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ *************** *** 87,112 **** ! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(AR) rc $@ $^ ! chmod 755 $@ $(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) $(AR) rc $@ $^ ! chmod 755 $@ ! $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.to,$(SRCS)) $(AR) rc $@ $^ ! chmod 755 $@ $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS)) $(AR) rc $@ $^ ! chmod 755 $@ ! $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS)) ! $(CXX) -o $@ $^ chmod 755 $@ $(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS)) ! $(CXX) -o $@ $^ chmod 755 $@ --- 89,115 ---- ! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@ $(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@ ! $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@ $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@ ! $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.sro,$(SRCS)) ! $(CXX) -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS) ! strip --strip-unneeded $@ chmod 755 $@ $(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS)) ! $(CXX) -g -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS) chmod 755 $@

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.4,1.1.1.4.2.7.4.5
by matju＠users.sourceforge.net 23 Feb '04

23 Feb '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28123 Modified Files: Tag: impd_0_37 u_main.tk Log Message: more bugfixes some changes to "About" Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.4 retrieving revision 1.1.1.4.2.7.4.5 diff -C2 -d -r1.1.1.4.2.7.4.4 -r1.1.1.4.2.7.4.5 *** u_main.tk 22 Feb 2004 22:37:38 -0000 1.1.1.4.2.7.4.4 --- u_main.tk 23 Feb 2004 02:52:33 -0000 1.1.1.4.2.7.4.5 *************** *** 266,269 **** --- 266,276 ---- set doc_number 1 + proc menu_about {} { + set dialog [menu_doc_open doc/1.manual 1.introduction.txt] + wm title $dialog "About Pd" + label $dialog.title -text "About Pure Data" -font {helvetica 24} + pack $dialog.title -side top + } + proc menu_opentext {filename} { global doc_number *************** *** 282,287 **** button $name.2.close -text Close -command "destroy $name" pack $name.2.close -side right ! pack $name.1 -fill both -expand 1 ! pack $name.2 -fill x -expand 0 set f [open $filename] --- 289,294 ---- button $name.2.close -text Close -command "destroy $name" pack $name.2.close -side right ! pack $name.2 -side bottom -fill x -expand 0 ! pack $name.1 -side bottom -fill both -expand 1 set f [open $filename] *************** *** 294,298 **** $name.1.text configure -state disabled close $f ! set doc_number [expr $doc_number + 1] } --- 301,306 ---- $name.1.text configure -state disabled close $f ! set doc_number [expr $doc_number + 1] ! return $name } *************** *** 340,344 **** if {[string first .txt $basename] >= 0} { ! menu_opentext $dirname/$basename } else { pd [concat pd open [pdtk_enquote $basename] \ --- 348,352 ---- if {[string first .txt $basename] >= 0} { ! return [menu_opentext $dirname/$basename] } else { pd [concat pd open [pdtk_enquote $basename] \ *************** *** 374,378 **** # the "Help" menu $mbar.help add command -label {About Pd} \ ! -command {menu_doc_open doc/1.manual 1.introduction.txt} $mbar.help add command -label {Pure Documentation...} \ -command {menu_documentation} --- 382,386 ---- # the "Help" menu $mbar.help add command -label {About Pd} \ ! -command {menu_about} $mbar.help add command -label {Pure Documentation...} \ -command {menu_documentation} *************** *** 685,690 **** -orient horizontal ! make_button_bar $name.bbar $name ! pack $name.bbar -side top -fill x -expand no pack $name.scrollhort -side bottom -fill x --- 693,700 ---- -orient horizontal ! if {[info exists env(pd_look)]} { ! make_button_bar $name.bbar $name ! pack $name.bbar -side top -fill x -expand no ! } pack $name.scrollhort -side bottom -fill x *************** *** 3391,3395 **** } } ! load_button_bar proc make_button_bar {self doc} { --- 3401,3405 ---- } } ! if {[info exists env(pd_look)]} {load_button_bar} proc make_button_bar {self doc} { *************** *** 3497,3499 **** # rendering: ! source u_object.tk --- 3507,3509 ---- # rendering: ! source $pd_guidir/bin/u_object.tk

1 0

pd/src t_tkcmd.c,1.1.1.4,1.1.1.4.4.1
by matju＠users.sourceforge.net 23 Feb '04

23 Feb '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27265 Modified Files: Tag: impd_0_37 t_tkcmd.c Log Message: better reporting of Tcl errors Index: t_tkcmd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v retrieving revision 1.1.1.4 retrieving revision 1.1.1.4.4.1 diff -C2 -d -r1.1.1.4 -r1.1.1.4.4.1 *** t_tkcmd.c 9 May 2003 16:03:44 -0000 1.1.1.4 --- t_tkcmd.c 23 Feb 2004 02:46:52 -0000 1.1.1.4.4.1 *************** *** 320,327 **** sprintf(buf, "set pd_guidir \"%s\"\n", pdgui_path); tcl_mess(buf); ! strcpy(buf, pdgui_path); ! strcat(buf, "/bin/"); ! strcat(buf, s); ! if (Tcl_EvalFile(interp, buf) != TCL_OK) { char buf2[1000]; --- 320,328 ---- sprintf(buf, "set pd_guidir \"%s\"\n", pdgui_path); tcl_mess(buf); ! sprintf(buf, "set script {%s/bin/%s}\n" ! "if {[catch {source $script} err]} " ! "{puts stderr \"tcl: ERROR loading $script: $err\"}",pdgui_path,s); ! /* is there a way to do a Tcl [catch] from C ? */ ! if (Tcl_Eval(interp, buf) != TCL_OK) { char buf2[1000]; *************** *** 329,332 **** --- 330,334 ---- buf); tcl_mess(buf2); + tcl_mess("puts stderr {tcl: should not get here}"); } }

1 0

pd/src makefile.in,1.1.1.3.2.12.2.1,1.1.1.3.2.12.2.2
by matju＠users.sourceforge.net 23 Feb '04

23 Feb '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6818 Modified Files: Tag: impd_0_37 makefile.in Log Message: oops Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.1.1.3.2.12.2.1 retrieving revision 1.1.1.3.2.12.2.2 diff -C2 -d -r1.1.1.3.2.12.2.1 -r1.1.1.3.2.12.2.2 *** makefile.in 22 Feb 2004 22:37:37 -0000 1.1.1.3.2.12.2.1 --- makefile.in 23 Feb 2004 00:44:25 -0000 1.1.1.3.2.12.2.2 *************** *** 62,69 **** all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk $(BIN_DIR)/u_object.tk externs bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk $(BIN_DIR)/u_object.tk $(OBJ) : %.o : %.c --- 62,69 ---- all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk externs bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk $(OBJ) : %.o : %.c

1 0

externals/sprinkler Changes,1.2,1.3 README.pod,1.2,1.3 configure.in,1.2,1.3 sprinkler-help.pd.in,1.1.1.1,1.2 sprinkler.c,1.2,1.3
by mukau＠users.sourceforge.net 23 Feb '04

23 Feb '04

Update of /cvsroot/pure-data/externals/sprinkler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4379 Modified Files: Changes README.pod configure.in sprinkler-help.pd.in sprinkler.c Log Message: sprinkler v0.05 + added pass-through outlet for unbound destination symbols + added hack to prevent 'bang's being sprinkled as 'normal' symbols Index: Changes =================================================================== RCS file: /cvsroot/pure-data/externals/sprinkler/Changes,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Changes 17 Aug 2003 11:26:57 -0000 1.2 --- Changes 23 Feb 2004 00:32:33 -0000 1.3 *************** *** 1,7 **** Change log for PD external 'sprinkler' (formerly 'forward') ! v0.04 Sun, 17 Aug 2003 13:23:54 +0200 ! + removed stale "VERSION" file ! + tested with gcc-2.95.4 and pd-0.37-test8 v0.03 Sun Sep 8 00:56:33 CEST 2002 --- 1,11 ---- Change log for PD external 'sprinkler' (formerly 'forward') ! v0.05 Mon, 23 Feb 2004 01:14:08 +0100 ! + added pass-through outlet for unbound destination symbols ! + added hack to prevent 'bang's being sprinkled as 'normal' symbols ! ! v0.04 Thu, 29 Jan 2004 16:26:00 +0100 ! + added error() call for missing destinations ! + todo: add pass-through outlet for missing destinations v0.03 Sun Sep 8 00:56:33 CEST 2002 Index: README.pod =================================================================== RCS file: /cvsroot/pure-data/externals/sprinkler/README.pod,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README.pod 17 Aug 2003 11:26:57 -0000 1.2 --- README.pod 23 Feb 2004 00:32:33 -0000 1.3 *************** *** 3,8 **** README for pd external 'sprinkler' (formerly 'forward') - Last updated for sprinkler v0.04 - =head1 DESCRIPTION --- 3,6 ---- Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/externals/sprinkler/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.in 17 Aug 2003 11:26:57 -0000 1.2 --- configure.in 23 Feb 2004 00:32:33 -0000 1.3 *************** *** 2,6 **** dnl -- adapted from 'configure.in' in ggee distribution by Guenter Geiger AC_PREREQ(2.5) ! AC_INIT(sprinkler, [0.04], [moocow(a)ling.uni-potsdam.de]) dnl --- 2,6 ---- dnl -- adapted from 'configure.in' in ggee distribution by Guenter Geiger AC_PREREQ(2.5) ! AC_INIT(sprinkler, [0.05], [moocow(a)ling.uni-potsdam.de]) dnl *************** *** 90,101 **** DFLAGS="$DFLAGS -DNON_MAX_FORWARD" SPRINKLER_COMPAT_TEXT=["(with MAX-incompatible [forward] alias)"] ! SPRINKLER_ALIAS_1="#X obj 102 327 forward;" ! SPRINKLER_ALIAS_2="#X obj 102 352 fw;" else AC_MSG_RESULT(no) NON_MAX_FORWARD="no" SPRINKLER_COMPAT_TEXT=["(formerly MAX-incompatible \[forward\])"] ! SPRINKLER_ALIAS_1="#X text 102 327 none;" ! SPRINKLER_ALIAS_2="#X text 102 352 (disabled);" fi AC_SUBST(NON_MAX_FORWARD) --- 90,101 ---- DFLAGS="$DFLAGS -DNON_MAX_FORWARD" SPRINKLER_COMPAT_TEXT=["(with MAX-incompatible [forward] alias)"] ! SPRINKLER_ALIAS_1="#X obj 102 407 forward;" ! SPRINKLER_ALIAS_2="#X obj 102 432 fw;" else AC_MSG_RESULT(no) NON_MAX_FORWARD="no" SPRINKLER_COMPAT_TEXT=["(formerly MAX-incompatible \[forward\])"] ! SPRINKLER_ALIAS_1="#X text 102 407 none;" ! SPRINKLER_ALIAS_2="#X text 102 432 (disabled);" fi AC_SUBST(NON_MAX_FORWARD) Index: sprinkler-help.pd.in =================================================================== RCS file: /cvsroot/pure-data/externals/sprinkler/sprinkler-help.pd.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sprinkler-help.pd.in 8 Sep 2002 00:15:23 -0000 1.1.1.1 --- sprinkler-help.pd.in 23 Feb 2004 00:32:33 -0000 1.2 *************** *** 1,21 **** ! #N canvas 186 52 500 508 10; ! #X floatatom 26 36 5 0 0; ! #X symbolatom 36 100 10 0 0; ! #X text 25 309 ARGUMENTS: none; ! #X text 183 307 INLETS:; ! #X text 183 343 OUTLETS: none; #X text 217 161 forward lists; #X text 161 45 forward single floats; #X text 169 107 forward single symbols; ! #X text 41 379 NOTES:; ! #X text 185 321 1 - list or message of the form DST MSG; ! #X text 165 477 Bryan Jurish <moocow(a)ling.uni-potsdam.de>; ! #X floatatom 118 254 5 0 0; ! #X obj 54 254 pack s 0; ! #X text 175 219 dynamic destination; #X msg 45 153 420; ! #X obj 26 284 sprinkler; #X text 53 3 sprinkler : dynamic control-message dissemination; ! #X text 41 393 When a [sprinkler] object gets an input message of the form "DST MSG" at its inlet \, the message MSG is sent to the [receive] object(s) named by DST. 'sprinkler' is really only useful if you don't --- 1,21 ---- ! #N canvas 193 23 510 596 10; ! #X floatatom 26 36 5 0 0 0 - - -; ! #X symbolatom 36 100 10 0 0 0 - - -; ! #X text 25 389 ARGUMENTS: none; ! #X text 183 387 INLETS:; ! #X text 183 423 OUTLETS: none; #X text 217 161 forward lists; #X text 161 45 forward single floats; #X text 169 107 forward single symbols; ! #X text 41 469 NOTES:; ! #X text 185 401 1 - list or message of the form DST MSG; ! #X text 165 567 Bryan Jurish <moocow(a)ling.uni-potsdam.de>; ! #X floatatom 117 257 5 0 0 0 - - -; ! #X obj 53 257 pack s 0; ! #X text 178 224 dynamic destination; #X msg 45 153 420; ! #X obj 25 326 sprinkler; #X text 53 3 sprinkler : dynamic control-message dissemination; ! #X text 41 483 When a [sprinkler] object gets an input message of the form "DST MSG" at its inlet \, the message MSG is sent to the [receive] object(s) named by DST. 'sprinkler' is really only useful if you don't *************** *** 25,35 **** #X msg 35 121 sprinkler-help2 \$1; #X msg 45 177 sprinkler-help1 \$1 24 7; ! #X msg 55 209 sprinkler-help1; ! #X msg 61 231 sprinkler-help2; #X obj 340 42 r sprinkler-help1; #X obj 340 64 print sprinkler-help1; #X obj 340 110 r sprinkler-help2; #X obj 340 132 print sprinkler-help2; ! #X text 39 327 ALIASES:; @SPRINKLER_ALIAS_1@ @SPRINKLER_ALIAS_2@ --- 25,38 ---- #X msg 35 121 sprinkler-help2 \$1; #X msg 45 177 sprinkler-help1 \$1 24 7; ! #X msg 54 212 sprinkler-help1; ! #X msg 60 234 sprinkler-help2; #X obj 340 42 r sprinkler-help1; #X obj 340 64 print sprinkler-help1; #X obj 340 110 r sprinkler-help2; #X obj 340 132 print sprinkler-help2; ! #X obj 25 350 print sprinkler-thru; ! #X text 257 298 this gets passed through; ! #X msg 53 297 illusory-receive-name uh oh; ! #X text 39 407 ALIASES:; @SPRINKLER_ALIAS_1@ @SPRINKLER_ALIAS_2@ *************** *** 40,43 **** --- 43,47 ---- #X connect 12 0 15 0; #X connect 14 0 20 0; + #X connect 15 0 27 0; #X connect 18 0 15 0; #X connect 19 0 15 0; *************** *** 47,48 **** --- 51,53 ---- #X connect 23 0 24 0; #X connect 25 0 26 0; + #X connect 29 0 15 0; Index: sprinkler.c =================================================================== RCS file: /cvsroot/pure-data/externals/sprinkler/sprinkler.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sprinkler.c 9 Mar 2003 11:10:53 -0000 1.2 --- sprinkler.c 23 Feb 2004 00:32:33 -0000 1.3 *************** *** 59,63 **** *=====================================================================*/ ! static char *sprinkler_version = "\nsprinkler version 0.03 by Bryan Jurish : dynamic message dissemination"; static t_class *sprinkler_class; --- 59,63 ---- *=====================================================================*/ ! static char *sprinkler_banner = "\nsprinkler version %s by Bryan Jurish : dynamic message dissemination"; static t_class *sprinkler_class; *************** *** 65,69 **** typedef struct _sprinkler { ! t_object x_obj; } t_sprinkler; --- 65,70 ---- typedef struct _sprinkler { ! t_object x_obj; ! t_outlet *x_thru; //-- pass-through outlet } t_sprinkler; *************** *** 99,103 **** return; case A_SYMBOL: ! pd_typedmess(dst->s_thing,&s_symbol,argc,argv); return; case A_POINTER: --- 100,109 ---- return; case A_SYMBOL: ! //-- special handling for 'bang' ! if (argv->a_w.w_symbol == &s_bang) { ! pd_typedmess(dst->s_thing,&s_bang,0,0); ! } else { ! pd_typedmess(dst->s_thing,&s_symbol,argc,argv); ! } return; case A_POINTER: *************** *** 115,125 **** case A_CANT: default: ! // just fall though ! ; // empty statement to keep VC++ happy } } // default -- sprinkler anything else with 'pd_forwardmess' pd_forwardmess(dst->s_thing,argc,argv); } } --- 121,135 ---- case A_CANT: default: ! // just fall though } } // default -- sprinkler anything else with 'pd_forwardmess' pd_forwardmess(dst->s_thing,argc,argv); + return; } + + //post("sprinkler: no destination for `%s'", dst ? dst->s_name : "(null)"); + //-- pass through + outlet_anything(x->x_thru, dst, argc, argv); } *************** *** 132,141 **** --- 142,160 ---- } + + /*-------------------------------------------------------------------- + * newmethod, freemethod + */ void *sprinkler_new(t_symbol *s) { t_sprinkler *x = (t_sprinkler *)pd_new(sprinkler_class); + x->x_thru = outlet_new(&x->x_obj, &s_anything); return (x); } + void sprinkler_free(t_sprinkler *x) { + outlet_free(x->x_thru); + } + /*-------------------------------------------------------------------- * setup *************** *** 143,148 **** void sprinkler_setup(void) { ! post(sprinkler_version); ! sprinkler_class = class_new(gensym("sprinkler"), (t_newmethod)sprinkler_new, 0, sizeof(t_sprinkler), 0, 0); #ifdef NON_MAX_FORWARD --- 162,171 ---- void sprinkler_setup(void) { ! post(sprinkler_banner, PACKAGE_VERSION); ! sprinkler_class = class_new(gensym("sprinkler"), ! (t_newmethod)sprinkler_new, ! (t_method)sprinkler_free, ! sizeof(t_sprinkler), ! 0, 0); #ifdef NON_MAX_FORWARD

1 0

pd/src makefile.in,1.1.1.3.2.12,1.1.1.3.2.12.2.1 s_main.c,1.1.1.4.2.8.4.1,1.1.1.4.2.8.4.2 u_main.tk,1.1.1.4.2.7.4.3,1.1.1.4.2.7.4.4
by matju＠users.sourceforge.net 22 Feb '04

22 Feb '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15181 Modified Files: Tag: impd_0_37 makefile.in s_main.c u_main.tk Log Message: "About" now says impd instead of devel; has close button + title adding u_object.tk file in makefile.in Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.1.1.3.2.12 retrieving revision 1.1.1.3.2.12.2.1 diff -C2 -d -r1.1.1.3.2.12 -r1.1.1.3.2.12.2.1 *** makefile.in 14 Jan 2004 15:42:49 -0000 1.1.1.3.2.12 --- makefile.in 22 Feb 2004 22:37:37 -0000 1.1.1.3.2.12.2.1 *************** *** 62,69 **** all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk externs bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk $(OBJ) : %.o : %.c --- 62,69 ---- all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk $(BIN_DIR)/u_object.tk externs bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk $(BIN_DIR)/u_object.tk $(OBJ) : %.o : %.c *************** *** 124,127 **** --- 124,128 ---- install $(BIN_DIR)/pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog install -m644 $(BIN_DIR)/pd.tk $(INSTDIR)/lib/pd/bin/pd.tk + install -m644 u_object.tk $(INSTDIR)/lib/pd/bin/u_object.tk install -d $(INSTDIR)/bin install -m755 $(PDEXEC) $(INSTDIR)/bin/pd Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.1.1.4.2.8.4.1 retrieving revision 1.1.1.4.2.8.4.2 diff -C2 -d -r1.1.1.4.2.8.4.1 -r1.1.1.4.2.8.4.2 *** s_main.c 22 Feb 2004 18:00:47 -0000 1.1.1.4.2.8.4.1 --- s_main.c 22 Feb 2004 22:37:38 -0000 1.1.1.4.2.8.4.2 *************** *** 8,12 **** */ ! char pd_version[] = "Pd version 0.37.1 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 8,12 ---- */ ! char pd_version[] = "Pd version 0.37.1 impd\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.3 retrieving revision 1.1.1.4.2.7.4.4 diff -C2 -d -r1.1.1.4.2.7.4.3 -r1.1.1.4.2.7.4.4 *** u_main.tk 22 Feb 2004 20:48:27 -0000 1.1.1.4.2.7.4.3 --- u_main.tk 22 Feb 2004 22:37:38 -0000 1.1.1.4.2.7.4.4 *************** *** 272,281 **** set name [format ".help%d" $doc_number] toplevel $name ! text $name.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \ ! -yscrollcommand "$name.scroll set" -background white ! scrollbar $name.scroll -command "$name.text yview" ! pack $name.scroll -side right -fill y ! pack $name.text -side left -fill both -expand 1 ! set f [open $filename] while {![eof $f]} { --- 272,288 ---- set name [format ".help%d" $doc_number] toplevel $name ! wm title $name $filename ! frame $name.1 ! frame $name.2 ! text $name.1.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \ ! -yscrollcommand "$name.1.scroll set" -background white ! scrollbar $name.1.scroll -command "$name.1.text yview" ! pack $name.1.scroll -side right -fill y ! pack $name.1.text -side left -fill both -expand 1 ! button $name.2.close -text Close -command "destroy $name" ! pack $name.2.close -side right ! pack $name.1 -fill both -expand 1 ! pack $name.2 -fill x -expand 0 ! set f [open $filename] while {![eof $f]} { *************** *** 283,288 **** regsub -all PD_BASEDIR $bigstring $pd_guidir bigstring2 regsub -all PD_VERSION $bigstring2 $pd_myversion bigstring3 ! $name.text insert end $bigstring3 } close $f set doc_number [expr $doc_number + 1] --- 290,296 ---- regsub -all PD_BASEDIR $bigstring $pd_guidir bigstring2 regsub -all PD_VERSION $bigstring2 $pd_myversion bigstring3 ! $name.1.text insert end $bigstring3 } + $name.1.text configure -state disabled close $f set doc_number [expr $doc_number + 1] *************** *** 3380,3384 **** set errMsg {} catch {image create photo icon_$im -file $dir/$im.gif } errMsg ! if {[string compare "" $errMsg] != 0} { post_to_gui "ERROR: $errMsg\n" } } } --- 3388,3392 ---- set errMsg {} catch {image create photo icon_$im -file $dir/$im.gif } errMsg ! #if {[string compare "" $errMsg] != 0} { post_to_gui "ERROR: $errMsg\n" } } } *************** *** 3394,3398 **** set BLAH [lindex $b 1] catch { - post_to_gui "butt: $b\n" button "$self.[lindex $b 0]" -image "icon_[lindex $b 0]" -border 1 \ -command "pd \[concat $doc $BLAH \\;\]" --- 3402,3405 ---- *************** *** 3463,3467 **** entry .browser.butt.2 -width 15 pack .browser.butt.1 .browser.butt.2 -side left ! button .browser.butt.close -text "Close" -command {puts "What did you say?"} pack .browser.butt.close -side right pack .browser.butt -side bottom -fill x -expand no --- 3470,3474 ---- entry .browser.butt.2 -width 15 pack .browser.butt.1 .browser.butt.2 -side left ! button .browser.butt.close -text "Close" -command "destroy .browser" pack .browser.butt.close -side right pack .browser.butt -side bottom -fill x -expand no *************** *** 3489,3490 **** --- 3496,3499 ---- } + # rendering: + source u_object.tk

1 0

pd/src u_object.tk,NONE,1.1.2.1
by matju＠users.sourceforge.net 22 Feb '04

22 Feb '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10719 Added Files: Tag: impd_0_37 u_object.tk Log Message: this file will be used for the GUI side of objects (instead of abusing sys_vgui) --- NEW FILE: u_object.tk ---

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.2,1.1.1.4.2.7.4.3
by matju＠users.sourceforge.net 22 Feb '04

22 Feb '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22295 Modified Files: Tag: impd_0_37 u_main.tk Log Message: oops Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.2 retrieving revision 1.1.1.4.2.7.4.3 diff -C2 -d -r1.1.1.4.2.7.4.2 -r1.1.1.4.2.7.4.3 *** u_main.tk 22 Feb 2004 20:45:50 -0000 1.1.1.4.2.7.4.2 --- u_main.tk 22 Feb 2004 20:48:27 -0000 1.1.1.4.2.7.4.3 *************** *** 3401,3405 **** } entry $self.name -font {courier 9} -width 10 -border 0 ! $self.name insert 0 ".[lindex [split .x81fb748.bbar .] 1]" $self.name configure -state disabled pack $self.name -side right --- 3401,3405 ---- } entry $self.name -font {courier 9} -width 10 -border 0 ! $self.name insert 0 ".[lindex [split $self .] 1]" $self.name configure -state disabled pack $self.name -side right

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.1,1.1.1.4.2.7.4.2
by matju＠users.sourceforge.net 22 Feb '04

22 Feb '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21427 Modified Files: Tag: impd_0_37 u_main.tk Log Message: added button_bar_add for externs that want to add their own buttons buttons get only loaded once at the end of the button bar, there's a (selectable) window-id Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.1 retrieving revision 1.1.1.4.2.7.4.2 diff -C2 -d -r1.1.1.4.2.7.4.1 -r1.1.1.4.2.7.4.2 *** u_main.tk 22 Feb 2004 05:23:52 -0000 1.1.1.4.2.7.4.1 --- u_main.tk 22 Feb 2004 20:45:50 -0000 1.1.1.4.2.7.4.2 *************** *** 15,18 **** --- 15,22 ---- # all this changes are labeled with #######iemlib########## + #option add *background pink widgetDefault + #option add *backgroundPixmap /usr/share/themes/BrushedMetalBlue/gtk/brushed-dark.xpm widgetDefault + #option add *backgroundPixmap /home/matju/brushed-dark.gif widgetDefault + # Tearoff is set to true by default: set pd_tearoff 1 *************** *** 374,382 **** -accelerator [accel_munge "Ctrl+o"] .mbar.file add separator .mbar.file add command -label Message -command {menu_send} \ -accelerator [accel_munge "Ctrl+m"] .mbar.file add command -label Path... \ -command {pd pd start-path-dialog \;} - .mbar.file add command -label {Class List} -command {show_class_list} .mbar.file add separator .mbar.file add command -label Quit -command {menu_quit} \ --- 378,386 ---- -accelerator [accel_munge "Ctrl+o"] .mbar.file add separator + .mbar.file add command -label {Class List} -command {show_class_list} .mbar.file add command -label Message -command {menu_send} \ -accelerator [accel_munge "Ctrl+m"] .mbar.file add command -label Path... \ -command {pd pd start-path-dialog \;} .mbar.file add separator .mbar.file add command -label Quit -command {menu_quit} \ *************** *** 655,659 **** } - ############# pdtk_canvas_new -- create a new canvas ############### proc pdtk_canvas_new {name width height geometry editable} { --- 659,662 ---- *************** *** 673,681 **** scrollbar $name.scrollhort -command "$name.c xview" \ -orient horizontal ! global env ! if {[info exists env(pd_look)]} { ! make_button_bar $name.bbar $name ! pack $name.bbar -side top -fill x -expand no ! } pack $name.scrollhort -side bottom -fill x --- 676,682 ---- scrollbar $name.scrollhort -command "$name.c xview" \ -orient horizontal ! ! make_button_bar $name.bbar $name ! pack $name.bbar -side top -fill x -expand no pack $name.scrollhort -side bottom -fill x *************** *** 779,782 **** --- 780,785 ---- $name.m.edit entryconfigure "Edit mode" -indicatoron false } + $name.m.edit add command -label Redraw -command [list pd "$name map 0; $name map 1;\n"] + ############iemlib################## *************** *** 950,953 **** --- 953,957 ---- # puts stderr "all done" # after 1 [concat raise $name] + # after 1 [list canvas_animate $name] } *************** *** 2589,2596 **** if {$value} { $name.m.edit entryconfigure "Edit mode" -indicatoron true ! catch {$name.bbar.edit configure -image icon_mode_edit} } else { $name.m.edit entryconfigure "Edit mode" -indicatoron false ! catch {$name.bbar.edit configure -image icon_mode_run} } } --- 2593,2602 ---- if {$value} { $name.m.edit entryconfigure "Edit mode" -indicatoron true ! $name.bbar.edit configure -image icon_mode_edit ! $name.c configure -background #dddddd } else { $name.m.edit entryconfigure "Edit mode" -indicatoron false ! $name.bbar.edit configure -image icon_mode_run ! $name.c configure -background #ffffff } } *************** *** 2602,2606 **** # if {$font >= 13} {set fontname [format -*-courier-----%d-* $font]} $canvasname create text $x $y \ ! -font [format -*-courier-bold--normal--%d-* $font] \ -tags $myname -text $text -fill $color -anchor nw # pd [concat $myname size [$canvasname bbox $myname] \;] --- 2608,2612 ---- # if {$font >= 13} {set fontname [format -*-courier-----%d-* $font]} $canvasname create text $x $y \ ! -font [format -*-courier-medium--normal--%d-* $font] \ -tags $myname -text $text -fill $color -anchor nw # pd [concat $myname size [$canvasname bbox $myname] \;] *************** *** 2637,2661 **** set pd_myversion $version set pd_apilist $apilist ! set width1 [font measure -*-courier-bold--normal--8-* x] ! set height1 [lindex [font metrics -*-courier-bold--normal--8-*] 5] ! ! set width2 [font measure -*-courier-bold--normal--10-* x] ! set height2 [lindex [font metrics -*-courier-bold--normal--10-*] 5] ! ! set width3 [font measure -*-courier-bold--normal--12-* x] ! set height3 [lindex [font metrics -*-courier-bold--normal--12-*] 5] ! ! set width4 [font measure -*-courier-bold--normal--14-* x] ! set height4 [lindex [font metrics -*-courier-bold--normal--14-*] 5] ! ! set width5 [font measure -*-courier-bold--normal--16-* x] ! set height5 [lindex [font metrics -*-courier-bold--normal--16-*] 5] ! ! set width6 [font measure -*-courier-bold--normal--24-* x] ! set height6 [lindex [font metrics -*-courier-bold--normal--24-*] 5] ! ! set width7 [font measure -*-courier-bold--normal--36-* x] ! set height7 [lindex [font metrics -*-courier-bold--normal--36-*] 5] set tclpatch [info patchlevel] --- 2643,2655 ---- set pd_myversion $version set pd_apilist $apilist + set font -*-courier-bold--normal- ! set width1 [font measure $font-8-* x]; set height1 [lindex [font metrics $font-8-*] 5] ! set width2 [font measure $font-10-* x]; set height2 [lindex [font metrics $font-10-*] 5] ! set width3 [font measure $font-12-* x]; set height3 [lindex [font metrics $font-12-*] 5] ! set width4 [font measure $font-14-* x]; set height4 [lindex [font metrics $font-14-*] 5] ! set width5 [font measure $font-16-* x]; set height5 [lindex [font metrics $font-16-*] 5] ! set width6 [font measure $font-24-* x]; set height6 [lindex [font metrics $font-24-*] 5] ! set width7 [font measure $font-36-* x]; set height7 [lindex [font metrics $font-36-*] 5] set tclpatch [info patchlevel] *************** *** 3322,3398 **** catch { if {$env(pd_console_scrollback) != 0} { ! frame .log ! text .log.1 -width 80 -height 10 -yscrollcommand ".log.2 set" ! scrollbar .log.2 -command ".log.1 yview" ! .log.1 insert end "This is the PureData log\n" ! pack .log.1 -side left -fill both -expand yes ! pack .log.2 -side left -fill y -expand yes ! pack .log -fill both -expand yes ! }} errMsg ! if {[string compare "" $errMsg] != 0} { ! puts stderr "ERROR: $errMsg" } ! set console_scrollback_count 0 proc post_to_gui {x} { ! global env ! global console_scrollback_count ! set oldpos [lindex [.log.2 get] 1] ! .log.1 insert end $x ! incr console_scrollback_count ! if {$console_scrollback_count >= $env(pd_console_scrollback)} { ! .log.1 delete 1.0 2.0 ! } ! if {$oldpos > 0.9999} {.log.1 see end} } - .log.2 set 0.0 1.0 - ############ button bar set butt { ! {object {obj 0} object} ! {message {msg 0} message} ! {number {floatatom 0} number} ! {symbol {symbolatom 0} symbol} ! {comment {text 0} comment} ! {bang {bng 0} bang} ! {toggle {toggle 0} toggle} ! {number2 {numbox 0} number2} ! {vslider {vslider 0} vslider} ! {hslider {hslider 0} hslider} ! {vradio {vradio 0} vradio} ! {hradio {hradio 0} hradio} ! {vu {vumeter 0} vu} ! {canvas {mycnv 0} canvas} ! {graph {graph} graph} ! {array {menuarray} array} } ! proc make_button_bar {self doc} { ! global data butt ! # global pd_guidir ! # set dir $pd_guidir/icons global env set dir $env(pd_look) ! frame $self ! foreach im { ! mode_edit mode_run ! object message number symbol comment bang ! toggle number2 vslider hslider vradio hradio ! vu canvas graph array ! } { ! image create photo icon_$im -file $dir/$im.gif } button $self.edit -image icon_mode_edit -border 1 \ -command [concat menu_editmode $doc] pack $self.edit -side left - foreach b $butt { set BLAH [lindex $b 1] ! button "$self.[lindex $b 0]" -image "icon_[lindex $b 2]" -border 1 \ ! -command "pd \[concat $doc $BLAH \\;\]" ! pack $self.[lindex $b 0] -side left } } --- 3316,3407 ---- catch { if {$env(pd_console_scrollback) != 0} { ! frame .log ! text .log.1 -width 60 -height 10 -yscrollcommand ".log.2 set" ! scrollbar .log.2 -command ".log.1 yview" ! .log.1 insert end "This is the PureData log\n" ! pack .log.1 -side left -fill both -expand yes ! pack .log.2 -side left -fill y -expand no ! pack .log -fill both -expand yes ! .log.2 set 0.0 1.0 } ! } errMsg ! if {[string compare "" $errMsg] != 0} {puts stderr "ERROR: $errMsg"} set console_scrollback_count 0 proc post_to_gui {x} { ! global env ! global console_scrollback_count ! set oldpos [lindex [.log.2 get] 1] ! .log.1 insert end $x ! incr console_scrollback_count ! if {$console_scrollback_count >= $env(pd_console_scrollback)} { ! .log.1 delete 1.0 2.0 ! } ! if {$oldpos > 0.9999} {.log.1 see end} } ############ button bar set butt { ! {object {obj 0}} ! {message {msg 0}} ! {number {floatatom 0}} ! {symbol {symbolatom 0}} ! {comment {text 0}} ! {bang {bng 0}} ! {toggle {toggle 0}} ! {number2 {numbox 0}} ! {vslider {vslider 0}} ! {hslider {hslider 0}} ! {vradio {vradio 0}} ! {hradio {hradio 0}} ! {vu {vumeter 0}} ! {canvas {mycnv 0}} ! {graph {graph}} ! {array {menuarray}} } ! proc button_bar_add {x y} { ! global butt ! lappend butt [list $x $y noload] ! ! } ! ! proc load_button_bar {} { ! global butt global env + set icons {mode_edit mode_run} set dir $env(pd_look) ! foreach b $butt { ! if {[string compare [lindex $b 2] noload]!=0} { ! lappend icons [lindex $b 0] ! } ! } ! foreach im $icons { ! set errMsg {} ! catch {image create photo icon_$im -file $dir/$im.gif } errMsg ! if {[string compare "" $errMsg] != 0} { post_to_gui "ERROR: $errMsg\n" } } + } + load_button_bar + + proc make_button_bar {self doc} { + global butt + frame $self button $self.edit -image icon_mode_edit -border 1 \ -command [concat menu_editmode $doc] pack $self.edit -side left foreach b $butt { set BLAH [lindex $b 1] ! catch { ! post_to_gui "butt: $b\n" ! button "$self.[lindex $b 0]" -image "icon_[lindex $b 0]" -border 1 \ ! -command "pd \[concat $doc $BLAH \\;\]" ! pack $self.[lindex $b 0] -side left ! } } + entry $self.name -font {courier 9} -width 10 -border 0 + $self.name insert 0 ".[lindex [split .x81fb748.bbar .] 1]" + $self.name configure -state disabled + pack $self.name -side right }

1 0

externals/build/src popup.c,NONE,1.1
by ggeiger＠users.sourceforge.net 22 Feb '04

22 Feb '04

Update of /cvsroot/pure-data/externals/build/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19404 Added Files: popup.c Log Message: linked popup into common buildsys --- NEW FILE: popup.c --- #include "../../popup/popup.c"

1 0

← Newer
1
2
3
4
5
6
7
8
...
17
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 February 2004