Pd-cvs January 2009

pd-cvs@lists.iem.at

23 participants
357 discussions

SF.net SVN: pure-data:[10528] trunk/externals/miXed/Makefile.common
by zmoelnig＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10528 http://pure-data.svn.sourceforge.net/pure-data/?rev=10528&view=rev Author: zmoelnig Date: 2009-01-13 15:59:14 +0000 (Tue, 13 Jan 2009) Log Message: ----------- added "-fPIC" for 64bit compatibility Modified Paths: -------------- trunk/externals/miXed/Makefile.common Modified: trunk/externals/miXed/Makefile.common =================================================================== --- trunk/externals/miXed/Makefile.common 2009-01-13 14:03:33 UTC (rev 10527) +++ trunk/externals/miXed/Makefile.common 2009-01-13 15:59:14 UTC (rev 10528) @@ -37,7 +37,7 @@ CC = gcc LFLAGS = -export_dynamic -shared # FIXME strict-aliasing -OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing +OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing -fPIC ifeq ($(MY_NAME),krzYszcz) DEFINES = -DUNIX -DKRZYSZCZ else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10527] trunk/externals/mrpeach/osc
by mrpeach＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10527 http://pure-data.svn.sourceforge.net/pure-data/?rev=10527&view=rev Author: mrpeach Date: 2009-01-13 14:03:33 +0000 (Tue, 13 Jan 2009) Log Message: ----------- This is Roman Haefeli's tcpsocketserver for FUDI and OSC. Untested! Added Paths: ----------- trunk/externals/mrpeach/osc/tcpsocket.FUDI.pd trunk/externals/mrpeach/osc/tcpsocket.OSC.pd trunk/externals/mrpeach/osc/tcpsocketserver-help.pd trunk/externals/mrpeach/osc/tcpsocketserver.pd Added: trunk/externals/mrpeach/osc/tcpsocket.FUDI.pd =================================================================== --- trunk/externals/mrpeach/osc/tcpsocket.FUDI.pd (rev 0) +++ trunk/externals/mrpeach/osc/tcpsocket.FUDI.pd 2009-01-13 14:03:33 UTC (rev 10527) @@ -0,0 +1,132 @@ +#N canvas 585 75 446 533 10; +#X obj 50 49 == \$2; +#X obj 7 28 route in socket; +#X obj 7 76 spigot; +#N canvas 622 183 512 335 reset 0; +#X obj 23 41 route \$2; +#X obj 23 63 route reset; +#X obj 23 83 t b b; +#X msg 55 170 done; +#X obj 23 113 outlet; +#X text 161 33 this is used to:; +#X text 87 114 a) reset the sockethandler on a new connection; +#X text 88 129 (for instance \, if the previous connection was quitted +in the middle of a packet).; +#X text 55 213 b) check for the socketserver \, if a sockethandler +on specified socket already exists.; +#X obj 55 191 s \$1.TCPSOCKET; +#X obj 23 19 r \$1.TCPSOCKET; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 2 0 4 0; +#X connect 2 1 3 0; +#X connect 3 0 9 0; +#X connect 10 0 0 0; +#X restore 46 102 pd reset; +#X obj 105 279 route socket ip; +#X obj 41 367 list append; +#X obj 58 323 list append; +#X obj 7 299 t a b b b; +#X obj 7 414 list prepend out; +#X obj 41 391 list prepend socket.out; +#X obj 58 345 list prepend ip.out; +#X obj 7 442 list trim; +#X text 16 220 the lower part makes [tcpsocketserver] behave like [tcpserver] +; +#X obj -2 136 cnv 15 450 70 empty empty empty 20 12 0 14 -204786 -66577 +0; +#N canvas 385 67 454 323 FUDI 0; +#X obj 23 6 inlet; +#X obj 23 284 outlet; +#N canvas 389 242 220 273 serialize 0; +#X obj 5 72 t a a; +#X obj 37 94 list prepend 0; +#X obj 37 115 s \$0.inbuffer; +#X obj 5 135 list length; +#X obj 5 179 until; +#X obj 5 156 t a b; +#X obj 5 202 f; +#X obj 50 205 + 1; +#X msg 49 179 0; +#X obj 5 228 tabread \$0.inbuffer; +#X obj 5 50 inlet; +#X obj 5 250 outlet; +#X obj 5 12 table \$0.inbuffer 1024; +#X connect 0 0 3 0; +#X connect 0 1 1 0; +#X connect 1 0 2 0; +#X connect 3 0 5 0; +#X connect 4 0 6 0; +#X connect 5 0 4 0; +#X connect 5 1 8 0; +#X connect 6 0 7 0; +#X connect 6 0 9 0; +#X connect 7 0 6 1; +#X connect 8 0 6 1; +#X connect 9 0 11 0; +#X connect 10 0 0 0; +#X restore 23 30 pd serialize; +#X obj 23 109 t a a; +#X obj 97 181 list prepend; +#X obj 195 180 t a; +#X obj 23 211 list append; +#X obj 23 234 t a b; +#X obj 160 56 inlet; +#X text 210 56 reset; +#X obj 23 53 sel 10 13; +#X msg 23 76 32; +#X obj 23 133 sel 59; +#X text 83 134 asci: semicolon is used as a delimiter; +#X obj 160 152 b; +#X obj 23 257 list append 10; +#X connect 0 0 2 0; +#X connect 2 0 10 0; +#X connect 3 0 12 0; +#X connect 3 1 4 0; +#X connect 4 0 5 0; +#X connect 4 0 6 1; +#X connect 5 0 4 1; +#X connect 6 0 7 0; +#X connect 7 0 15 0; +#X connect 7 1 6 1; +#X connect 7 1 4 1; +#X connect 8 0 14 0; +#X connect 10 0 11 0; +#X connect 10 1 11 0; +#X connect 10 2 3 0; +#X connect 11 0 3 0; +#X connect 12 0 6 0; +#X connect 14 0 4 1; +#X connect 14 0 6 1; +#X connect 15 0 1 0; +#X restore 7 161 pd FUDI; +#X text 70 162 <- PUT HERE THE PROTOCOL SPECIFIC DELIMITER CODE; +#X text 15 197 -------------------------------------------------------- +; +#X text 12 129 -------------------------------------------------------- +; +#X obj 7 6 r \$1.TCPSOCKET; +#X obj 7 465 s \$1.TCPSOCKET; +#X obj 105 255 r \$1.TCPSOCKET; +#X text 200 454 Author: Roman Haefeli; +#X text 201 474 Version: 2009-01-11; +#X text 50 74 <- only pass stream of own socket; +#X connect 0 0 2 1; +#X connect 1 0 2 0; +#X connect 1 1 0 0; +#X connect 2 0 14 0; +#X connect 3 0 14 1; +#X connect 4 0 5 1; +#X connect 4 1 6 1; +#X connect 5 0 9 0; +#X connect 6 0 10 0; +#X connect 7 0 8 0; +#X connect 7 2 5 0; +#X connect 7 3 6 0; +#X connect 8 0 11 0; +#X connect 9 0 11 0; +#X connect 10 0 11 0; +#X connect 11 0 19 0; +#X connect 14 0 7 0; +#X connect 18 0 1 0; +#X connect 20 0 4 0; Added: trunk/externals/mrpeach/osc/tcpsocket.OSC.pd =================================================================== --- trunk/externals/mrpeach/osc/tcpsocket.OSC.pd (rev 0) +++ trunk/externals/mrpeach/osc/tcpsocket.OSC.pd 2009-01-13 14:03:33 UTC (rev 10527) @@ -0,0 +1,225 @@ +#N canvas 585 75 446 533 10; +#X obj 50 49 == \$2; +#X obj 7 28 route in socket; +#X obj 7 76 spigot; +#N canvas 622 183 512 335 reset 0; +#X obj 23 41 route \$2; +#X obj 23 63 route reset; +#X obj 23 83 t b b; +#X msg 55 170 done; +#X obj 23 113 outlet; +#X text 161 33 this is used to:; +#X text 87 114 a) reset the sockethandler on a new connection; +#X text 88 129 (for instance \, if the previous connection was quitted +in the middle of a packet).; +#X text 55 213 b) check for the socketserver \, if a sockethandler +on specified socket already exists.; +#X obj 55 191 s \$1.TCPSOCKET; +#X obj 23 19 r \$1.TCPSOCKET; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 2 0 4 0; +#X connect 2 1 3 0; +#X connect 3 0 9 0; +#X connect 10 0 0 0; +#X restore 40 102 pd reset; +#X obj 104 280 route socket ip; +#X obj 41 367 list append; +#X obj 58 323 list append; +#X obj 7 299 t a b b b; +#X obj 7 414 list prepend out; +#X obj 41 391 list prepend socket.out; +#X obj 58 345 list prepend ip.out; +#X obj 7 442 list trim; +#X text 16 220 the lower part makes [tcpsocketserver] behave like [tcpserver] +; +#X obj -2 136 cnv 15 450 70 empty empty empty 20 12 0 14 -204786 -66577 +0; +#X text 70 162 <- PUT HERE THE PROTOCOL SPECIFIC DELIMITER CODE; +#X text 15 197 -------------------------------------------------------- +; +#X text 13 129 -------------------------------------------------------- +; +#X obj 7 6 r \$1.TCPSOCKET; +#X obj 7 465 s \$1.TCPSOCKET; +#X obj 104 256 r \$1.TCPSOCKET; +#X text 200 454 Author: Roman Haefeli; +#X text 201 474 Version: 2009-01-11; +#X text 55 75 <- only pass stream of own socket; +#N canvas 395 78 268 176 OSC 0; +#X obj 27 18 inlet; +#X obj 27 156 outlet; +#X obj 144 23 inlet; +#X text 194 23 reset; +#N canvas 628 406 424 313 drip 0; +#X obj 12 15 inlet; +#X obj 12 226 outlet; +#X obj 107 16 table \$0.buffer 65536; +#X obj 76 82 s \$0.buffer; +#X obj 76 61 list prepend 0; +#X obj 12 37 t a a; +#X text 9 265 this 'drip' approach might use more memory \, but hopefully +less cpu cycles.; +#X obj 12 102 list length; +#X obj 12 150 until; +#X obj 12 126 t a b; +#X obj 12 173 f; +#X obj 60 176 + 1; +#X msg 61 150 0; +#X obj 12 202 tabread \$0.buffer; +#X connect 0 0 5 0; +#X connect 4 0 3 0; +#X connect 5 0 7 0; +#X connect 5 1 4 0; +#X connect 7 0 9 0; +#X connect 8 0 10 0; +#X connect 9 0 8 0; +#X connect 9 1 12 0; +#X connect 10 0 11 0; +#X connect 10 0 13 0; +#X connect 11 0 10 1; +#X connect 12 0 10 1; +#X connect 13 0 1 0; +#X restore 27 49 pd drip; +#N canvas 820 354 408 355 parse_frameheader 0; +#X obj 14 10 inlet; +#X obj 14 304 outlet; +#X obj 322 178 outlet; +#X obj 134 228 list prepend; +#X obj 230 228 t a; +#X obj 14 43 list prepend 0; +#X obj 14 123 f; +#X obj 14 144 + 1; +#X obj 14 166 sel 4; +#X obj 14 99 t b a; +#X obj 14 69 route 0 1; +#X text 97 64 0 = frame header; +#X text 97 80 1 = frame content; +#X obj 14 187 t b b; +#X obj 109 22 r \$0.route; +#X obj 46 230 s \$0.route; +#X msg 46 208 1; +#X obj 14 261 list append; +#X obj 243 18 inlet; +#X obj 243 44 b; +#X msg 272 45 0; +#X obj 272 65 s \$0.route; +#N canvas 504 266 169 262 MSB_2SB_3SB_LSB->float 0; +#X obj 7 10 inlet; +#X obj 7 214 outlet; +#X obj 7 33 unpack f f f f; +#X obj 70 74 << 8; +#X obj 38 118 << 16; +#X obj 7 165 << 24; +#X obj 70 98 +; +#X obj 38 139 +; +#X obj 7 190 +; +#X connect 0 0 2 0; +#X connect 2 0 5 0; +#X connect 2 1 4 0; +#X connect 2 2 3 0; +#X connect 2 3 6 1; +#X connect 3 0 6 0; +#X connect 4 0 7 0; +#X connect 5 0 8 0; +#X connect 6 0 7 1; +#X connect 7 0 8 1; +#X connect 8 0 1 0; +#X restore 14 282 pd MSB_2SB_3SB_LSB->float; +#X text 288 19 new packet; +#X text 23 327 frame length; +#X text 322 201 data stream; +#X connect 0 0 5 0; +#X connect 3 0 4 0; +#X connect 3 0 17 1; +#X connect 4 0 3 1; +#X connect 5 0 10 0; +#X connect 6 0 7 0; +#X connect 7 0 6 1; +#X connect 7 0 8 0; +#X connect 8 0 13 0; +#X connect 9 0 6 0; +#X connect 9 1 3 0; +#X connect 10 0 9 0; +#X connect 10 1 2 0; +#X connect 13 0 17 0; +#X connect 13 1 16 0; +#X connect 14 0 5 1; +#X connect 16 0 15 0; +#X connect 17 0 22 0; +#X connect 18 0 19 0; +#X connect 18 0 20 0; +#X connect 19 0 3 1; +#X connect 20 0 21 0; +#X connect 20 0 6 1; +#X connect 22 0 1 0; +#X restore 27 77 pd parse_frameheader; +#N canvas 748 498 450 300 form_packet 0; +#X obj 68 23 inlet; +#X text 106 24 length; +#X obj 194 22 inlet; +#X text 244 23 stream; +#X obj 120 190 list prepend; +#X obj 216 190 t a; +#X obj 14 123 f; +#X obj 14 144 + 1; +#X obj 14 99 t b a; +#X obj 14 187 t b b; +#X obj 46 213 list append; +#X obj 14 166 sel 0; +#X obj 46 253 outlet; +#X text 100 254 OSC packet; +#X text 261 262 EOP; +#X obj 210 261 outlet; +#X obj 68 88 t b a; +#X msg 68 111 0; +#X connect 0 0 16 0; +#X connect 2 0 8 0; +#X connect 4 0 5 0; +#X connect 4 0 10 1; +#X connect 5 0 4 1; +#X connect 6 0 7 0; +#X connect 7 0 6 1; +#X connect 7 0 11 0; +#X connect 8 0 6 0; +#X connect 8 1 4 0; +#X connect 9 0 15 0; +#X connect 9 1 10 0; +#X connect 10 0 12 0; +#X connect 11 0 9 0; +#X connect 16 0 17 0; +#X connect 16 0 4 1; +#X connect 16 1 11 1; +#X connect 17 0 6 1; +#X restore 27 129 pd form_packet; +#X obj 169 85 b; +#X obj 144 50 b; +#X connect 0 0 4 0; +#X connect 2 0 8 0; +#X connect 4 0 5 0; +#X connect 5 0 6 0; +#X connect 5 1 6 1; +#X connect 6 0 1 0; +#X connect 6 1 7 0; +#X connect 7 0 5 1; +#X connect 8 0 5 1; +#X restore 7 161 pd OSC; +#X connect 0 0 2 1; +#X connect 1 0 2 0; +#X connect 1 1 0 0; +#X connect 2 0 23 0; +#X connect 3 0 23 1; +#X connect 4 0 5 1; +#X connect 4 1 6 1; +#X connect 5 0 9 0; +#X connect 6 0 10 0; +#X connect 7 0 8 0; +#X connect 7 2 5 0; +#X connect 7 3 6 0; +#X connect 8 0 11 0; +#X connect 9 0 11 0; +#X connect 10 0 11 0; +#X connect 11 0 18 0; +#X connect 17 0 1 0; +#X connect 19 0 4 0; +#X connect 23 0 7 0; Added: trunk/externals/mrpeach/osc/tcpsocketserver-help.pd =================================================================== --- trunk/externals/mrpeach/osc/tcpsocketserver-help.pd (rev 0) +++ trunk/externals/mrpeach/osc/tcpsocketserver-help.pd 2009-01-13 14:03:33 UTC (rev 10527) @@ -0,0 +1,301 @@ +#N canvas 35 3 878 523 10; +#X declare -stdpath extra/mrpeach; +#X declare -stdlib extra/pdstring declare -stdlib extra/maxlib; +#X declare -stdpath extra/mrpeach; +#X declare -stdlib extra/pdstring declare -stdlib extra/maxlib; +#X declare -stdpath extra/mrpeach; +#X msg 471 74 print; +#X text 521 75 list of connections; +#X text 627 103 send to all clients; +#X text 629 132 send to client 1; +#X text 615 155 send to client on socket 504; +#X text 613 28 'send' prefix is optional; +#X text 474 48 (the first number is socket number); +#X msg 556 257 disconnectsocket \$1; +#X msg 484 284 disconnectclient \$1; +#X floatatom 506 215 5 0 0 0 - - -; +#X obj 484 235 f; +#X obj 484 216 bng 15 250 50 0 empty empty empty 17 7 0 10 -258699 +-241291 -1; +#X floatatom 578 216 5 0 0 0 - - -; +#X obj 556 235 f; +#X obj 556 216 bng 15 250 50 0 empty empty empty 17 7 0 10 -258699 +-241291 -1; +#X text 483 197 disconnect by socket or client number; +#X obj 618 335 unpack 0 0 0 0; +#X floatatom 618 355 3 0 0 0 - - -; +#X floatatom 649 355 3 0 0 0 - - -; +#X floatatom 681 356 3 0 0 0 - - -; +#X floatatom 715 356 3 0 0 0 - - -; +#X text 616 372 IP; +#X floatatom 569 355 5 0 0 0 - - -; +#X text 566 371 socket; +#X floatatom 520 376 5 0 0 0 - - -; +#X text 520 391 number of connections; +#X obj 471 433 spigot; +#X obj 510 413 tgl 15 0 empty empty enable_print 17 7 0 10 -24198 -258699 +-258699 0 1; +#X text 15 37 [tcpsocketserver <protocol> <port>]; +#X obj 469 311 cnv 15 185 22 empty empty empty 20 12 0 14 -204786 -66577 +0; +#X obj 471 314 tcpsocketserver FUDI 2468; +#X text 15 115 [tcpsocketserver] is able to handle multiple sockets +of a packet oriented protocol correctly \, unlike [tcpserver] \, which +might mix up packets from different sockets.; +#X text 24 308 - OSC; +#X text 16 245 each protocol requires its own specific socket handler +abstraction \, which should be named [tcpsocket.PROTOCOL]. currently +available are the protocols:; +#X text 23 293 - FUDI; +#N canvas 704 167 472 356 EXTENDABILITY 0; +#X text 3 39 Support for more protocols can easily be added. In order +to do so:; +#X text 5 10 EXTENDABILITY; +#X text 6 105 - open tcpsocket.NEWPROTOCOL.pd; +#X text 7 127 - edit the green-marked subpatch; +#X text 10 208 - save it; +#X text 12 227 - in order to use it \, instantiate:; +#X text 46 247 [tcpsocketserver NEWPROTOCOL <port>]; +#X text 8 148 - replace code with code \, that creates proper packets +out of the incoming stream for the desired protocol. don't forget to +implement a reset mechanism \, in case a socket is closed in the middle +of packet transmission.; +#X text 5 83 - copy tcpsocket.FUDI.pd to tcpsocket.NEWPROTOCOL.pd; +#X restore 21 387 pd EXTENDABILITY; +#X text 17 453 Author: Roman Haefeli; +#X text 16 468 Version: 2009-01-11; +#X text 15 65 [tcpsocketserver] is meant to be a protocol-aware drop-in +replacement for [tcpserver]. it uses same the same inlet and outlet +configuration as [tcpserver].; +#X text 469 478 only well-formed FUDI messages are received here.; +#N canvas 469 232 147 274 EXAMPLES 0; +#N canvas 231 0 579 756 FUDI 0; +#X obj 9 39 cnv 15 550 240 empty empty client_1 20 12 0 14 -249661 +-66577 0; +#X obj 25 193 tcpclient; +#X msg 369 94 connect localhost 11001; +#X msg 393 115 disconnect; +#X obj 369 72 sel 1 0; +#X obj 369 51 tgl 15 0 empty empty empty 17 7 0 10 -261234 -1 -1 0 +1; +#X obj 25 259 print CLIENT_1; +#X msg 25 70 one two; +#X obj 25 91 any2string 0 -1; +#X msg 69 151 59 10; +#X msg 33 117 32 116 104 114 101 101 23; +#X obj 9 286 cnv 15 550 150 empty empty client_2 20 12 0 14 -249661 +-66577 0; +#X msg 369 341 connect localhost 11001; +#X msg 393 362 disconnect; +#X obj 369 319 sel 1 0; +#X obj 369 298 tgl 15 0 empty empty empty 17 7 0 10 -261234 -1 -1 0 +1; +#X obj 25 214 string2any 0 59; +#X obj 25 234 route bang; +#X obj 25 373 netclient; +#X obj 8 9 declare -stdlib extra/pdstring declare -stdlib extra/maxlib +; +#X obj 25 402 print CLIENT_2; +#X text 169 324 <- send FUDI message; +#X obj 10 444 cnv 15 550 300 empty empty FUDI_server 20 12 0 14 -241408 +-66577 0; +#X obj 12 600 tcpsocketserver FUDI 11001; +#X obj 12 674 string2any 0 59; +#X obj 12 695 route bang; +#X obj 191 620 unpack 0 0 0 0; +#X floatatom 191 640 3 0 0 0 - - -; +#X floatatom 222 640 3 0 0 0 - - -; +#X floatatom 254 641 3 0 0 0 - - -; +#X floatatom 288 641 3 0 0 0 - - -; +#X text 189 657 IP; +#X floatatom 131 640 5 0 0 0 - - -; +#X floatatom 71 641 5 0 0 0 - - -; +#X text 60 656 clients; +#X text 127 656 socket; +#X text 132 675 <--; +#X text 165 675 [tcpsocketserver FUDI] does _not_ remove the trailing +' \; '; +#X text 165 70 1) start a FUDI message; +#X text 232 118 2) continue; +#X text 118 152 3) finish FUDI message (with semicolon - newline); +#X text 391 52 connect; +#X text 390 296 connect; +#X text 20 475 [tcpsocketserver FUDI] doesn't take care of building +FUDI-compliant messages. this should be done by the user.; +#X text 154 216 4) try sending a message from client_2 during composing +a message with client_1 and see \, how the server behaves.; +#X text 279 522 <- this doesn't work; +#X text 315 549 <- this should; +#X msg 25 323 send four five six; +#X msg 43 550 client 2 115 101 118 101 110 32 59 10; +#X msg 42 521 client 2 115 101 118 101 110 32; +#X obj 12 720 print SERVER; +#X connect 1 0 16 0; +#X connect 2 0 1 0; +#X connect 3 0 1 0; +#X connect 4 0 2 0; +#X connect 4 1 3 0; +#X connect 5 0 4 0; +#X connect 7 0 8 0; +#X connect 8 0 1 0; +#X connect 9 0 1 0; +#X connect 10 0 1 0; +#X connect 12 0 18 0; +#X connect 13 0 18 0; +#X connect 14 0 12 0; +#X connect 14 1 13 0; +#X connect 15 0 14 0; +#X connect 16 0 17 0; +#X connect 17 1 6 0; +#X connect 18 0 20 0; +#X connect 23 0 24 0; +#X connect 23 1 33 0; +#X connect 23 2 32 0; +#X connect 23 3 26 0; +#X connect 24 0 25 0; +#X connect 25 1 50 0; +#X connect 26 0 27 0; +#X connect 26 1 28 0; +#X connect 26 2 29 0; +#X connect 26 3 30 0; +#X connect 47 0 18 0; +#X connect 48 0 23 0; +#X connect 49 0 23 0; +#X restore 23 25 pd FUDI; +#N canvas 231 0 579 756 OSC 0; +#X obj 9 39 cnv 15 550 240 empty empty client_1 20 12 0 14 -249661 +-66577 0; +#X obj 25 211 tcpclient; +#X msg 357 229 disconnect; +#X obj 333 186 sel 1 0; +#X obj 333 165 tgl 15 0 empty empty empty 17 7 0 10 -261234 -1 -1 0 +1; +#X obj 25 259 print CLIENT_1; +#X obj 9 286 cnv 15 550 150 empty empty client_2 20 12 0 14 -249661 +-66577 0; +#X msg 393 362 disconnect; +#X obj 369 319 sel 1 0; +#X obj 369 298 tgl 15 0 empty empty empty 17 7 0 10 -261234 -1 -1 0 +1; +#X obj 8 9 declare -stdlib extra/pdstring declare -stdlib extra/maxlib +; +#X obj 25 417 print CLIENT_2; +#X obj 10 444 cnv 15 550 300 empty empty OSC_server 20 12 0 14 -241408 +-66577 0; +#X obj 188 636 unpack 0 0 0 0; +#X floatatom 188 656 3 0 0 0 - - -; +#X floatatom 219 656 3 0 0 0 - - -; +#X floatatom 251 657 3 0 0 0 - - -; +#X floatatom 285 657 3 0 0 0 - - -; +#X text 186 673 IP; +#X floatatom 130 656 5 0 0 0 - - -; +#X floatatom 73 657 5 0 0 0 - - -; +#X text 62 672 clients; +#X text 126 672 socket; +#X text 355 166 connect; +#X text 390 296 connect; +#X obj 16 616 tcpsocketserver OSC 11002; +#X obj 16 694 unpackOSC; +#X obj 16 720 print SERVER; +#X msg 333 208 connect localhost 11002; +#X msg 369 341 connect localhost 11002; +#X obj 25 234 unpackOSCstream; +#X obj 25 373 tcpclient; +#X obj 25 395 unpackOSCstream; +#X msg 49 498 /synth1/tone3/freq 440; +#X msg 25 79 0 0 0 16 47 102 114 101 113; +#X msg 41 104 0 0 0 44 105 0 0 0 0 1 184; +#X text 155 324 send OSC message; +#X msg 25 323 /amplitude 0.78; +#X obj 25 347 packOSCstream; +#X obj 16 522 packOSCstream; +#X obj 16 594 list trim; +#X msg 16 473 /synth3/tone4/amplitude 0.36; +#X obj 180 555 hradio 15 1 0 2 empty empty empty 0 -8 0 10 -4034 -1 +-1 0; +#X obj 180 573 + 1; +#X text 221 555 client; +#X obj 16 551 list prepend 1; +#X obj 16 573 list prepend client; +#X text 236 80 1) start sending an OSC packet; +#X text 247 106 2) complete the OSC packet; +#X text 59 137 also try sending an OSC packet from client_2 between +1) and 2); +#X text 124 520 <- use [packOSCstream] in order to create OSC packets +suitable for tcp transport.; +#X text 238 486 send to clients; +#X text 93 695 <---; +#X text 139 694 CAUTION: not [unpackOSCstream] is used here \, since +[tcpsocket.OSC] already removes the 4-byte header.; +#X connect 1 0 30 0; +#X connect 2 0 1 0; +#X connect 3 0 28 0; +#X connect 3 1 2 0; +#X connect 4 0 3 0; +#X connect 7 0 31 0; +#X connect 8 0 29 0; +#X connect 8 1 7 0; +#X connect 9 0 8 0; +#X connect 13 0 14 0; +#X connect 13 1 15 0; +#X connect 13 2 16 0; +#X connect 13 3 17 0; +#X connect 25 0 26 0; +#X connect 25 1 20 0; +#X connect 25 2 19 0; +#X connect 25 3 13 0; +#X connect 26 0 27 0; +#X connect 28 0 1 0; +#X connect 29 0 31 0; +#X connect 30 0 5 0; +#X connect 31 0 32 0; +#X connect 32 0 11 0; +#X connect 33 0 39 0; +#X connect 34 0 1 0; +#X connect 35 0 1 0; +#X connect 37 0 38 0; +#X connect 38 0 31 0; +#X connect 39 0 45 0; +#X connect 40 0 25 0; +#X connect 41 0 39 0; +#X connect 42 0 43 0; +#X connect 43 0 45 1; +#X connect 45 0 46 0; +#X connect 46 0 40 0; +#X restore 23 49 pd OSC; +#X restore 21 365 pd EXAMPLES; +#X obj 471 455 print FUDI; +#X msg 471 101 broadcast 97 98 99 59 10; +#X msg 471 128 client 1 97 98 99 59 10; +#X msg 471 155 send 504 97 98 99 59 10; +#X msg 471 28 10 97 98 99 59 10; +#X text 17 8 TCPSOCKETSERVER - a protocol-aware wrapper aroun [tcpserver] +; +#X text 13 167 [tcpsocketserver] dynamically creates (internally) an +instance of a socket handler abstraction [tcpsocket.PROTOCOL] for each +opened socket. every socket handler creates proper packets from the +incoming stream and sends them to the left outlet of [tcpsocketserver]. +; +#X connect 0 0 30 0; +#X connect 7 0 30 0; +#X connect 8 0 30 0; +#X connect 9 0 10 1; +#X connect 10 0 8 0; +#X connect 11 0 10 0; +#X connect 12 0 13 1; +#X connect 13 0 7 0; +#X connect 14 0 13 0; +#X connect 16 0 17 0; +#X connect 16 1 18 0; +#X connect 16 2 19 0; +#X connect 16 3 20 0; +#X connect 26 0 41 0; +#X connect 27 0 26 1; +#X connect 30 0 26 0; +#X connect 30 1 24 0; +#X connect 30 2 22 0; +#X connect 30 3 16 0; +#X connect 42 0 30 0; +#X connect 43 0 30 0; +#X connect 44 0 30 0; +#X connect 45 0 30 0; Added: trunk/externals/mrpeach/osc/tcpsocketserver.pd =================================================================== --- trunk/externals/mrpeach/osc/tcpsocketserver.pd (rev 0) +++ trunk/externals/mrpeach/osc/tcpsocketserver.pd 2009-01-13 14:03:33 UTC (rev 10527) @@ -0,0 +1,106 @@ +#N canvas 332 12 333 552 10; +#X declare -stdpath extra/mrpeach; +#X obj 13 39 inlet; +#X obj 13 464 outlet; +#X obj 75 463 outlet; +#X obj 137 463 outlet; +#X obj 199 462 outlet; +#X obj 36 187 list trim; +#X obj 59 145 list trim; +#X obj 59 124 list prepend socket; +#X obj 36 166 list prepend num_of_clients; +#X obj 82 103 list trim; +#X obj 82 82 list prepend ip; +#N canvas 816 227 247 348 \$0.TCPSOCKETCONTAINER 0; +#X restore 14 372 pd \$0.TCPSOCKETCONTAINER; +#N canvas 491 218 502 504 socketmanager 0; +#X msg 24 196 \$1 reset; +#X obj 25 259 route done; +#X obj 5 175 t a a b; +#X msg 25 280 0; +#X msg 44 280 1; +#X obj 5 303 spigot; +#X obj 44 344 f; +#X obj 76 344 + 20; +#X obj 5 323 t a b b; +#X obj 24 365 list append \$1; +#X obj 24 388 list append; +#X obj 5 412 list append; +#X obj 5 476 s pd-\$0.TCPSOCKETCONTAINER; +#X obj 5 432 list append \$0; +#X obj 5 24 route socket num_of_clients; +#X obj 84 46 t a a; +#X obj 69 73 -; +#X obj 69 94 == 1; +#X obj 5 122 spigot; +#X obj 5 3 r \$0.TCPSOCKET; +#X obj 24 217 s \$0.TCPSOCKET; +#X obj 25 238 r \$0.TCPSOCKET; +#X msg 5 454 obj 10 \$3 tcpsocket.\$2 \$4 \$1 \, loadbang; +#X obj 5 148 t a b; +#X msg 65 132 0; +#X text 116 78 when a new client connects (num_of_clients: +1); +#X text 119 197 send a 'reset' to the according socket handler; +#X text 114 266 and if it doesn't respond (which means \, there is +no socket handler on specified socket) \,; +#X text 119 368 create one (into pd-\$0.TCPSOCKETCONTAINER).; +#X connect 0 0 20 0; +#X connect 1 0 3 0; +#X connect 2 0 5 0; +#X connect 2 1 0 0; +#X connect 2 2 4 0; +#X connect 3 0 5 1; +#X connect 4 0 5 1; +#X connect 5 0 8 0; +#X connect 6 0 7 0; +#X connect 6 0 10 1; +#X connect 7 0 6 1; +#X connect 8 0 11 0; +#X connect 8 1 9 0; +#X connect 8 2 6 0; +#X connect 9 0 10 0; +#X connect 10 0 11 1; +#X connect 11 0 13 0; +#X connect 13 0 22 0; +#X connect 14 0 18 0; +#X connect 14 1 15 0; +#X connect 15 0 16 1; +#X connect 15 1 16 0; +#X connect 16 0 17 0; +#X connect 17 0 18 1; +#X connect 18 0 23 0; +#X connect 19 0 14 0; +#X connect 21 0 1 0; +#X connect 22 0 12 0; +#X connect 23 0 2 0; +#X connect 23 1 24 0; +#X connect 24 0 18 1; +#X restore 14 349 pd socketmanager; +#X obj 13 60 tcpserver \$2; +#X obj 13 417 r \$0.TCPSOCKET; +#X obj 13 208 list prepend in; +#X obj 13 440 route out num_of_clients socket.out ip.out; +#X obj 13 230 list trim; +#X obj 82 316 s \$0.TCPSOCKET; +#X text 23 501 Author: Roman Haefeli; +#X text 24 518 Version: 2009-01-11; +#X text 94 292 [tcpsocketserver <protocol> <port>]; +#X obj 13 14 declare -stdpath extra/mrpeach; +#X connect 0 0 13 0; +#X connect 5 0 18 0; +#X connect 6 0 18 0; +#X connect 7 0 6 0; +#X connect 8 0 5 0; +#X connect 9 0 18 0; +#X connect 10 0 9 0; +#X connect 13 0 15 0; +#X connect 13 1 8 0; +#X connect 13 2 7 0; +#X connect 13 3 10 0; +#X connect 14 0 16 0; +#X connect 15 0 17 0; +#X connect 16 0 1 0; +#X connect 16 1 2 0; +#X connect 16 2 3 0; +#X connect 16 3 4 0; +#X connect 17 0 18 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: pd-extended ubuntu-hardy-i386 2009-01-13 07.39.22
by pd＠ubuntu-dapper-i386.idmi.poly.edu 13 Jan '09

