From 21c068f1916330e90f814bed461fe0821d1665ec Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sun, 9 Oct 2011 16:36:37 +0000
Subject: checked in pd-0.43-0.src.tar.gz

svn path=/trunk/; revision=15557
---
 pd/tcl/pd_connect.tcl | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'pd/tcl/pd_connect.tcl')

diff --git a/pd/tcl/pd_connect.tcl b/pd/tcl/pd_connect.tcl
index cdd3d91d..5bb3f29f 100644
--- a/pd/tcl/pd_connect.tcl
+++ b/pd/tcl/pd_connect.tcl
@@ -12,18 +12,17 @@ namespace eval ::pd_connect:: {
 # TODO figure out how to escape { } properly
 
 proc ::pd_connect::configure_socket {sock} {
-    fconfigure $sock -blocking 0 -buffering line -encoding utf-8;
+    fconfigure $sock -blocking 0 -buffering none -encoding utf-8;
     fileevent $sock readable {::pd_connect::pd_readsocket ""}
 }
 
 # if pd opens first, it starts pd-gui, then pd-gui connects to the port pd sent
-proc ::pd_connect::to_pd {port} {
-    # puts "::pd_connect::to_pd"
+proc ::pd_connect::to_pd {port {host localhost}} {
     variable pd_socket
-    # puts stderr "Connecting to localhost $port ..."
-    if {[catch {set pd_socket [socket localhost $port]}]} {
-        puts stderr "WARNING: connect to pd failed, retrying port $port."
-        after 1000 ::pd_connect::to_pd $port
+    ::pdwindow::debug "'pd-gui' connecting to 'pd' on localhost $port ...\n"
+    if {[catch {set pd_socket [socket $host $port]}]} {
+        puts stderr "WARNING: connect to pd failed, retrying port $host:$port."
+        after 1000 ::pd_connect::to_pd $port $host
         return
     }
     ::pd_connect::configure_socket $pd_socket
@@ -40,15 +39,15 @@ proc ::pd_connect::create_socket {} {
 }
 
 proc ::pd_connect::from_pd {channel clientaddr clientport} {
-    puts "::pd_connect::from_pd"
     variable pd_socket $channel
-    puts "Connection from $clientaddr:$clientport registered"
+    ::pdwindow::debug "Connection from 'pd' to 'pd-gui' on $clientaddr:$clientport\n"
     ::pd_connect::configure_socket $pd_socket
 }
 
 # send a pd/FUDI message from Tcl to Pd. This function aims to behave like a
-# [; message( in Pd.  Basically, whatever is in quotes after the proc name
-# will be sent as if it was sent from a message box with a leading semi-colon
+# [; message( in Pd or pdsend on the command line.  Basically, whatever is in
+# quotes after the proc name will be sent as if it was sent from a message box
+# with a leading semi-colon.
 proc ::pd_connect::pdsend {message} {
     variable pd_socket
     append message \;
@@ -74,18 +73,15 @@ proc ::pd_connect::pd_readsocket {cmd_from_pd} {
         exit
         }
     }
-#        puts stderr [concat CMD: $cmd_from_pd :CMD]
     if {[catch {uplevel #0 $cmd_from_pd} errorname]} {
         global errorInfo
-        puts stderr "errorname: >>$errorname<<"
         switch -regexp -- $errorname { 
             "missing close-brace" {
-                # TODO consider using [info complete $cmd_from_pd] in a loop
                 pd_readsocket $cmd_from_pd
             } "^invalid command name" {
-                puts stderr "INVALID COMMAND NAME: $errorInfo"
+                ::pdwindow::fatal [concat [_ "(Tcl) INVALID COMMAND NAME: "] $errorInfo "\n"]
             } default {
-                puts stderr "UNHANDLED ERROR: $errorInfo"
+                ::pdwindow::fatal [concat [_ "(Tcl) UNHANDLED ERROR: "] $errorInfo "\n"]
             }
         }
     }
-- 
cgit v1.2.1