From 14f7a42c1e92eca1350d59f18ca7f94892e8b4ed Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Mon, 23 Mar 2015 20:50:01 -0700
Subject: [PATCH 1/2] Lose some printfs.

---
 main/app/dojo/core.hook | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/app/dojo/core.hook b/main/app/dojo/core.hook
index 188f844822..5d63ff0479 100644
--- a/main/app/dojo/core.hook
+++ b/main/app/dojo/core.hook
@@ -609,7 +609,7 @@
     ::  ~&  [%our-clock ven.say]
     =^  dat  say  (~(transceive cs say) cal)
     ?.  ?&  ?=(%del -.dat)
-            ::  =(+(p.dat) (lent buf.say))
+            =(+(p.dat) (lent buf.say))
         ==
       +>.$
     =+  foy=(he-dope (tufa buf.say))

From 315c321d6509bdc90770034b26b4937901c32c82 Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Tue, 24 Mar 2015 15:56:11 -0700
Subject: [PATCH 2/2] Fix gall backpressure from seat.

---
 arvo/dill.hoon             |  8 +++++++-
 main/app/dojo/core.hook    |  2 +-
 main/app/seat/core.hook    | 21 +++++++++++++++------
 main/sur/console/core.hook |  1 +
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/arvo/dill.hoon b/arvo/dill.hoon
index 167bbd560f..b0df46de76 100644
--- a/arvo/dill.hoon
+++ b/arvo/dill.hoon
@@ -49,6 +49,7 @@
   $%  [%bel ~]                                          ::  make a noise
       [%clr ~]                                          ::  clear the screen
       [%hop p=@ud]                                      ::  set cursor position
+      [%mor p=(list dill-blit)]                         ::  multiple blits
       [%pro p=(list ,@c)]                               ::  show as cursor/line
       [%out p=(list ,@c)]                               ::  send output line
       [%sag p=path q=*]                                 ::  save to jamfile
@@ -236,6 +237,10 @@
       ++  from                                          ::  receive belt
         |=  bit=dill-blit
         ^+  +>
+        ?:  ?=(%mor -.bit)
+          |-  ^+  +>.^$
+          ?~  p.bit  +>.^$
+          $(p.bit t.p.bit, +>.^$ ^$(bit i.p.bit))
         ?:  ?=(%out -.bit)
           %+  done  %blit
           :~  [%lin p.bit]
@@ -250,6 +255,7 @@
         (done %blit [bit ~])
       ::
       ++  init                                          ::  initialize
+        ~&  [%dill-init our]
         =+  myt=(flop (need tem))
         =.  tem  ~
         =.  moz  :_(moz [hen %pass ~ %g %show [our [ram ~]] our ~])
@@ -376,7 +382,7 @@
     =+  ^=  flo  ^-  (list (pair ship term))
         =+  myr=(clan p.q.hic)
         ?:  =(%pawn myr)
-          ~
+          [p.q.hic %dojo]~
         ?:  =(%earl myr)
           =+  fap=(sein p.q.hic)
           [[fap %dojo] [fap %talk] ~]
diff --git a/main/app/dojo/core.hook b/main/app/dojo/core.hook
index 5d63ff0479..0110e485f1 100644
--- a/main/app/dojo/core.hook
+++ b/main/app/dojo/core.hook
@@ -215,7 +215,7 @@
     ++  dp-model-sic  ;~(plug dp-server-sic dp-config)  ::  ++dojo-model
     ++  dp-server-gun   (stag 0 (stag %gun dp-device))  ::  ++dojo-server
     ++  dp-server-sic   (stag 0 (stag %sic dp-device))  ::  ++dojo-server
-    ++  dp-twig         wide:(vang & ~)                 ::  ++twig
+    ++  dp-twig         long:(vang & ~)                 ::  ++twig
     ++  dp-device       (most fas sym)                  ::  ++dojo-device
     ++  dp-value                                        ::  ++dojo-source
       %+  cook  |=(a=dojo-source a)