13 Jan '09

/home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:75: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:105: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:107: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:111: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:116: error: ‘MTXSh’ has no member named ‘ws’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:117: error: ‘MTXSh’ has no member named ‘ws’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:117: error: too many arguments to function ‘sharmonics’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:119: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:120: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:120: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:122: error: ‘MTXSh’ has no member named ‘ws’ ERROR: module is write only rsync error: syntax or usage error (code 1) at main.c(641) [sender=2.6.9] rsync error: error in rsync protocol data stream (code 12) at io.c(454) [receiver=2.6.9] the full logfile - if it has been succesfully uploaded - can be viewed at: http://autobuild.puredata.info/auto-build/2009-01-13/logs/2009-01-13_07.39.…

1 0

autobuild: pd-extended debian-stable-powerpc 2009-01-13 06.28.06
by pd＠debian-stable-powerpc.idmi.poly.edu 13 Jan '09

13 Jan '09

/home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:75: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:105: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:107: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:111: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:116: error: ‘MTXSh’ has no member named ‘ws’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:117: error: ‘MTXSh’ has no member named ‘ws’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:117: error: too many arguments to function ‘sharmonics’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:119: error: ‘MTXSh’ has no member named ‘l’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:120: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:120: error: ‘MTXSh’ has no member named ‘nmax’ /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:122: error: ‘MTXSh’ has no member named ‘ws’ ERROR: module is write only rsync error: syntax or usage error (code 1) at main.c(641) [sender=2.6.9] rsync error: error in rsync protocol data stream (code 12) at io.c(453) [receiver=2.6.9] the full logfile - if it has been succesfully uploaded - can be viewed at: http://autobuild.puredata.info/auto-build/2009-01-13/logs/2009-01-13_06.28.…

