From f3244a984bcf487cbaf4382ac56186592179dd37 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Tue, 6 Nov 2007 06:13:16 +0000
Subject: minor cleanups

svn path=/trunk/externals/bbogart/; revision=8945
---
 entry/entry-help.pd | 60 +++++++++++++++++++++++++++++------------------------
 entry/entry.c       |  8 +++----
 2 files changed, 37 insertions(+), 31 deletions(-)

(limited to 'entry')

diff --git a/entry/entry-help.pd b/entry/entry-help.pd
index 18c3196..be5309d 100644
--- a/entry/entry-help.pd
+++ b/entry/entry-help.pd
@@ -1,4 +1,4 @@
-#N canvas 172 88 781 680 10;
+#N canvas 172 88 801 700 10;
 #X obj 72 208 entry 150 100 grey black;
 #X obj 11 84 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
@@ -19,7 +19,7 @@ The width and height are in pixels.;
 #X msg 219 430 size 400 200;
 #X msg 6 4 bgcolour grey;
 #X msg 52 52 fgcolour black;
-#X text 12 394 The size message currently only takes affect after a
+#X text 12 396 The size message currently only takes affect after a
 save and reopen.;
 #X msg 138 117 append seven eight nine;
 #X msg 142 137 append ten eleven.;
@@ -27,7 +27,7 @@ save and reopen.;
 #X msg 52 432 12;
 #X msg 20 431 9;
 #X msg 85 429 98;
-#X obj 166 18 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/text.htm
+#X obj 148 31 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/text.htm
 ;
 #X obj 442 91 entry 300 50 grey70 black;
 #X msg 572 67 option relief \$1;
@@ -76,7 +76,6 @@ save and reopen.;
 #X obj 39 650 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/cursors.htm
 ;
 #X msg 49 521 boat;
-#X msg 84 521 bogosity;
 #X msg 52 577 option cursor \$1;
 #X msg 9 521 clock;
 #X msg 145 521 dot;
@@ -86,8 +85,6 @@ save and reopen.;
 #X msg 266 590 pirate;
 #X msg 266 547 mouse;
 #X msg 266 569 target;
-#X text 174 615 for more:;
-#X msg 266 611 trek;
 #X msg 384 194 option insertwidth \$1;
 #X obj 386 48 hsl 128 15 0 127 0 0 empty empty empty -2 -6 0 10 -262144
 -1 -1 0 1;
@@ -106,6 +103,13 @@ save and reopen.;
 #X text 337 488 type single chars:;
 #X msg 411 535 key a;
 #X msg 412 557 key 9;
+#X obj 329 650 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/cursors.htm
+;
+#X text 156 630 for more cursors:;
+#X text 327 636 for more keynums:;
+#X msg 403 516 key 65228;
+#X msg 266 611 pencil;
+#X msg 84 521 coffee_mug;
 #X connect 0 0 2 0;
 #X connect 0 0 10 0;
 #X connect 0 1 9 0;
@@ -142,8 +146,8 @@ save and reopen.;
 #X connect 38 0 36 0;
 #X connect 39 0 35 0;
 #X connect 40 0 35 0;
-#X connect 41 0 93 0;
-#X connect 42 0 93 0;
+#X connect 41 0 90 0;
+#X connect 42 0 90 0;
 #X connect 43 0 7 0;
 #X connect 47 0 50 0;
 #X connect 49 0 55 0;
@@ -159,29 +163,31 @@ save and reopen.;
 #X connect 61 0 49 0;
 #X connect 62 0 49 0;
 #X connect 63 0 49 0;
-#X connect 65 0 82 0;
-#X connect 67 0 71 0;
+#X connect 65 0 79 0;
+#X connect 67 0 70 0;
 #X connect 69 0 67 0;
-#X connect 70 0 67 0;
-#X connect 71 0 66 0;
+#X connect 70 0 66 0;
+#X connect 71 0 67 0;
+#X connect 72 0 67 0;
 #X connect 73 0 67 0;
 #X connect 74 0 67 0;
 #X connect 75 0 67 0;
 #X connect 76 0 67 0;
 #X connect 77 0 67 0;
 #X connect 78 0 67 0;
-#X connect 79 0 67 0;
-#X connect 81 0 67 0;
-#X connect 82 0 64 0;
-#X connect 83 0 84 0;
-#X connect 84 0 26 0;
-#X connect 85 0 48 0;
-#X connect 86 0 85 0;
-#X connect 87 0 0 0;
-#X connect 88 0 0 0;
-#X connect 89 0 90 0;
-#X connect 89 0 91 0;
-#X connect 90 0 94 0;
-#X connect 92 0 0 0;
-#X connect 96 0 94 0;
-#X connect 97 0 94 0;
+#X connect 79 0 64 0;
+#X connect 80 0 81 0;
+#X connect 81 0 26 0;
+#X connect 82 0 48 0;
+#X connect 83 0 82 0;
+#X connect 84 0 0 0;
+#X connect 85 0 0 0;
+#X connect 86 0 87 0;
+#X connect 86 0 88 0;
+#X connect 87 0 91 0;
+#X connect 89 0 0 0;
+#X connect 93 0 91 0;
+#X connect 94 0 91 0;
+#X connect 98 0 91 0;
+#X connect 99 0 67 0;
+#X connect 100 0 67 0;
diff --git a/entry/entry.c b/entry/entry.c
index 0339d4f..19ad3ba 100644
--- a/entry/entry.c
+++ b/entry/entry.c
@@ -22,6 +22,7 @@
 #include <string.h>
 
 /* TODO: get Ctrl-A working to select all */
+/* TODO: make Ctrl-w bind to window close on parent canvas */
 /* TODO: make [size( message redraw object */
 /* TODO: set message doesnt work with a loadbang */
 /* TODO: complete inlet draw/erase logic */
@@ -291,7 +292,6 @@ static void entry_drawme(t_entry *x, t_glist *glist, int firsttime)
         sys_vgui(".x%x.c coords %xS %d %d\n", canvas, x,
                  text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist));
     }
-    post("canvas: %d  glist: %d", canvas->gl_edit, glist->gl_edit); 
     if( (x->x_glist->gl_edit) && (canvas == x->x_glist) )
         draw_inlets(x, glist, firsttime, 1,2);
     else
@@ -571,11 +571,11 @@ static void entry_save(t_gobj *z, t_binbuf *b)
 {
     t_entry *x = (t_entry *)z;
     
-    binbuf_addv(b, "ssiisiiss", gensym("#X"),gensym("obj"),
+    binbuf_addv(b, "ssiisiiss;", &s__X, gensym("obj"),
                 x->x_obj.te_xpix, x->x_obj.te_ypix, 
                 atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
                 x->x_width, x->x_height, x->x_bgcolour, x->x_fgcolour);
-    binbuf_addv(b, ";");
+/*     binbuf_addv(b, ";"); */
 }
 
 
@@ -788,7 +788,7 @@ void entry_setup(void) {
 	up_symbol = gensym("up");
 	down_symbol = gensym("down");
     
-	post("Text v0.1 Ben Bogart.\nCVS: $Revision: 1.22 $ $Date: 2007-10-30 03:59:52 $");
+	post("Text v0.1 Ben Bogart.\nCVS: $Revision: 1.23 $ $Date: 2007-11-06 06:13:16 $");
 }
 
 
-- 
cgit v1.2.1