diff options
author | Walter Bender <walter@walter-laptop.(none)> | 2009-08-18 17:48:06 (GMT) |
---|---|---|
committer | Walter Bender <walter@walter-laptop.(none)> | 2009-08-18 17:48:06 (GMT) |
commit | b485b83208cf685dafb685f266303ef20a5d295f (patch) | |
tree | 18257c7de0630d4c409d4e63a16f5ba1a87288fc | |
parent | 8fb25ab86ba6c91645135e53aa7e4be01ff1cebe (diff) |
allow stack to accept pop blocks
-rw-r--r-- | tawindow.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tawindow.py b/tawindow.py index 033b245..518d007 100644 --- a/tawindow.py +++ b/tawindow.py @@ -486,8 +486,9 @@ def dock_dx_dy(block1,dock1n,block2,dock2n): if d1type!=d2type: # some blocks can take strings or nums if block1.proto.name in ('write', 'plus2', 'equal', 'less', 'greater', \ - 'template1', 'template2', 'template3', 'template4', \ - 'template6', 'template7', 'nop', 'print'): + 'template1', 'template2', 'template3', \ + 'template4', 'template6', 'template7', 'nop', \ + 'print', 'stack'): if block1.proto.name == 'write' and d1type == 'string': if d2type == 'num' or d2type == 'string': pass @@ -495,7 +496,8 @@ def dock_dx_dy(block1,dock1n,block2,dock2n): if d2type == 'num' or d2type == 'string': pass # some blocks can take strings, nums, or Journal - elif block1.proto.name in ('show', 'push', 'storein', 'storeinbox1', 'storeinbox2'): + elif block1.proto.name in ('show', 'push', 'storein', 'storeinbox1', \ + 'storeinbox2'): if d2type == 'num' or d2type == 'string' or d2type == 'journal': pass # some blocks can take media, audio, movies, of descriptions @@ -541,9 +543,9 @@ def keypress_cb(area, event, tw): hasattr(tw.activity, 'chattube') and tw.activity.chattube is not None: # print "key press" if alt_mask: - tw.activity._send_event("k:"+'T'+":"+keyname+":"+keyunicode) + tw.activity._send_event("k:"+'T'+":"+keyname+":"+str(keyunicode)) else: - tw.activity._send_event("k:"+'F'+":"+keyname+":"+keyunicode) + tw.activity._send_event("k:"+'F'+":"+keyname+":"+str(keyunicode)) return keyname ''' if len(keyname)>1: |