1 0

autobuild: pd-extended planetccrma9-i386 2009-01-13 04.08.16
by pd＠planetccrma9-i386.idmi.poly.edu 13 Jan '09

13 Jan '09

/home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:69: error: 'MTXSh' has no member named 'ws' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:70: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:75: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:105: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:107: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:111: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:116: error: 'MTXSh' has no member named 'ws' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:117: error: 'MTXSh' has no member named 'ws' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:117: error: too many arguments to function 'sharmonics' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:119: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:120: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:120: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:122: error: 'MTXSh' has no member named 'ws' rsync error: syntax or usage error (code 1) at main.c(1216) [receiver=3.0.4] the full logfile - if it has been succesfully uploaded - can be viewed at: http://autobuild.puredata.info/auto-build/2009-01-13/logs/2009-01-13_04.08.…

1 0

autobuild: pd-extended debian-stable-i386 2009-01-13 01.50.46
by pd＠debian-stable-i386.idmi.poly.edu 13 Jan '09

13 Jan '09

/home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:75: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:83: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:105: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:107: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:111: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:116: error: 'MTXSh' has no member named 'ws' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:117: error: 'MTXSh' has no member named 'ws' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:117: error: too many arguments to function 'sharmonics' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:118: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:119: error: 'MTXSh' has no member named 'l' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:120: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:120: error: 'MTXSh' has no member named 'nmax' /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_sh.c:122: error: 'MTXSh' has no member named 'ws' ERROR: module is write only rsync error: syntax or usage error (code 1) at main.c(641) [sender=2.6.9] rsync error: error in rsync protocol data stream (code 12) at io.c(453) [receiver=2.6.9] the full logfile - if it has been succesfully uploaded - can be viewed at: http://autobuild.puredata.info/auto-build/2009-01-13/logs/2009-01-13_01.50.…

1 0