diff --git a/main/app/seat/core.hook b/main/app/seat/core.hook
index 5a08d8b98b..c4990328bd 100644
--- a/main/app/seat/core.hook
+++ b/main/app/seat/core.hook
@@ -98,9 +98,16 @@
         ==
   --
 ++  se                                                  ::  per source
-  |_  [moz=(list move) [her=ship ost=bone] source]
+  |_  $:  [moz=(list move) biz=(list dill-blit)]
+          [her=ship ost=bone] 
+          source
+      ==
   ++  se-abet                                           ::  resolve
-    [(flop moz) %_(+> bin (~(put by bin) ost +<+>))]
+    :_  %_(+> bin (~(put by bin) ost +<+>))
+    %+  welp  (flop moz) 
+    ^-  (list move)
+    ?~  biz  ~
+    [ost %give %rush %dill-blit ?~(t.biz i.biz [%mor (flop biz)])]~
   ::
   ++  se-belt                                           ::  handle input
     |=  bet=dill-belt
@@ -195,7 +202,7 @@
   ::
   ++  se-blit                                           ::  give output
     |=  bil=dill-blit
-    (se-emit ost %give %rush %dill-blit bil)
+    +>(biz [bil biz])
   ::
   ++  se-show                                           ::  show buffer, raw
     |=  lin=(pair ,@ud (list ,@c))
@@ -577,6 +584,7 @@
 ++  peer
   |=  [ost=bone her=ship pax=path]
   ^-  [(list move) _+>]
+  ~&  [%seat-peer ost her pax]
   ?<  (~(has by bin) ost)
   :-  [ost %give %rush %dill-blit %pro [`@c`0x23 `@c`0x20 ~]]~
   %=    +>
@@ -603,17 +611,18 @@
   ^-  [(list move) _+>]
   =<  se-abet
   =<  se-view
-  (~(se-belt se [ost %give %nice ~]~ [her ost] (~(got by bin) ost)) bet)
+  (~(se-belt se [[ost %give %nice ~]~ ~] [her ost] (~(got by bin) ost)) bet)
 ::
 ++  pour
   |=  [ost=bone pax=path sih=*]
   ^-  [(list move) _+>]
+  ~?  =(~ (~(get by bin) ost))  [%seat-pour ost pax]
   =+  sih=((hard sign) sih)
   ?>  ?=([@ @ @ ~] pax)
   =<  se-abet
   =<  se-view
   =+  gyl=[(slav %p i.t.pax) i.t.t.pax]
-  (~(se-pour se ~ [(slav %p i.pax) ost] (~(got by bin) ost)) gyl +.sih)
+  (~(se-pour se [~ ~] [(slav %p i.pax) ost] (~(got by bin) ost)) gyl +.sih)
 ::
 ++  pull
   |=  ost=bone
@@ -621,6 +630,6 @@
   =^  moz  +>  
     =<  se-abet
     =<  se-view
-    ~(se-kill se ~ [our.hid ost] (~(got by bin) ost))
+    ~(se-kill se [~ ~] [our.hid ost] (~(got by bin) ost))
   [moz +>.$(bin (~(del by bin) ost))]
 --
diff --git a/main/sur/console/core.hook b/main/sur/console/core.hook
index 2911169d00..fbb405e13a 100644
--- a/main/sur/console/core.hook
+++ b/main/sur/console/core.hook
@@ -105,6 +105,7 @@
   $%  [%bel ~]                                          ::  make a noise
       [%clr ~]                                          ::  clear the screen
       [%hop p=@ud]                                      ::  set cursor position
+      [%mor p=(list dill-blit)]                         ::  multiple blits
       [%pro p=(list ,@c)]                               ::  show as cursor/line
       [%out p=(list ,@c)]                               ::  send output line
       [%sag p=path q=*]                                 ::  save to jamfile