SF.net SVN: pure-data:[10526] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10526 http://pure-data.svn.sourceforge.net/pure-data/?rev=10526&view=rev Author: eighthave Date: 2009-01-13 06:46:55 +0000 (Tue, 13 Jan 2009) Log Message: ----------- - renamed 'pd' command to 'pdsend' and worked towards moving it closely to pd message syntax. - replaced menu_* procs that just sent a message to pd with 'pdsend' - removed redundant menu_* procs - trapped 'exit' event on Mac OS X/Aqua and included 'apple_events' package in AppMain.tcl so that it gets loaded with running Wish/Aqua - set the minimum window size on win32 and x11 so that the menubar doesn't get hidden -This line, and those below, will be ignored-- M src/pd_menucommands.tcl M src/pd_bindings.tcl M src/apple_events.tcl M src/AppMain.tcl M src/pdtk_canvas.tcl M src/wheredoesthisgo.tcl M src/pkgIndex.tcl M src/pd_menus.tcl M src/pd_connect.tcl M src/pd.tk M src/pd_iemgui.tcl Modified Paths: -------------- branches/pd-devel/0.41.4/src/AppMain.tcl branches/pd-devel/0.41.4/src/apple_events.tcl branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_bindings.tcl branches/pd-devel/0.41.4/src/pd_connect.tcl branches/pd-devel/0.41.4/src/pd_iemgui.tcl branches/pd-devel/0.41.4/src/pd_menucommands.tcl branches/pd-devel/0.41.4/src/pd_menus.tcl branches/pd-devel/0.41.4/src/pdtk_canvas.tcl branches/pd-devel/0.41.4/src/pkgIndex.tcl branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl Modified: branches/pd-devel/0.41.4/src/AppMain.tcl =================================================================== --- branches/pd-devel/0.41.4/src/AppMain.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/AppMain.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -1,7 +1,11 @@ # this file is for the Wish.app on Mac OS X + +puts --------------------------AppMain.tcl----------------------------------- catch {console show} +package require apple_events + puts "AppMain.tcl" puts "argv0: $argv0" puts "executable: [info nameofexecutable]" Modified: branches/pd-devel/0.41.4/src/apple_events.tcl =================================================================== --- branches/pd-devel/0.41.4/src/apple_events.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/apple_events.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -4,7 +4,7 @@ # from http://wiki.tcl.tk/12987 # minimum line thickness to anti-alias (default: 3) -set tk::mac::CGAntialiasLimit 2 +set tk::mac::CGAntialiasLimit 0 # enable/disable anti-aliased text set ::tk::mac::antialiasedtext 1 @@ -26,9 +26,13 @@ } #kAEQuitApplication -#proc exit {} { -# this proc overrides the built-in exit -#} +proc exit {} { + puts stderr "Custom exit proc" + # this proc overrides the built-in exit so we can grab the Quit event + pdsend "pd verifyquit;" + ::exit + # TODO sort this out... +} proc spinCursor {widget count} { $widget configure -cursor spinning$count Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 06:46:55 UTC (rev 10526) @@ -5,6 +5,10 @@ # WARRANTIES, see the file, "LICENSE.txt," in this distribution. # Copyright (c) 1997-2009 Miller Puckette. +# TODO implement checking to see if another Pd is already running follwoing +# this code example: http://tcl.tk/man/tcl8.4/TkCmd/send.htm + + puts -------------------------------pd.tk----------------------------------- package require Tcl 8.3 @@ -29,7 +33,7 @@ # import into the global namespace for backwards compatibility namespace import ::pd_post::pdtk_post -namespace import ::pd_connect::pd +namespace import ::pd_connect::pdsend #------------------------------------------------------------------------------# @@ -49,6 +53,7 @@ + #------------------------------------------------------------------------------# # global variables @@ -128,7 +133,7 @@ pdtk_post "args: $args" set oldtclversion 0 set fontlist "8 5 8 9 6 10 10 7 11 12 7 12 14 8 14 16 10 16 18 11 18 24 14 24 30 18 30 36 22 36" - pd [concat pd init [pdtk_enquote [pwd]] $oldtclversion $fontlist \;]; + pdsend "pd init [pdtk_enquote [pwd]] $oldtclversion $fontlist ;" # TODO what else is needed from the original? } @@ -142,7 +147,7 @@ set answer [tk_messageBox -type yesno -icon question \ -default $default -message $message] if {$answer eq "yes"} { - pd $reply_to_pd + pdsend $reply_to_pd } } @@ -163,7 +168,11 @@ # TODO slide off screen windows into view wm geometry $name $geometry - wm minsize $name 50 20 + if {[tk windowingsystem] eq "aqua"} { + wm minsize $name 50 20 + } else { # leave room for the menubar + wm minsize $name 310 30 + } canvas $name.c -width $width -height $height -background white \ -highlightthickness 0 # TODO add scrollbars here @@ -191,6 +200,10 @@ post_tclinfo pdtk_post "Starting pd.tk with main($argc $argv)" init + # we are not using Tk scaling, so fix it to 1 on all platforms. This + # guarantees that patches will be pixel-exact on every platform + tk scaling 1 + # TODO check args for -stderr and set pdtk_post accordingly ::pd_menus::create_menubar .menubar Modified: branches/pd-devel/0.41.4/src/pd_bindings.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -26,15 +26,17 @@ bind $name <$modifier-Key-n> "menu_new" bind $name <$modifier-Key-o> "menu_open" bind $name <$modifier-Key-p> "menu_print $name" - bind $name <$modifier-Key-q> "menu_quit" + bind $name <$modifier-Key-q> "pdsend \"pd verifyquit ;\"" bind $name <$modifier-Key-r> "menu_raiseconsole" - bind $name <$modifier-Key-w> "menu_close $name" + bind $name <$modifier-Key-w> "pdsend \"$name menuclose 0 ;\"" bind $name <$modifier-Shift-Key-L> "menu_clear_console" + bind $name <$modifier-Shift-Key-Q> "pdsend \"pd quit ;\"" bind $name <$modifier-Shift-Key-R> "menu_toggle_console" + bind $name <$modifier-Shift-Key-W> "pdsend \"$name menuclose 1 ;\"" # DSP control - bind $name <$modifier-Key-slash> "menu_audio 1" - bind $name <$modifier-Key-period> "menu_audio 0" + bind $name <$modifier-Key-slash> "pdsend \"pd dsp 1 ;\"" + bind $name <$modifier-Key-period> "pdsend \"pd dsp 0 ;\"" } proc ::pd_bindings::pdwindow_bindings {name} { @@ -42,6 +44,7 @@ window_bindings $name + # TODO update this to work with the console, if it is used bind . <$modifier-Key-a> ".printout.text tag add sel 1.0 end" bind . <$modifier-Key-x> "tk_textCut .printout.text" bind . <$modifier-Key-c> "tk_textCopy .printout.text" @@ -49,7 +52,7 @@ bind . <$modifier-Key-w> {::pd_post::pdtk_post "Can't close Pd window, ignored.\n"} # Tcl event bindings - wm protocol . WM_DELETE_WINDOW "menu_quit" + wm protocol . WM_DELETE_WINDOW "pdsend \"pd verifyquit ;\"" # do window maintenance when entering the Pd window (Window menu, scrollbars, etc) #bind $name <FocusIn> {pdtk_pdwindowmaintenance} @@ -73,35 +76,35 @@ window_bindings $name # key bindings ------------------------------------------------------------- - bind $name <$modifier-Key-1> "menu_object $name 1" - bind $name <$modifier-Key-2> "menu_message $name 1" - bind $name <$modifier-Key-3> "menu_floatatom $name 1" - bind $name <$modifier-Key-4> "menu_symbolatom $name 1" - bind $name <$modifier-Key-5> "menu_comment $name 1" - bind $name <$modifier-Key-a> "menu_selectall $name" - bind $name <$modifier-Key-c> "menu_copy $name" - bind $name <$modifier-Key-d> "menu_duplicate $name" - bind $name <$modifier-Key-e> "menu_editmode $name" + bind $name <$modifier-Key-1> "pdsend \"$name obj ;\"" + bind $name <$modifier-Key-2> "pdsend \"$name msg ;\"" + bind $name <$modifier-Key-3> "pdsend \"$name floatatom ;\"" + bind $name <$modifier-Key-4> "pdsend \"$name symbolatom ;\"" + bind $name <$modifier-Key-5> "pdsend \"$name text ;\"" + bind $name <$modifier-Key-a> "pdsend \"$name selectall ;\"" + bind $name <$modifier-Key-c> "pdsend \"$name copy ;\"" + bind $name <$modifier-Key-d> "pdsend \"$name duplicate ;\"" + bind $name <$modifier-Key-e> "pdsend \"$name editmode 0 ;\"" bind $name <$modifier-Key-f> "menu_findobject $name" - bind $name <$modifier-Key-g> "menu_findagain $name" - bind $name <$modifier-Key-s> "menu_save $name" - bind $name <$modifier-Key-v> "menu_paste $name" - bind $name <$modifier-Key-x> "menu_cut $name" + bind $name <$modifier-Key-g> "pdsend \"$name findagain ;\"" + bind $name <$modifier-Key-s> "pdsend \"$name menusave ;\"" + bind $name <$modifier-Key-v> "pdsend \"$name paste ;\"" + bind $name <$modifier-Key-x> "pdsend \"$name cut ;\"" bind $name <$modifier-Key-z> "menu_undo $name" - bind $name <$modifier-Key-slash> "menu_audio 1" - bind $name <$modifier-Key-period> "menu_audio 0" + bind $name <$modifier-Key-slash> "pdsend \"pd dsp 1 ;\"" + bind $name <$modifier-Key-period> "pdsend \"pd dsp 0 ;\"" # annoying, but Tk's bind needs uppercase letter to get the Shift - bind $name <$modifier-Shift-Key-B> "menu_bang" - bind $name <$modifier-Shift-Key-C> "menu_canvas" - bind $name <$modifier-Shift-Key-D> "menu_vradio" - bind $name <$modifier-Shift-Key-H> "menu_hslider" - bind $name <$modifier-Shift-Key-I> "menu_hradio" - bind $name <$modifier-Shift-Key-N> "menu_number2" - bind $name <$modifier-Shift-Key-S> "menu_saveas $name" - bind $name <$modifier-Shift-Key-T> "menu_toggle" - bind $name <$modifier-Shift-Key-U> "menu_vumeter" - bind $name <$modifier-Shift-Key-V> "menu_vslider" + bind $name <$modifier-Shift-Key-B> "pdsend \"$name bng 1 ;\"" + bind $name <$modifier-Shift-Key-C> "pdsend \"$name mycnv 1 ;\"" + bind $name <$modifier-Shift-Key-D> "pdsend \"$name vradio 1 ;\"" + bind $name <$modifier-Shift-Key-H> "pdsend \"$name hslider 1 ;\"" + bind $name <$modifier-Shift-Key-I> "pdsend \"$name hradio 1 ;\"" + bind $name <$modifier-Shift-Key-N> "pdsend \"$name numbox 1 ;\"" + bind $name <$modifier-Shift-Key-S> "pdsend \"$name menusaveas ;\"" + bind $name <$modifier-Shift-Key-T> "pdsend \"$name toggle 1 ;\"" + bind $name <$modifier-Shift-Key-U> "pdsend \"$name vumeter 1 ;\"" + bind $name <$modifier-Shift-Key-V> "pdsend \"$name vslider 1 ;\"" bind $name <$modifier-Shift-Key-Z> "menu_redo $name" if {[tk windowingsystem] eq "aqua"} { @@ -109,8 +112,8 @@ bind $name <$modifier-Key-t> "menu_font $name" bind $name <$modifier-quoteleft> "menu_raisenextwindow" } else { - bind $name <$modifier-Key-m> "menu_send $name" - bind $name <$modifier-Key-t> "menu_texteditor $name" + bind $name <$modifier-Key-m> "menu_send" + bind $name <$modifier-Key-t> "menu_texteditor" } # mouse bindings ----------------------------------------------------------- @@ -142,6 +145,6 @@ #bind $name <FocusIn> {pdtk_canvaswindowmaintenance} # window protocol bindings - wm protocol $name WM_DELETE_WINDOW "menu_close $name" + wm protocol $name WM_DELETE_WINDOW "pdsend \"$name menuclose 0 ;\"" } Modified: branches/pd-devel/0.41.4/src/pd_connect.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_connect.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/pd_connect.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -6,7 +6,7 @@ namespace export to_pd namespace export create_socket - namespace export pd + namespace export pdsend } proc ::pd_connect::configure_socket {sock} { @@ -16,6 +16,7 @@ # if pd opens first, it starts pd-gui, then pd-gui connects to port 5400 proc ::pd_connect::to_pd {port} { + puts "::pd_connect::to_pd" variable pd_socket puts stderr "Connecting to localhost $port ..." if {[catch {set pd_socket [socket localhost $port]}]} { @@ -29,6 +30,7 @@ # if pd-gui opens first, it creates socket, and pd connects to port 5600. If # it can't create, then it keeps adding 1 to the port and tries again proc ::pd_connect::create_socket {} { + puts "::pd_connect::create_socket" if {[catch {set sock [socket -server ::pd_connect::from_pd -myaddr localhost 0]}]} { puts stderr "ERROR: failed to allocate port, exiting!" exit 3 @@ -38,24 +40,27 @@ } proc ::pd_connect::from_pd {channel clientaddr clientport} { + puts "::pd_connect::from_pd" variable pd_socket $channel puts "Connection from $clientaddr:$clientport registered" ::pd_connect::configure_socket $pd_socket } -# send a message from Tcl to Pd -proc ::pd_connect::pd {message} { +# send a pd/FUDI message from Tcl to Pd. This function aims to behave like a +# [send] in Pd, except the first argument is the name to send to. +proc ::pd_connect::pdsend {message} { # 'args' is special, it gets everything + puts "pdsend $message" variable pd_socket - if {[catch {puts $pd_socket $message}]} { + if {[catch {puts $pd_socket $message} errorname]} { + puts stderr "pdsend errorname: >>$errorname<<" error "Not connected to 'pd' process" } } -# figure out which namespace the eval is using... this probably needs to be -# global so that eval runs in the global namespace +# TODO exit if the other side drops the socket +# TODO this currently drops whitespace, like tabs proc ::pd_connect::pd_readsocket {cmd_from_pd} { variable pd_socket -# if {$cmd_from_pd == ""} {puts stderr "called with blank args aka READABLE"} append cmd_from_pd [gets $pd_socket] puts stderr "cmd_from_pd: $cmd_from_pd" if {[catch {uplevel #0 $cmd_from_pd} errorname]} { Modified: branches/pd-devel/0.41.4/src/pd_iemgui.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_iemgui.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/pd_iemgui.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -364,7 +364,7 @@ set hhhrcv [pdtk_unspace $hhhrcv] set hhhgui_nam [pdtk_unspace $hhhgui_nam] - pd [concat $id dialog \ + pdsend [concat $id dialog \ [eval concat $$var_iemgui_wdt] \ [eval concat $$var_iemgui_hgt] \ [eval concat $$var_iemgui_min_rng] \ @@ -386,7 +386,7 @@ \;] } -proc ::pd_iemgui::cancel {id} {pd [concat $id cancel \;]} +proc ::pd_iemgui::cancel {id} {pdsend "$id cancel ;"} proc ::pd_iemgui::ok {id} { ::pd_iemgui::apply $id Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -33,9 +33,9 @@ proc ::pd_menucommands::menu_new {} { variable untitled_number variable untitled_directory - pd [concat pd filename Untitled-$untitled_number $untitled_directory \;] - pd "#N canvas ;" - pd "#X pop 1 ;" + pdsend "pd filename Untitled-$untitled_number $untitled_directory ;" + pdsend "#N canvas ;" + pdsend "#X pop 1 ;" set untitled_number [expr $untitled_number + 1] } @@ -49,141 +49,31 @@ } } -proc ::pd_menucommands::menu_close {name} { - pd "$name menuclose 0 ;" +proc ::pd_menucommands::menu_send {} { + toplevel .sendpanel + wm title .sendpanel "Send message" + # TODO insert real send panel here } -proc ::pd_menucommands::menu_save {name} { - pd "$name menusave ;" +proc ::pd_menucommands::menu_print {name} { + set filename [tk_getSaveFile -initialfile pd.ps \ + -defaultextension .ps \ + -filetypes { {{postscript} {.ps}} }] + if {$filename != ""} { + $name.c postscript -file $filename + } } -proc ::pd_menucommands::menu_saveas {name} { - pd "$name menusaveas ;" -} - -proc menu_really_quit {} { - pd "pd quit ;" -} - -proc menu_quit {} { - pd "pd verifyquit ;" -} - # ------------------------------------------------------------------------------ # functions called from Edit menu -proc ::pd_menucommands::menu_cut {name} { - pd "$name cut ;" -} - -proc ::pd_menucommands::menu_copy {name} { - pd "$name copy ;" -} - -proc ::pd_menucommands::menu_paste {name} { - pd "$name paste ;" -} - -proc ::pd_menucommands::menu_duplicate {name} { - pd "$name duplicate ;" -} - -proc ::pd_menucommands::menu_selectall {name} { - pd "$name selectall ;" -} - -proc ::pd_menucommands::menu_texteditor {name} { - pd "$name texteditor ;" -} - -proc ::pd_menucommands::menu_font {name} { - pd "$name menufont ;" -} - -proc ::pd_menucommands::menu_tidyup {name} { - pd "$name tidy ;" -} - -proc ::pd_menucommands::menu_editmode {name} { - pd "$name editmode 0 ;" -} - proc ::pd_menucommands::menu_preferences {args} { toplevel .preferences wm title .preferences "Preferences" # TODO insert real preference panel here } - # ------------------------------------------------------------------------------ -# functions called from Put menu - -proc ::pd_menucommands::menu_object {name accel} { - pd "$name obj $accel ;" -} - -proc ::pd_menucommands::menu_message {name accel} { - pd "$name msg $accel ;" -} - -proc ::pd_menucommands::menu_floatatom {name accel} { - pd "$name floatatom $accel ;" -} - -proc ::pd_menucommands::menu_symbolatom {name accel} { - pd "$name symbolatom $accel ;" -} - -proc ::pd_menucommands::menu_comment {name accel} { - pd "$name text $accel ;" -} - -proc ::pd_menucommands::menu_graph {name} { - pd "$name graph ;" -} - -proc ::pd_menucommands::menu_array {name} { - pd "$name menuarray ;" -} - -############iemlib################## -proc ::pd_menucommands::menu_bng {name accel} { - pd "$name bng $accel ;" -} - -proc ::pd_menucommands::menu_toggle {name accel} { - pd "$name toggle $accel ;" -} - -proc ::pd_menucommands::menu_numbox {name accel} { - pd "$name numbox $accel ;" -} - -proc ::pd_menucommands::menu_vslider {name accel} { - pd "$name vslider $accel ;" -} - -proc ::pd_menucommands::menu_hslider {name accel} { - pd "$name hslider $accel ;" -} - -proc ::pd_menucommands::menu_hradio {name accel} { - pd "$name hradio $accel ;" -} - -proc ::pd_menucommands::menu_vradio {name accel} { - pd "$name vradio $accel ;" -} - -proc ::pd_menucommands::menu_vumeter {name accel} { - pd "$name vumeter $accel ;" -} - -proc ::pd_menucommands::menu_mycnv {name accel} { - pd "$name mycnv $accel ;" -} - -# ------------------------------------------------------------------------------ # window management functions Modified: branches/pd-devel/0.41.4/src/pd_menus.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -85,7 +85,7 @@ $rootmenu add separator $rootmenu add command -label [say "Close"] -accelerator "$accelerator+W" $rootmenu add command -label [say "Quit"] -accelerator "$accelerator+Q" \ - -command "menu_quit" + -command "pdsend \"pd verifyquit ;\"" } # the "Edit", "Put", and "Find" menus do not have cross-platform differences @@ -115,7 +115,7 @@ $rootmenu add separator $rootmenu add command -label [say "Close"] -accelerator "$accelerator+W" $rootmenu add command -label [say "Quit"] -accelerator "$accelerator+Q"\ - -command "menu_quit" + -command "pdsend \"pd verifyquit ;\"" } # the "Edit", "Put", and "Find" menus do not have cross-platform differences @@ -133,12 +133,12 @@ # menu building functions proc ::pd_menus::create_file_menu {rootmenu name} { [format create_file_menu_%s [tk windowingsystem]] $rootmenu - $rootmenu entryconfigure [say "new_file"] -command "menu_new" + $rootmenu entryconfigure [say "new_file"] -command "menu_new" $rootmenu entryconfigure [say "Open"] -command "menu_open" - $rootmenu entryconfigure [say "Save"] -command "menu_save $name" - $rootmenu entryconfigure [say "Save As..."] -command "menu_saveas $name" + $rootmenu entryconfigure [say "Save"] -command "pdsend \"$name menusave ;\"" + $rootmenu entryconfigure [say "Save As..."] -command "pdsend \"$name menusaveas ;\"" # $rootmenu entryconfigure "Revert*" -command "menu_revert $name" - $rootmenu entryconfigure [say "Close"] -command "menu_close $name" + $rootmenu entryconfigure [say "Close"] -command "pdsend \"$name menuclose 0 ;\"" $rootmenu entryconfigure [say "Message"] -command "menu_send" $rootmenu entryconfigure [say "Print..."] -command "menu_print $name" } @@ -151,15 +151,15 @@ -command "menu_redo $name" $rootmenu add separator $rootmenu add command -label [say "Cut"] -accelerator "$accelerator+X" \ - -command "menu_cut $name" + -command "pdsend \"$name cut ;\"" $rootmenu add command -label [say "Copy"] -accelerator "$accelerator+C" \ - -command "menu_copy $name" + -command "pdsend \"$name copy ;\"" $rootmenu add command -label [say "Paste"] -accelerator "$accelerator+V" \ - -command "menu_paste $name" + -command "pdsend \"$name paste ;\"" $rootmenu add command -label [say "Duplicate"] -accelerator "$accelerator+D" \ - -command "menu_duplicate $name" + -command "pdsend \"$name duplicate ;\"" $rootmenu add command -label [say "Select All"] -accelerator "$accelerator+A" \ - -command "menu_selectall $name" + -command "pdsend \"$name selectall ;\"" $rootmenu add separator if {[tk windowingsystem] eq "aqua"} { $rootmenu add command -label [say "Text Editor"] \ @@ -173,7 +173,7 @@ -command "menu_font $name" } $rootmenu add command -label [say "Tidy Up"] \ - -command "menu_tidyup $name" + -command "pdsend \"$name tidy ;\"" $rootmenu add command -label [say "Toggle Console"] -accelerator "Shift+$accelerator+R" \ -command {.controls.switches.console invoke} $rootmenu add command -label [say "Clear Console"] -accelerator "Shift+$accelerator+L" \ @@ -181,7 +181,7 @@ $rootmenu add separator $rootmenu add radiobutton -label [say "Edit Mode"] -accelerator "$accelerator+E" \ -indicatoron true -selectcolor grey85 \ - -command "menu_editmode $name" \ + -command "pdsend \"$name editmode ;\"" \ # if { $editable == 0 } { # $name.m.edit entryconfigure "Edit mode" -indicatoron false @@ -196,37 +196,37 @@ proc ::pd_menus::create_put_menu {rootmenu name} { variable accelerator $rootmenu add command -label [say "Object"] -accelerator "$accelerator+1" \ - -command "menu_object $name 0" + -command "pdsend \"$name obj 0;\"" $rootmenu add command -label [say "Message"] -accelerator "$accelerator+2" \ - -command "menu_message $name 0" + -command "pdsend \"$name msg 0;\"" $rootmenu add command -label [say "Number"] -accelerator "$accelerator+3" \ - -command "menu_floatatom $name 0" + -command "pdsend \"$name floatatom 0;\"" $rootmenu add command -label [say "Symbol"] -accelerator "$accelerator+4" \ - -command "menu_symbolatom $name 0" + -command "pdsend \"$name symbolatom 0;\"" $rootmenu add command -label [say "Comment"] -accelerator "$accelerator+5" \ - -command "menu_comment $name 0" + -command "pdsend \"$name text 0;\"" $rootmenu add separator $rootmenu add command -label [say "Bang"] -accelerator "Shift+$accelerator+B" \ - -command "menu_bng $name 0" + -command "pdsend \"$name bng 0;\"" $rootmenu add command -label [say "Toggle"] -accelerator "Shift+$accelerator+T" \ - -command "menu_toggle $name 0" + -command "pdsend \"$name toggle 0;\"" $rootmenu add command -label [say "Number2"] -accelerator "Shift+$accelerator+N" \ - -command "menu_numbox $name 0" + -command "pdsend \"$name numbox 0;\"" $rootmenu add command -label [say "Vslider"] -accelerator "Shift+$accelerator+V" \ - -command "menu_vslider $name 0" + -command "pdsend \"$name vslider 0;\"" $rootmenu add command -label [say "Hslider"] -accelerator "Shift+$accelerator+H" \ - -command "menu_hslider $name 0" + -command "pdsend \"$name hslider 0;\"" $rootmenu add command -label [say "Vradio"] -accelerator "Shift+$accelerator+D" \ - -command "menu_vradio $name 0" + -command "pdsend \"$name vradio 0;\"" $rootmenu add command -label [say "Hradio"] -accelerator "Shift+$accelerator+I" \ - -command "menu_hradio $name 0" + -command "pdsend \"$name hradio 0;\"" $rootmenu add command -label [say "VU Meter"] -accelerator "Shift+$accelerator+U"\ - -command "menu_vumeter $name 0" + -command "pdsend \"$name vumeter 0;\"" $rootmenu add command -label [say "Canvas"] -accelerator "Shift+$accelerator+C" \ - -command "menu_mycnv $name 0" + -command "pdsend \"$name mycnv 0;\"" $rootmenu add separator - $rootmenu add command -label Graph -command "menu_graph $name" - $rootmenu add command -label Array -command "menu_array $name" + $rootmenu add command -label Graph -command "pdsend \"$name graph ;\"" + $rootmenu add command -label Array -command "pdsend \"$name menuarray ;\"" } proc ::pd_menus::create_find_menu {rootmenu name} { @@ -234,17 +234,17 @@ $rootmenu add command -label [say "Find..."] -accelerator "$accelerator+F" \ -command "menu_findobject $name" $rootmenu add command -label [say "Find Again"] -accelerator "$accelerator+G" \ - -command "menu_findagain $name" + -command "pdsend \"$name findagain ;\"" $rootmenu add command -label [say "Find last error"] \ - -command "menu_finderror" + -command "pdsend \"$name finderror ;\"" } proc ::pd_menus::create_media_menu {rootmenu name} { variable accelerator $rootmenu add radiobutton -label [say "Compute Audio On"] -accelerator "$accelerator+/" \ - -command "menu_audio 1" + -command "pdsend \"pd dsp 1 ;\"" $rootmenu add radiobutton -label [say "Compute Audio Off"] -accelerator "$accelerator+." \ - -command "menu_audio 0" -indicatoron true + -command "pdsend \"pd dsp 0 ;\"" -indicatoron true $rootmenu add separator $rootmenu add command -label [say "Test Audio and MIDI"] \ -command "menu_doc_open doc/7.stuff/tools testtone.pd" Modified: branches/pd-devel/0.41.4/src/pdtk_canvas.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -22,21 +22,21 @@ # mouse usage proc pdtk_canvas_motion {canvasname x y mods} { - pd "[to_top $canvasname] motion [$canvasname canvasx $x] [$canvasname canvasy $y] $mods;" + pdsend "[to_top $canvasname] motion [$canvasname canvasx $x] [$canvasname canvasy $y] $mods;" } proc pdtk_canvas_mouse {canvasname x y b f} { # TODO perhaps the Tcl/C function names should match "mouse" message # rather than "mousedown" function - pd "[to_top $canvasname] mouse [$canvasname canvasx $x] [$canvasname canvasy $y] $b $f;" + pdsend "[to_top $canvasname] mouse [$canvasname canvasx $x] [$canvasname canvasy $y] $b $f;" } proc pdtk_canvas_mouseup {canvasname x y b} { - pd "[to_top $canvasname] mouseup [$canvasname canvasx $x] [$canvasname canvasy $y] $b;" + pdsend "[to_top $canvasname] mouseup [$canvasname canvasx $x] [$canvasname canvasy $y] $b;" } proc pdtk_canvas_rightclick {canvasname x y b} { - pd "[to_top $canvasname] mouse [$canvasname canvasx $x] [$canvasname canvasy $y] $b 8;" + pdsend "[to_top $canvasname] mouse [$canvasname canvasx $x] [$canvasname canvasy $y] $b 8;" } # on X11, button 2 "pastes" from the X windows clipboard @@ -53,11 +53,11 @@ # invisible (arg is ""). Invisibility means the Window Manager has minimized # us. We don't get a final "unmap" event when we destroy the window. proc pdtk_canvas_map {name} { - pd "$name map 1 ;" + pdsend "$name map 1 ;" } proc pdtk_canvas_unmap {name} { - pd "$name map 0 ;" + pdsend "$name map 0 ;" } # check or uncheck the "edit" menu item Modified: branches/pd-devel/0.41.4/src/pkgIndex.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -8,6 +8,7 @@ # script is sourced, the variable $dir must contain the # full path name of this file's directory. +package ifneeded apple_events 0.1 [list source [file join $dir apple_events.tcl]] package ifneeded pd_bindings 0.1 [list source [file join $dir pd_bindings.tcl]] package ifneeded pd_connect 0.1 [list source [file join $dir pd_connect.tcl]] package ifneeded pd_iemgui 0.1 [list source [file join $dir pd_iemgui.tcl]] Modified: branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl =================================================================== --- branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-13 04:18:07 UTC (rev 10525) +++ branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-13 06:46:55 UTC (rev 10526) @@ -28,7 +28,7 @@ set pd_opendir $directory set basename [string range $filename [expr [string last / $filename] + 1] end] if {[string last .pd $filename] >= 0} { - pd "pd open [pdtk_enquote $basename] [pdtk_enquote $directory] ;" + pdsend "pd open [pdtk_enquote $basename] [pdtk_enquote $directory] ;" } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10525] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10525 http://pure-data.svn.sourceforge.net/pure-data/?rev=10525&view=rev Author: eighthave Date: 2009-01-13 04:18:07 +0000 (Tue, 13 Jan 2009) Log Message: ----------- - w00t! I can load patch, see it, and make sound! - I forgot to 'pack' the canvas, so it wasn't showing up - I had to reintroduce "canvastosym" as "to_top" and bind mouse events to the canvas rather than the toplevel because otherwise bind's %W would give .x246570 for toplevel events and .x246570.c for canvas events - converted mouse binding functions to use to_top - moved the ::pd_bindings::canvas_bindings to after the canvas is created, since ::pd_bindings::canvas_bindings needs to bind events to the canvas - added menu_audio and bindings - added Ctrl-click binding for Mac OS X and Button-2 for X11 Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_bindings.tcl branches/pd-devel/0.41.4/src/pdtk_canvas.tcl Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 01:19:49 UTC (rev 10524) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 04:18:07 UTC (rev 10525) @@ -1,8 +1,12 @@ -#!/usr/bin/env wish +#!/bin/sh +# This line continues for Tcl, but is a single line for 'sh' \ + exec wish "$0" -- ${1+"$@"} # For information on usage and redistribution, and for a DISCLAIMER OF ALL # WARRANTIES, see the file, "LICENSE.txt," in this distribution. # Copyright (c) 1997-2009 Miller Puckette. +puts -------------------------------pd.tk----------------------------------- + package require Tcl 8.3 package require Tk @@ -47,9 +51,10 @@ #------------------------------------------------------------------------------# # global variables -# command line options +set filetypes "" + # for the sake of clarity, I think there should not be any inline code, # everything should be in a procedure that is ultimately triggered from main() # -hans(a)eds.org @@ -85,6 +90,7 @@ # init functions proc init {} { + global filetypes switch -- [tk windowingsystem] { "x11" { # add control to show/hide hidden files in the open panel (load @@ -148,19 +154,23 @@ puts stderr "Running pdtk_fixwindowmenu" } +# TODO rename "name" to "topname" to be clear proc pdtk_canvas_new {name width height geometry editable} { # TODO check size of window toplevel $name -width $width -height $height ::pd_menus::create_menubar $name.menubar $name configure -menu $name.menubar - ::pd_bindings::canvas_bindings $name # TODO slide off screen windows into view wm geometry $name $geometry wm minsize $name 50 20 canvas $name.c -width $width -height $height -background white \ -highlightthickness 0 + # TODO add scrollbars here + pack $name.c -side left -expand 1 -fill both + ::pd_bindings::canvas_bindings $name + # the popup menu for the canvas menu $name.popup -tearoff false $name.popup add command -label "Properties" -command "popup_action $name 0" @@ -168,7 +178,6 @@ $name.popup add command -label "Help" -command "popup_action $name 2" } - proc check_font {$fontname} { # TODO check to see if the requested font exists using [font families] } Modified: branches/pd-devel/0.41.4/src/pd_bindings.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 01:19:49 UTC (rev 10524) +++ branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 04:18:07 UTC (rev 10525) @@ -88,6 +88,8 @@ bind $name <$modifier-Key-v> "menu_paste $name" bind $name <$modifier-Key-x> "menu_cut $name" bind $name <$modifier-Key-z> "menu_undo $name" + bind $name <$modifier-Key-slash> "menu_audio 1" + bind $name <$modifier-Key-period> "menu_audio 0" # annoying, but Tk's bind needs uppercase letter to get the Shift bind $name <$modifier-Shift-Key-B> "menu_bang" @@ -112,11 +114,22 @@ } # mouse bindings ----------------------------------------------------------- - # TODO add mouse button bindings - bind $name <Motion> "pdtk_canvas_motion %W %x %y 0" - bind $name <Button> "pdtk_canvas_mouse %W %x %y %b 0" - bind $name <ButtonRelease> "pdtk_canvas_mouseup %W %x %y %b" - bind $name <$modifier-Button> "pdtk_canvas_rightclick %W %x %y %b" + # these need to be bound to $name.c because %W will return $name for + # events over the window frame and $name.c for events over the canvas + bind $name.c <Motion> "pdtk_canvas_motion %W %x %y 0" + bind $name.c <Button> "pdtk_canvas_mouse %W %x %y %b 0" + bind $name.c <ButtonRelease> "pdtk_canvas_mouseup %W %x %y %b" + bind $name.c <$modifier-Button> "pdtk_canvas_mouse %W %x %y %b 0" + # TODO look into "virtual events' for a means for getting Shift-Button, etc. + switch {[tk windowingsystem]} { + "aqua" { + # on Mac OS X, emulate a rightclick with Ctrl-click + bind.c $name <Ctrl-Button> "pdtk_canvas_rightclick %W %x %y %b" + } "x11" { + # on X11, button 2 "pastes" from the X windows clipboard + bind.c $name <Button-2> "pdtk_canvas_clickpaste %W %x %y %b" + } + } #TODO bind $name <MouseWheel> # event bindings ----------------------------------------------------------- Modified: branches/pd-devel/0.41.4/src/pdtk_canvas.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-01-13 01:19:49 UTC (rev 10524) +++ branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-01-13 04:18:07 UTC (rev 10525) @@ -1,41 +1,51 @@ package provide pdtk_canvas 0.1 +package require pd_bindings + namespace eval ::pdtk_canvas:: { } -# check or uncheck the "edit" menu item -proc pdtk_canvas_editval {name value} { - $name.m.edit entryconfigure "Edit mode" -indicatoron $value +# get the name of the toplevel window for a canvas; this is also the name of +# the canvas object in Pd. It would probably make more sense if bind's %W returned the window name ($name) rather than the canvas name +proc to_top {canvasname} { + string range $canvasname 0 [expr [string length $canvasname] - 3] } -proc pdtk_canvas_getscroll {name} { - # TODO make this work +proc pdtk_canvas_checkgeometry {topname} { + # TODO check and relocate window accordingly } #------------------------------------------------------------------------------# # mouse usage -proc pdtk_canvas_motion {name x y mods} { - pd "$name motion [$name.c canvasx $x] [$name.c canvasy $y] $mods ;" +proc pdtk_canvas_motion {canvasname x y mods} { + pd "[to_top $canvasname] motion [$canvasname canvasx $x] [$canvasname canvasy $y] $mods;" } -proc pdtk_canvas_mouse {name x y b f} { +proc pdtk_canvas_mouse {canvasname x y b f} { # TODO perhaps the Tcl/C function names should match "mouse" message # rather than "mousedown" function - pd "$name mouse [$name.c canvasx $x] [$name.c canvasy $y] $b $f ;" + pd "[to_top $canvasname] mouse [$canvasname canvasx $x] [$canvasname canvasy $y] $b $f;" } -proc pdtk_canvas_mouseup {name x y b} { - pd "$name mouseup [$name.c canvasx $x] [$name.c canvasy $y] $b ;" +proc pdtk_canvas_mouseup {canvasname x y b} { + pd "[to_top $canvasname] mouseup [$canvasname canvasx $x] [$canvasname canvasy $y] $b;" } -proc pdtk_canvas_rightclick {name x y b} { - pd "$name mouse [$name.c canvasx $x] [$name.c canvasy $y] $b 8 ;" +proc pdtk_canvas_rightclick {canvasname x y b} { + pd "[to_top $canvasname] mouse [$canvasname canvasx $x] [$canvasname canvasy $y] $b 8;" } +# on X11, button 2 "pastes" from the X windows clipboard +proc pdtk_canvas_clickpaste {canvasname x y b} { + pdtk_canvas_click $canvasname $x $y $b 0 + pdtk_canvas_mouseup $canvasname $x $y $b + pdtk_pastetext +} + #------------------------------------------------------------------------------# # procs for canvas events @@ -49,3 +59,12 @@ proc pdtk_canvas_unmap {name} { pd "$name map 0 ;" } + +# check or uncheck the "edit" menu item +proc pdtk_canvas_editval {name value} { + $name.m.edit entryconfigure "Edit mode" -indicatoron $value +} + +proc pdtk_canvas_getscroll {name} { + # TODO make this work +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10524] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10524 http://pure-data.svn.sourceforge.net/pure-data/?rev=10524&view=rev Author: eighthave Date: 2009-01-13 01:19:49 +0000 (Tue, 13 Jan 2009) Log Message: ----------- purged all traces of Tcl/Tk from the C side of things, it is no longer needed, pd-gui is pure Tcl/Tk Modified Paths: -------------- branches/pd-devel/0.41.4/src/configure.in branches/pd-devel/0.41.4/src/g_all_guis.c branches/pd-devel/0.41.4/src/g_bang.c branches/pd-devel/0.41.4/src/g_graph.c branches/pd-devel/0.41.4/src/g_hdial.c branches/pd-devel/0.41.4/src/g_hslider.c branches/pd-devel/0.41.4/src/g_mycanvas.c branches/pd-devel/0.41.4/src/g_numbox.c branches/pd-devel/0.41.4/src/g_rtext.c branches/pd-devel/0.41.4/src/g_text.c branches/pd-devel/0.41.4/src/g_toggle.c branches/pd-devel/0.41.4/src/g_vdial.c branches/pd-devel/0.41.4/src/g_vslider.c branches/pd-devel/0.41.4/src/g_vumeter.c branches/pd-devel/0.41.4/src/makefile.in Removed Paths: ------------- branches/pd-devel/0.41.4/src/t_main.c branches/pd-devel/0.41.4/src/t_tk.h branches/pd-devel/0.41.4/src/t_tkcmd.c Modified: branches/pd-devel/0.41.4/src/configure.in =================================================================== --- branches/pd-devel/0.41.4/src/configure.in 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/configure.in 2009-01-13 01:19:49 UTC (rev 10524) @@ -7,22 +7,16 @@ AC_SUBST(portmidi, no) AC_SUBST(binarymode, -m755) AC_SUBST(fftw, no) -AC_SUBST(tk, yes) AC_SUBST(PDLIB) AC_SUBST(CPPFLAGS) AC_SUBST(MORECFLAGS) AC_SUBST(EXT) AC_SUBST(USE_DEBUG_CFLAGS, no) AC_SUBST(SYSSRC) -AC_SUBST(TCLTK_FRAMEWORKS_PATH) -AC_SUBST(TCLTK_FRAMEWORKS_PATH) AC_SUBST(STRIPFLAG) -AC_SUBST(GUINAME) -AC_SUBST(GUIFLAGS) AC_SUBST(OSNUMBER) AC_SUBST(EXTERNTARGET) AC_SUBST(ASIOSRC) -AC_SUBST(GUISRC) dnl other defaults @@ -46,8 +40,6 @@ fftw=$enableval) AC_ARG_ENABLE(fat, [ --disable-fat build fat binary on Mac OS X], fat=$enableval, fat="yes") -AC_ARG_ENABLE(tk, [ --disable-tk build without tcl/tk-GUI], - tk=$enableval) dnl Checks for programs. AC_PROG_CC @@ -99,80 +91,6 @@ echo "fftw package not found - using built-in FFT"; fftw=no) fi -dnl look for tcl 8.x... do I really have to go through all this!? - -foundit=no -if test $foundit = "no"; -then - AC_CHECK_HEADER(tcl.h,foundit=yes,) -fi -if test $foundit = "no"; -then - AC_CHECK_HEADER(tcl8.7/tcl.h, - GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.7";foundit=yes,) -fi -if test $foundit = "no"; -then - AC_CHECK_HEADER(tcl8.6/tcl.h, - GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.6";foundit=yes,) -fi -if test $foundit = "no"; -then - AC_CHECK_HEADER(tcl8.5/tcl.h, - GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.5";foundit=yes,) -fi -if test $foundit = "no"; -then - AC_CHECK_HEADER(tcl8.4/tcl.h, - GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.4";foundit=yes,) -fi -if test $foundit = "no"; -then - AC_CHECK_HEADER(tcl8.4/tcl.h, - GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.4";foundit=yes,) -fi -if test $foundit = "no"; -then - AC_CHECK_HEADER(tcl8.3/tcl.h, - GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,) -fi -if test $foundit = "no"; -then - AC_CHECK_HEADER(tcl8.2/tcl.h, - GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.2";foundit=yes,) -fi -if test $foundit = "no"; -then - echo no tcl header found - echo bolding trying without... -# exit -1 -fi - -AC_CHECK_LIB(tcl85, main,, - AC_CHECK_LIB(tcl8.5, main,, - AC_CHECK_LIB(tcl84, main,, - AC_CHECK_LIB(tcl8.4, main,, - AC_CHECK_LIB(tcl8.3, main,, - AC_CHECK_LIB(tcl8.2, main,, - AC_CHECK_LIB(tcl8.0, main,, - echo no tcl library found; exit 1))))))) - -AC_CHECK_LIB(tk85, main,, - AC_CHECK_LIB(tk8.5, main,, - AC_CHECK_LIB(tk84, main,, - AC_CHECK_LIB(tk8.4, main,, - AC_CHECK_LIB(tk8.3, main,, - AC_CHECK_LIB(tk8.2, main,, - AC_CHECK_LIB(tk8.0, main,, - echo no tk library found; exit 1))))))) - - -if test x$tk != "xno"; then -GUISRC="t_main.c t_tkcmd.c" -else -GUISRC= -fi - if test `uname -s` = Linux; then dnl Ckecking for ALSA @@ -247,7 +165,6 @@ binarymode="-m4755" fi STRIPFLAG=-s - GUINAME="pd-gui" if test x$USE_DEBUG_CFLAGS = "xyes"; then MORECFLAGS=$MORECFLAGS" -g" @@ -319,25 +236,7 @@ ../portmidi/pm_common/portmidi.c \ ../portmidi/porttime/ptmacosx_cf.c " STRIPFLAG="" - GUINAME="libPdTcl.dylib" -# find the Tcl/Tk Frameworks - if test -d "../../Frameworks"; - then - # Miller's location - TCLTK_FRAMEWORKS_PATH="../../Frameworks" - elif test -d "/Library/Frameworks"; - then - # get it from the default install location - TCLTK_FRAMEWORKS_PATH="/Library/Frameworks" - else - # Panther has Tcl here; Tiger has Tcl and Tk here - TCLTK_FRAMEWORKS_PATH="/System/Library/Frameworks" - fi - GUIFLAGS="-F$TCLTK_FRAMEWORKS_PATH -framework Tcl -framework Tk \ - -I$TCLTK_FRAMEWORKS_PATH/Tk.framework/Versions/Current/Headers \ - -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/Current/Headers \ - -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/8.4/PrivateHeaders" if test x$USE_DEBUG_CFLAGS = "xyes"; then MORECFLAGS=$MORECFLAGS" -g" @@ -388,8 +287,6 @@ ../portaudio/src/hostapi/pa_asio/asio.cpp ../asio/asio.cpp \ ../asio/asiodrivers.cpp ../asio/asiolist.cpp" STRIPFLAG="--strip-unneeded" - GUINAME="pdtcl.dll" - GUIFLAGS= fi # support for jack, on either linux or darwin: Modified: branches/pd-devel/0.41.4/src/g_all_guis.c =================================================================== --- branches/pd-devel/0.41.4/src/g_all_guis.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_all_guis.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -12,7 +12,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/g_bang.c =================================================================== --- branches/pd-devel/0.41.4/src/g_bang.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_bang.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -12,7 +12,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/g_graph.c =================================================================== --- branches/pd-devel/0.41.4/src/g_graph.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_graph.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -8,7 +8,7 @@ #include <stdlib.h> #include "m_pd.h" -#include "t_tk.h" + #include "g_canvas.h" #include "s_stuff.h" /* for sys_hostfontsize */ #include <stdio.h> Modified: branches/pd-devel/0.41.4/src/g_hdial.c =================================================================== --- branches/pd-devel/0.41.4/src/g_hdial.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_hdial.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -14,7 +14,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/g_hslider.c =================================================================== --- branches/pd-devel/0.41.4/src/g_hslider.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_hslider.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -12,7 +12,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/g_mycanvas.c =================================================================== --- branches/pd-devel/0.41.4/src/g_mycanvas.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_mycanvas.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -12,7 +12,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/g_numbox.c =================================================================== --- branches/pd-devel/0.41.4/src/g_numbox.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_numbox.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -10,7 +10,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/g_rtext.c =================================================================== --- branches/pd-devel/0.41.4/src/g_rtext.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_rtext.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -13,8 +13,8 @@ #include "m_pd.h" #include "s_stuff.h" #include "g_canvas.h" -#include "t_tk.h" + #define LMARGIN 2 #define RMARGIN 2 /* for some reason, it draws text 1 pixel lower on Mac OS X (& linux too?) */ Modified: branches/pd-devel/0.41.4/src/g_text.c =================================================================== --- branches/pd-devel/0.41.4/src/g_text.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_text.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -10,7 +10,7 @@ #include "m_pd.h" #include "m_imp.h" #include "s_stuff.h" -#include "t_tk.h" + #include "g_canvas.h" #include <stdio.h> #include <string.h> Modified: branches/pd-devel/0.41.4/src/g_toggle.c =================================================================== --- branches/pd-devel/0.41.4/src/g_toggle.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_toggle.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -12,7 +12,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/g_vdial.c =================================================================== --- branches/pd-devel/0.41.4/src/g_vdial.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_vdial.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -13,7 +13,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/g_vslider.c =================================================================== --- branches/pd-devel/0.41.4/src/g_vslider.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_vslider.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -12,7 +12,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/g_vumeter.c =================================================================== --- branches/pd-devel/0.41.4/src/g_vumeter.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/g_vumeter.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -12,7 +12,7 @@ #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" -#include "t_tk.h" + #include "g_all_guis.h" #include <math.h> Modified: branches/pd-devel/0.41.4/src/makefile.in =================================================================== --- branches/pd-devel/0.41.4/src/makefile.in 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/makefile.in 2009-01-13 01:19:49 UTC (rev 10524) @@ -3,7 +3,6 @@ BIN_DIR = ../bin PDEXEC = $(BIN_DIR)/pd EXT= @EXT@ -GUINAME= @GUINAME@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -59,10 +58,7 @@ OBJ = $(SRC:.c=.o) -GSRC = @GUISRC@ -GOBJ = $(GSRC:.c=.o) - # get version from m_pd.h to use in doc/1.manual/1.introduction.txt PD_MAJOR_VERSION := $(shell grep PD_MAJOR_VERSION m_pd.h | \ sed 's|^.define *PD_MAJOR_VERSION *$[0-9]*$.*|\1|' ) @@ -123,9 +119,6 @@ $(PDEXEC): $(OBJ) $(BIN_DIR) cd ../obj; $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB) -$(BIN_DIR)/pd-gui: $(GOBJ) $(GSRC) - cd ../obj; $(CC) $(INCLUDE) -o $(BIN_DIR)/$(GUINAME) $(GOBJ) $(GLIB) - $(BIN_DIR)/pd.tk: $(wildcard *.tcl) $(wildcard locale/*.tcl) $(BIN_DIR) install pd.tk $(BIN_DIR)/pd.tk install *.tcl $(BIN_DIR)/ @@ -133,25 +126,6 @@ install locale/*.tcl $(BIN_DIR)/locale touch -r makefile.dependencies $(BIN_DIR) -#this is for Max OSX only... -$(BIN_DIR)/libPdTcl.dylib: $(GOBJ) $(GSRC) - cd ../obj && $(CC) $(CFLAGS) -dynamiclib -read_only_relocs warning \ - -o $(BIN_DIR)/libPdTcl.dylib $(GOBJ) \ - -F@TCLTK_FRAMEWORKS_PATH@ \ - -framework Tcl -framework Tk -framework System \ - -Wl,-install_name,@executable_path/../Resources/bin/libPdTcl.dylib - install_name_tool -change @TCLTK_FRAMEWORKS_PATH@/Tcl.framework/Versions/8.4/Tcl\ - @executable_path/../Frameworks/Tcl.framework/Versions/8.4/Tcl \ - -change @TCLTK_FRAMEWORKS_PATH@/Tk.framework/Versions/8.4/Tk \ - @executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \ - ../bin/libPdTcl.dylib - -# this is for Windows/MinGW (only?) -$(BIN_DIR)/pdtcl.dll: $(GOBJ) - cd $(BIN_DIR); dllwrap --export-all-symbols --output-def pdtcl.def \ - --output-lib=pdtcl.a --dllname=$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LIB) $(GLIB) - strip --strip-unneeded $(BIN_DIR)/pdtcl.dll - externs: make -C ../extra/bonk~ @EXTERNTARGET@ make -C ../extra/choice @EXTERNTARGET@ Deleted: branches/pd-devel/0.41.4/src/t_main.c =================================================================== --- branches/pd-devel/0.41.4/src/t_main.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/t_main.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -1,115 +0,0 @@ -/* Copyright (c) 1997-1999 Miller Puckette. -* For information on usage and redistribution, and for a DISCLAIMER OF ALL -* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - -/* This file should be compared with the corresponding thing in the TK -* distribution whenever updating to newer versions of TCL/TK. */ - -/* - * Copyright (c) 1993 The Regents of the University of California. - * Copyright (c) 1994 Sun Microsystems, Inc. - * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - */ - - -#ifndef __APPLE__ /* linux and IRIX only; in __APPLE__ we don't link this in */ -#include "tk.h" -#include <stdlib.h> - -/* - *---------------------------------------------------------------------- - * - * main -- - * - * This is the main program for the application. - * - * Results: - * None: Tk_Main never returns here, so this procedure never - * returns either. - * - * Side effects: - * Whatever the application does. - * - *---------------------------------------------------------------------- - */ - -void pdgui_startup(Tcl_Interp *interp); -void pdgui_setname(char *name); -void pdgui_setsock(int port); -void pdgui_sethost(char *name); - -int -main(int argc, char **argv) -{ - pdgui_setname(argv[0]); - if (argc >= 2) - { - pdgui_setsock(atoi(argv[1])); - argc--; argv++; - argv[0] = "Pd"; - } - if (argc >= 2) - { - pdgui_sethost(argv[1]); - argc--; argv++; - argv[0] = "Pd"; - } - Tk_Main(argc, argv, Tcl_AppInit); - return 0; /* Needed only to prevent compiler warning. */ -} - - -/* - *---------------------------------------------------------------------- - * - * Tcl_AppInit -- - * - * This procedure performs application-specific initialization. - * Most applications, especially those that incorporate additional - * packages, will have their own version of this procedure. - * - * Results: - * Returns a standard Tcl completion code, and leaves an error - * message in interp->result if an error occurs. - * - * Side effects: - * Depends on the startup script. - * - *---------------------------------------------------------------------- - */ - - -int -Tcl_AppInit(interp) - Tcl_Interp *interp; /* Interpreter for application. */ -{ - Tk_Window mainwindow; - - if (Tcl_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - if (Tk_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - - /* setup specific to pd-gui: */ - - pdgui_startup(interp); - - /* - * Specify a user-specific startup file to invoke if the application - * is run interactively. Typically the startup file is "~/.apprc" - * where "app" is the name of the application. If this line is deleted - * then no user-specific startup file will be run under any conditions. - */ - -#if 0 - tcl_RcFileName = "~/.apprc"; -#endif - - return TCL_OK; -} - -#endif /* __APPLE__ */ Deleted: branches/pd-devel/0.41.4/src/t_tk.h =================================================================== --- branches/pd-devel/0.41.4/src/t_tk.h 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/t_tk.h 2009-01-13 01:19:49 UTC (rev 10524) @@ -1,10 +0,0 @@ -/* Copyright (c) 1997-1999 Miller Puckette. -* For information on usage and redistribution, and for a DISCLAIMER OF ALL -* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - -void pdgui_vmess(char *fmt, ...); -void pdgui_mess(char *s); - -void pdgui_evalfile(char *s); - -#define GUISTRING 1000 Deleted: branches/pd-devel/0.41.4/src/t_tkcmd.c =================================================================== --- branches/pd-devel/0.41.4/src/t_tkcmd.c 2009-01-13 00:01:34 UTC (rev 10523) +++ branches/pd-devel/0.41.4/src/t_tkcmd.c 2009-01-13 01:19:49 UTC (rev 10524) @@ -1,647 +0,0 @@ -/* Copyright (c) 1997-1999 Miller Puckette. -* For information on usage and redistribution, and for a DISCLAIMER OF ALL -* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - -#ifndef MSW /* in unix this only works first; in MSW it only works last. */ -#include "tk.h" -#endif - -#include "t_tk.h" -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <stdarg.h> -#include <sys/types.h> - -#ifndef MSW -#include <unistd.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <netinet/tcp.h> -#include <netdb.h> -#ifdef HAVE_BSTRING_H -#include <bstring.h> -#endif -#include <sys/time.h> -#include <errno.h> -#include <fcntl.h> -#endif -#ifdef MSW -#include <winsock.h> -#include <io.h> -#endif - -/* These pragmas are only used for MSVC, not MinGW or Cygwin <hans(a)at.or.at> */ -#ifdef _MSC_VER -#pragma warning( disable : 4305 ) /* uncast const double to float */ -#pragma warning( disable : 4244 ) /* uncast double to float */ -#pragma warning( disable : 4101 ) /* unused local variables */ -#endif - -#ifdef MSW -#include "tk.h" -#endif - -#ifdef __APPLE__ -#define STARTGUI -#endif - -#ifdef __linux__ -#define STARTGUI -#endif - -#define FIRSTPORTNUM 5600 - -void tcl_mess(char *s); -static Tcl_Interp *tk_pdinterp; -static int pd_portno = 0; - - -/***************** the socket setup code ********************/ - -/* If this is reset by pdgui_setsock(), it's the port number Pd will try to -connect to; but if zero, that means we should set it and start Pd ourselves. */ - - - /* some installations of linux don't know about "localhost" so give - the loopback address; NT, on the other hand, can't understand the - hostname "127.0.0.1". */ -char hostname[100] = -#ifdef __linux__ - "127.0.0.1"; -#else - "localhost"; -#endif - -void pdgui_setsock(int port) -{ - pd_portno = port; -} - - /* why is this here??? probably never used (see t_main.c). */ -void pdgui_sethost(char *name) -{ - strncpy(hostname, name, 100); - hostname[99] = 0; -} - -static void pdgui_sockerror(char *s) -{ -#ifdef MSW - int err = WSAGetLastError(); -#endif -#ifndef MSW - int err = errno; -#endif - - fprintf(stderr, "%s: %s (%d)\n", s, strerror(err), err); - tcl_mess("exit\n"); - exit(1); -} - -static int sockfd; - -/* The "pd_readsocket" command, which polls the socket. */ - -#define CHUNKSIZE 20000 /* chunks to allocate memory for reading socket */ -#define READSIZE 10000 /* size of read to issue */ - -static char *pd_tkbuf = 0; /* buffer for reading */ -static int pd_tkbufsize = 0; /* current buffer size */ -static int pd_buftail = 0; /* number of bytes already in buffer */ -static int pd_bufhead = 0; /* index of first byte to read */ - - /* mask argument unused but is here to follow tcl's prototype. */ -static void pd_readsocket(ClientData cd, int mask) -{ - fd_set readset, writeset, exceptset; - struct timeval timout; - - timout.tv_sec = 0; - timout.tv_usec = 0; - FD_ZERO(&writeset); - FD_ZERO(&readset); - FD_ZERO(&exceptset); - FD_SET(sockfd, &readset); - FD_SET(sockfd, &exceptset); - if (!pd_tkbuf) - { - if (!(pd_tkbuf = malloc(CHUNKSIZE))) - { - fprintf(stderr, "pd-gui: out of memory\n"); - tcl_mess("exit\n"); - } - pd_tkbufsize = CHUNKSIZE; - } - if (pd_buftail + READSIZE + 1 > pd_tkbufsize) - { - int newsize = pd_tkbufsize + CHUNKSIZE; - char *newbuf = realloc(pd_tkbuf, newsize); - if (!newbuf) - { - fprintf(stderr, "pd-gui: out of memory\n"); - tcl_mess("exit\n"); - } - pd_tkbuf = newbuf; - pd_tkbufsize = newsize; - } - if (select(sockfd+1, &readset, &writeset, &exceptset, &timout) < 0) - perror("select"); - if (FD_ISSET(sockfd, &exceptset) || FD_ISSET(sockfd, &readset)) - { - int ret; - ret = recv(sockfd, pd_tkbuf + pd_buftail, READSIZE, 0); - if (ret < 0) - pdgui_sockerror("socket receive error"); - else if (ret == 0) - { - /* fprintf(stderr, "read %d\n", SOCKSIZE - pd_buftail); */ - fprintf(stderr, "pd_gui: pd process exited\n"); - tcl_mess("exit\n"); - } - else - { - pd_buftail += ret; - while (1) - { - char lastc = 0, *gotcr = 0, *bp = pd_tkbuf + pd_bufhead, - *ep = pd_tkbuf + pd_buftail; - int brace = 0; - /* search for locations that terminate a complete TK - command. These are carriage returns which are not inside - any braces. Braces can be escaped with backslashes (but - backslashes themselves can't.) */ - while (bp < ep) - { - char c = *bp; - if (c == '}' && brace) - brace--; - else if (c == '{') - brace++; - else if (!brace && c == '\n' && lastc != '\\') - { - gotcr = bp; - break; - } - lastc = c; - bp++; - } - /* if gotcr is set there is at least one complete TK - command in the buffer, and gotcr terminates the first one. - Because sending the command to tcl may cause this code to - be reentered, we first copy the command and take it out of - the buffer, then execute the command. - Execute it and slide any - extra bytes to beginning of the buffer. */ - if (gotcr) - { - int bytesincmd = (gotcr - (pd_tkbuf+pd_bufhead)) + 1; - char smallcmdbuf[1000], *realcmdbuf; - if (gotcr - (pd_tkbuf+pd_bufhead) < 998) - realcmdbuf = smallcmdbuf; - else realcmdbuf = malloc(bytesincmd+1); - if (realcmdbuf) - { - strncpy(realcmdbuf, pd_tkbuf+pd_bufhead, bytesincmd); - realcmdbuf[bytesincmd] = 0; - } - pd_bufhead += bytesincmd; - if (realcmdbuf) - { - tcl_mess(realcmdbuf); - if (realcmdbuf != smallcmdbuf) - free(realcmdbuf); - } - if (pd_buftail < pd_bufhead) - fprintf(stderr, "tkcmd bug\n"); - } - else break; - } - if (pd_bufhead) - { - if (pd_buftail > pd_bufhead) - memmove(pd_tkbuf, pd_tkbuf + pd_bufhead, - pd_buftail-pd_bufhead); - pd_buftail -= pd_bufhead; - pd_bufhead = 0; - } - } - } -} - -#ifdef MSW - /* if we're in Gatesland, we add a tcl command to poll the - socket for data. */ -static int pd_pollsocketCmd(ClientData cd, Tcl_Interp *interp, - int argc, char **argv) -{ - pd_readsocket(cd, 0); - return (TCL_OK); -} -#endif - -static void pd_sockerror(char *s) -{ -#ifdef MSW - int err = WSAGetLastError(); - if (err == 10054) return; - else if (err == 10044) - { - fprintf(stderr, - "Warning: you might not have TCP/IP \"networking\" turned on\n"); - fprintf(stderr, "which is needed for Pd to talk to its GUI layer.\n"); - } -#else - int err = errno; -#endif - fprintf(stderr, "%s: %s (%d)\n", s, strerror(err), err); -} - -static void pdgui_connecttosocket(void) -{ - struct sockaddr_in server; - struct hostent *hp; -#ifndef MSW - int retry = 10; -#else - int retry = 1; -#endif -#ifdef MSW - short version = MAKEWORD(2, 0); - WSADATA nobby; - - if (WSAStartup(version, &nobby)) pdgui_sockerror("setup"); -#endif - - /* create a socket */ - sockfd = socket(AF_INET, SOCK_STREAM, 0); - if (sockfd < 0) pdgui_sockerror("socket"); - - /* connect socket using hostname provided in command line */ - server.sin_family = AF_INET; - - hp = gethostbyname(hostname); - - if (hp == 0) - { - fprintf(stderr, - "localhost not found (inet protocol not installed?)\n"); - exit(1); - } - memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length); - - /* assign client port number */ - server.sin_port = htons((unsigned short)pd_portno); - - /* try to connect */ - while (1) - { - if (connect(sockfd, (struct sockaddr *) &server, sizeof (server)) >= 0) - goto gotit; - retry--; - if (retry <= 0) - break; - /* In unix there's a race condition; the child won't be - able to connect before the parent (pd) has shed its - setuid-ness. In case this is the problem, sleep and - retry. */ - else - { -#ifndef MSW - fd_set readset, writeset, exceptset; - struct timeval timout; - - timout.tv_sec = 0; - timout.tv_usec = 100000; - FD_ZERO(&writeset); - FD_ZERO(&readset); - FD_ZERO(&exceptset); - fprintf(stderr, "retrying connect...\n"); - if (select(1, &readset, &writeset, &exceptset, &timout) < 0) - perror("select"); -#endif /* !MSW */ - } - } - pdgui_sockerror("connecting stream socket"); -gotit: ; -#ifndef MSW - /* normally we ask TK to call us back; but in MSW we have to poll. */ - Tk_CreateFileHandler(sockfd, TK_READABLE | TK_EXCEPTION, - pd_readsocket, 0); -#endif /* !MSW */ -} - -#ifdef STARTGUI - -/* #define DEBUGCONNECT */ - -#ifdef DEBUGCONNECT -static FILE *debugfd; -#endif - - -static void pd_startfromgui( void) -{ - pid_t childpid; - char cmdbuf[1000], pdbuf[1000], *lastchar; - const char *arg0; - struct sockaddr_in server; - int msgsock; - int len = sizeof(server), nchar; - int ntry = 0, portno = FIRSTPORTNUM; - int xsock = -1; - char morebuf[256]; -#ifdef MSW - short version = MAKEWORD(2, 0); - WSADATA nobby; - char scriptbuf[1000], wishbuf[1000], portbuf[80]; - int spawnret; - char intarg; -#else - int intarg; -#endif - - arg0 = Tcl_GetVar(tk_pdinterp, "argv0", 0); - if (!arg0) - { - fprintf(stderr, "Pd-gui: can't get arg 0\n"); - return; - } - lastchar = strrchr(arg0, '/'); - if (lastchar) - snprintf(pdbuf, lastchar - arg0 + 1, "%s", arg0); - else strcpy(pdbuf, "."); - strcat(pdbuf, "/../bin/pd"); -#ifdef DEBUGCONNECT - fprintf(stderr, "pdbuf is %s\n", pdbuf); -#endif - -#ifdef MSW - if (WSAStartup(version, &nobby)) - pd_sockerror("WSAstartup"); -#endif - - /* create a socket */ - xsock = socket(AF_INET, SOCK_STREAM, 0); - if (xsock < 0) pd_sockerror("socket"); - intarg = 1; - if (setsockopt(xsock, IPPROTO_TCP, TCP_NODELAY, - &intarg, sizeof(intarg)) < 0) - fprintf(stderr, "setsockopt (TCP_NODELAY) failed\n"); - - server.sin_family = AF_INET; - server.sin_addr.s_addr = INADDR_ANY; - - /* assign server port number */ - server.sin_port = htons((unsigned short)portno); - - /* name the socket */ - while (bind(xsock, (struct sockaddr *)&server, sizeof(server)) < 0) - { -#ifdef MSW - int err = WSAGetLastError(); -#else - int err = errno; -#endif - if ((ntry++ > 20) || (err != EADDRINUSE)) - { - perror("bind"); - fprintf(stderr, - "couldn't open GUI-to-pd network connection\n"); - return; - } - portno++; - server.sin_port = htons((unsigned short)(portno)); - } - -#ifdef DEBUGCONNECT - fprintf(debugfd, "port %d\n", portno); - fflush(debugfd); -#endif - -#ifdef UNISTD - sprintf(cmdbuf, "\"%s\" -guiport %d\n", pdbuf, portno); - childpid = fork(); - if (childpid < 0) - { - if (errno) perror("sys_startgui"); - else fprintf(stderr, "sys_startgui failed\n"); - return; - } - else if (!childpid) /* we're the child */ - { -#ifdef DEBUGCONNECT - fprintf(debugfd, "%s", cmdbuf); - fflush(debugfd); -#endif - execl("/bin/sh", "sh", "-c", cmdbuf, (char*)0); - perror("pd: exec"); - _exit(1); - } -#endif /* UNISTD */ - -#ifdef MSW - -#error not yet used.... sys_bashfilename() not filled in here - - strcpy(cmdbuf, pdcmd); - strcat(cmdbuf, "/pd.exe"); - sys_bashfilename(scriptbuf, scriptbuf); - - sprintf(portbuf, "%d", portno); - - spawnret = _spawnl(P_NOWAIT, cmdbuf, "pd.exe", "-port", portbuf, 0); - if (spawnret < 0) - { - perror("spawnl"); - fprintf(stderr, "%s: couldn't start\n", cmdbuf); - return; - } - -#endif /* MSW */ - -#ifdef DEBUGCONNECT - fprintf(stderr, "Waiting for connection request... \n"); -#endif - if (listen(xsock, 5) < 0) pd_sockerror("listen"); - sockfd = accept(xsock, (struct sockaddr *) &server, (unsigned int *)&len); - if (sockfd < 0) pd_sockerror("accept"); -#ifdef DEBUGCONNECT - fprintf(stderr, "... connected\n"); -#endif - -#ifndef MSW - /* normally we ask TK to call us back; but in MSW we have to poll. */ - Tk_CreateFileHandler(sockfd, TK_READABLE | TK_EXCEPTION, - pd_readsocket, 0); -#endif /* !MSW */ -} - -#endif /* STARTGUI */ - -static void pdgui_setupsocket(void) -{ -#ifdef MSW - pdgui_connecttosocket(); -#else - if (pd_portno) - pdgui_connecttosocket(); - else pd_startfromgui() ; -#endif -} - -/**************************** commands ************************/ -static char *pdgui_path; - -/* The "pd" command, which cats its args together and throws the result -* at the Pd interpreter. -*/ -#define MAXWRITE 1024 - -static int pdCmd(ClientData cd, Tcl_Interp *interp, int argc, char **argv) -{ - if (argc == 2) - { - int n = strlen(argv[1]); - if (send(sockfd, argv[1], n, 0) < n) - { - perror("stdout"); - tcl_mess("exit\n"); - } - } - else - { - int i; - char buf[MAXWRITE]; - buf[0] = 0; - for (i = 1; i < argc; i++) - { - if (strlen(argv[i]) + strlen(buf) + 2 > MAXWRITE) - { - interp->result = "pd: arg list too long"; - return (TCL_ERROR); - } - if (i > 1) strcat(buf, " "); - strcat(buf, argv[i]); - } - if (send(sockfd, buf, strlen(buf), 0) < 0) - { - perror("stdout"); - tcl_mess("exit\n"); - } - } - return (TCL_OK); -} - -/*********** "c" level access to tk functions. ******************/ - -void tcl_mess(char *s) -{ - int result; - result = Tcl_Eval(tk_pdinterp, s); - if (result != TCL_OK) - { - if (*tk_pdinterp->result) printf("%s\n", tk_pdinterp->result); - } -} - - /* in linux, we load the tk code from here (in MSW and MACOS, this - is done by passing the name of the file as a startup argument to - the wish shell.) */ -#if !defined(MSW) && !defined(__APPLE__) -void pdgui_doevalfile(Tcl_Interp *interp, char *s) -{ - char buf[GUISTRING]; - 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]; - sprintf(buf2, "puts [concat tcl: %s: can't open script]\n", - buf); - tcl_mess(buf2); - } -} - -void pdgui_evalfile(char *s) -{ - pdgui_doevalfile(tk_pdinterp, s); -} -#endif - -void pdgui_startup(Tcl_Interp *interp) -{ - /* save pointer to the main interpreter */ - tk_pdinterp = interp; - - /* add our own TK commands */ - Tcl_CreateCommand(interp, "pd", (Tcl_CmdProc*)pdCmd, (ClientData)NULL, - (Tcl_CmdDeleteProc *)NULL); -#ifdef MSW - Tcl_CreateCommand(interp, "pd_pollsocket",(Tcl_CmdProc*) pd_pollsocketCmd, - (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL); -#endif - pdgui_setupsocket(); - /* read in the startup file */ -#if !defined(MSW) && !defined(__APPLE__) - pdgui_evalfile("pd.tk"); -#endif -} - -#ifndef MSW -void pdgui_setname(char *s) -{ - char *t; - char *str; - int n; - if (t = strrchr(s, '/')) str = s, n = (t-s) + 1; - else str = "./", n = 2; - if (n > GUISTRING-100) n = GUISTRING-100; - pdgui_path = malloc(n+9); - - strncpy(pdgui_path, str, n); - while (strlen(pdgui_path) > 0 && pdgui_path[strlen(pdgui_path)-1] == '/') - pdgui_path[strlen(pdgui_path)-1] = 0; - if (t = strrchr(pdgui_path, '/')) - *t = 0; -} -#endif - - /* this is called when an off-the-shelf "wish" has to "load" this module - at runtime. In Linux, this module is linked in and Pdtcl_Init() is not - called; instead, the code in t_main.c calls pdgui_setsock() and - pdgui_startup(). */ - -int Pdtcl_Init(Tcl_Interp *interp) -{ - const char *argv = Tcl_GetVar(interp, "argv", 0); - int portno, argno = 0; - if (argv && (portno = atoi(argv)) > 1) - pdgui_setsock(portno); -#ifdef DEBUGCONNECT - pd_portno = portno; - debugfd = fopen("/tmp/bratwurst", "w"); - fprintf(debugfd, "turning stderr back on\n"); - fflush(debugfd); - dup2(fileno(debugfd), 2); - fprintf(stderr, "duped to stderr?\n"); - fprintf(stderr, "portno %d\n", pd_portno); - fprintf(stderr, "argv %s\n", argv); -#endif - tk_pdinterp = interp; - pdgui_startup(interp); - interp->result = "loaded pdtcl_init"; - - return (TCL_OK); -} - -#if 0 -int Pdtcl_SafeInit(Tcl_Interp *interp) { - fprintf(stderr, "Pdtcl_Safeinit 51\n"); - return (TCL_OK); -} -#endif - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10523] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10523 http://pure-data.svn.sourceforge.net/pure-data/?rev=10523&view=rev Author: eighthave Date: 2009-01-13 00:01:34 +0000 (Tue, 13 Jan 2009) Log Message: ----------- - made stricter checking of args to make sure pd-gui understands whether pd is starting it, or whether it should start pd - added filetypes to proc init for each platform - replaced [concat] with "" where appropriate Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_menucommands.tcl Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-12 23:01:33 UTC (rev 10522) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 00:01:34 UTC (rev 10523) @@ -1,4 +1,4 @@ -#!/usr/bin/wish +#!/usr/bin/env wish # For information on usage and redistribution, and for a DISCLAIMER OF ALL # WARRANTIES, see the file, "LICENSE.txt," in this distribution. # Copyright (c) 1997-2009 Miller Puckette. @@ -92,11 +92,26 @@ catch {tk_getOpenFile -with-invalid-argument} set ::tk::dialog::file::showHiddenBtn 1 set ::tk::dialog::file::showHiddenVar 0 + # set file types that open/save recognize + set filetypes { + {{pd files} {.pd} } + {{max text files} {.pat} } + } } "aqua" { + # set file types that open/save recognize + set filetypes { + {{Pd Files} {.pd} } + {{Max Text Files (.pat)} {.pat} } + } } "win32" { font create menufont -family Tahoma -size -11 + # set file types that open/save recognize + set filetypes { + {{Pd Files} {.pd} } + {{Max Text Files} {.pat} } + } } } } @@ -115,12 +130,19 @@ # canvas support functions ##### routine to ask user if OK and, if so, send a message on to Pd ###### -proc pdtk_check {x message default} { - set answer [tk_messageBox \-message $x \-type yesno -default $default \ - -icon question] - if {! [string compare $answer yes]} {pd $message} +proc pdtk_check {message reply_to_pd default} { + # TODO this should use -parent and -title, but the hard part is figuring + # out how to get the values for those without changing g_editor.c + set answer [tk_messageBox -type yesno -icon question \ + -default $default -message $message] + if {$answer eq "yes"} { + pd $reply_to_pd + } } +# TODO it probably makes sense to add a new function for -type yesnocancel +# dialogs that would be useful for "Save, Discard, Cancel" dialogs + proc pdtk_fixwindowmenu {} { #TODO figure out how to do this cleanly puts stderr "Running pdtk_fixwindowmenu" @@ -173,14 +195,9 @@ label .placeholder.label -text "Pd window placeholder" -width 80 -height 15 pack .placeholder.label .placeholder -side top -expand yes -fill both - if {$argc == 1} { - # 'pd' is starting first, so get the port to connect to - set portnumber [lindex $argv 0] - if { ! [string is int $portnumber]} { - puts stderr "ERROR: port $portnumber is not an int, exiting!" - exit 2 - } - ::pd_connect::to_pd $portnumber + if { $argc == 1 && [string is int [lindex $argv 0]]} { + # 'pd' started first and launched us, so get the port to connect to + ::pd_connect::to_pd [lindex $argv 0] } else { # the GUI is starting first, so create socket and exec 'pd' set portnumber [::pd_connect::create_socket] Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-12 23:01:33 UTC (rev 10522) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-13 00:01:34 UTC (rev 10523) @@ -40,54 +40,72 @@ } proc ::pd_menucommands::menu_open {} { - global pd_opendir + global pd_opendir filetypes set filename [tk_getOpenFile -defaultextension .pd \ - -filetypes { {{pd files} {.pd}} {{max files} {.pat}}} \ - -initialdir $pd_opendir] - if {$filename != ""} {open_file $filename} + -filetypes $filetypes \ + -initialdir $pd_opendir] + if {$filename ne ""} { + open_file $filename + } } proc ::pd_menucommands::menu_close {name} { - pd [concat $name menuclose 0 \;] + pd "$name menuclose 0 ;" } +proc ::pd_menucommands::menu_save {name} { + pd "$name menusave ;" +} + +proc ::pd_menucommands::menu_saveas {name} { + pd "$name menusaveas ;" +} + +proc menu_really_quit {} { + pd "pd quit ;" +} + +proc menu_quit {} { + pd "pd verifyquit ;" +} + # ------------------------------------------------------------------------------ # functions called from Edit menu proc ::pd_menucommands::menu_cut {name} { - pd [concat $name cut \;] + pd "$name cut ;" } proc ::pd_menucommands::menu_copy {name} { - pd [concat $name copy \;] + pd "$name copy ;" } proc ::pd_menucommands::menu_paste {name} { - pd [concat $name paste \;] + pd "$name paste ;" } proc ::pd_menucommands::menu_duplicate {name} { - pd [concat $name duplicate \;] + pd "$name duplicate ;" } proc ::pd_menucommands::menu_selectall {name} { - pd [concat $name selectall \;] + pd "$name selectall ;" } proc ::pd_menucommands::menu_texteditor {name} { - pd [concat $name texteditor \;] + pd "$name texteditor ;" } proc ::pd_menucommands::menu_font {name} { - pd [concat $name menufont \;] + pd "$name menufont ;" } proc ::pd_menucommands::menu_tidyup {name} { - pd [concat $name tidy \;] + pd "$name tidy ;" } proc ::pd_menucommands::menu_editmode {name} { - pd [concat $name editmode 0 \;] + pd "$name editmode 0 ;" } proc ::pd_menucommands::menu_preferences {args} { @@ -101,68 +119,68 @@ # functions called from Put menu proc ::pd_menucommands::menu_object {name accel} { - pd [concat $name obj $accel \;] + pd "$name obj $accel ;" } proc ::pd_menucommands::menu_message {name accel} { - pd [concat $name msg $accel \;] + pd "$name msg $accel ;" } proc ::pd_menucommands::menu_floatatom {name accel} { - pd [concat $name floatatom $accel \;] + pd "$name floatatom $accel ;" } proc ::pd_menucommands::menu_symbolatom {name accel} { - pd [concat $name symbolatom $accel \;] + pd "$name symbolatom $accel ;" } proc ::pd_menucommands::menu_comment {name accel} { - pd [concat $name text $accel \;] + pd "$name text $accel ;" } proc ::pd_menucommands::menu_graph {name} { - pd [concat $name graph \;] + pd "$name graph ;" } proc ::pd_menucommands::menu_array {name} { - pd [concat $name menuarray \;] + pd "$name menuarray ;" } ############iemlib################## proc ::pd_menucommands::menu_bng {name accel} { - pd [concat $name bng $accel \;] + pd "$name bng $accel ;" } proc ::pd_menucommands::menu_toggle {name accel} { - pd [concat $name toggle $accel \;] + pd "$name toggle $accel ;" } proc ::pd_menucommands::menu_numbox {name accel} { - pd [concat $name numbox $accel \;] + pd "$name numbox $accel ;" } proc ::pd_menucommands::menu_vslider {name accel} { - pd [concat $name vslider $accel \;] + pd "$name vslider $accel ;" } proc ::pd_menucommands::menu_hslider {name accel} { - pd [concat $name hslider $accel \;] + pd "$name hslider $accel ;" } proc ::pd_menucommands::menu_hradio {name accel} { - pd [concat $name hradio $accel \;] + pd "$name hradio $accel ;" } proc ::pd_menucommands::menu_vradio {name accel} { - pd [concat $name vradio $accel \;] + pd "$name vradio $accel ;" } proc ::pd_menucommands::menu_vumeter {name accel} { - pd [concat $name vumeter $accel \;] + pd "$name vumeter $accel ;" } proc ::pd_menucommands::menu_mycnv {name accel} { - pd [concat $name mycnv $accel \;] + pd "$name mycnv $accel ;" } # ------------------------------------------------------------------------------ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
36
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 January 2009