Re: [9front] patch: tweak plumb support

[sirjofri+ml-9front@sirjofri.de]

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

Hello,

this version adds experimental plumb support for direct file data
(action=showdata).  It just creates temporary files in
/tmp/tweaktmp.XXX, and does currently not clean the files after
closing (this could also be considered a feature).

The patch also includes adjustments to the man page.

If you want to test it, you need to "create" the imageedit channel:

echo plumb to imageedit >> /mnt/plumb/rules


sirjofri

.

[-- Attachment #2: Type: text/plain, Size: 3313 bytes --]

diff -r bdf5af28b857 sys/man/1/tweak
--- a/sys/man/1/tweak	Fri Dec 04 09:33:55 2020 +0100
+++ b/sys/man/1/tweak	Sat Dec 05 16:04:47 2020 +0100
@@ -155,6 +155,18 @@
 Quit
 .IR tweak .
 The program will complain once about modified but unwritten files.
+.PP
+.I Tweak
+listens to the
+.I plumber
+channel
+.B imageedit
+for filenames as well as image data. Plumbed image data is stored as files in
+.B /tmp
+and is
+.I not
+cleaned after exiting
+.IR tweak .
 .SH SOURCE
 .B /sys/src/cmd/tweak.c
 .SH "SEE ALSO"
diff -r bdf5af28b857 sys/src/cmd/tweak.c
--- a/sys/src/cmd/tweak.c	Fri Dec 04 09:33:55 2020 +0100
+++ b/sys/src/cmd/tweak.c	Sat Dec 05 16:04:47 2020 +0100
@@ -3,8 +3,11 @@
 #include <draw.h>
 #include <cursor.h>
 #include <event.h>
+#include <plumb.h>
 #include <bio.h>
 
+#define Eplumb 128
+
 typedef struct	Thing	Thing;
 
 struct Thing
@@ -157,6 +160,7 @@
 int		but1val = 0;
 int		but2val = 255;
 int		invert = 0;
+int		blockinput = 0;
 Image		*values[256];
 Image		*greyvalues[256];
 uchar		data[8192];
@@ -172,12 +176,24 @@
 void	tclose1(Thing*);
 
 void
+flushevents(ulong keys)
+{
+	Event e;
+	if(keys == 0)
+		return;
+	while(ecanread(keys))
+		eread(keys, &e);
+}
+
+void
 main(int argc, char *argv[])
 {
-	int i;
+	int i, n;
 	Event e;
 	Thing *t;
+	Plumbmsg *pm;
 
+	srand(time(0));
 	mag = Mag;
 	if(initdraw(error, 0, "tweak") < 0){
 		fprint(2, "tweak: initdraw failed: %r\n");
@@ -190,6 +206,7 @@
 			drawerror(display, "can't allocate image");
 	}
 	einit(Emouse|Ekeyboard);
+	eplumb(Eplumb, "imageedit");
 	eresized(0);
 	i = 1;
 	setjmp(err);
@@ -214,6 +231,62 @@
 			}
 			if(mouse.buttons & 4)
 				menu();
+			break;
+		case Eplumb:
+			pm = e.v;
+			if(pm->ndata == 0)
+				break;
+			if(strcmp(plumblookup(pm->attr, "action"), "showdata") == 0){
+				n = 0;
+			   Tmpretry:
+				file = smprint("/tmp/tweaktmp.%d", rand());
+				if(file == 0){
+					mesg("malloc failed: %r");
+					goto Plumbout;
+				}
+				i = create(file, OWRITE|OEXCL, 0600);
+				if(i == 0){
+					free(file);
+					if(n++ < 10)
+						goto Tmpretry;
+					else{
+						mesg("cannot create tmpfiles: too many attempts");
+						goto Plumberrout;
+					}
+				}
+				if(write(i, pm->data, pm->ndata) != pm->ndata){
+					mesg("error writing tmpfile: %r");
+					close(i);
+					free(file);
+					goto Plumberrout;
+				}
+				close(i);
+				goto Plumbout;
+			}
+			file = malloc(pm->ndata+1);
+			if(file == 0){
+				mesg("malloc failed: %r");
+				goto Plumberrout;
+			}
+			strncpy(file, pm->data, pm->ndata);
+			file[pm->ndata] = 0;
+			free(pm->data);
+			pm->data = file;
+			switch(pm->data[0]){
+			case '/':
+				file = pm->data;
+				break;
+			default:
+				file = smprint("%s/%s", pm->wdir, pm->data);
+			}
+		   Plumbout:
+			t = tget(file);
+			if(t)
+				drawthing(t, 1);
+			flushimage(display, 1);
+			file = 0;
+		   Plumberrout:
+			plumbfree(pm);
 		}
 }
 
@@ -531,6 +604,12 @@
 	nt->tr.max.y = nt->tr.min.y + nl;
 	nt->er.max.y = nt->tr.max.y + Border;
 	text(nt);
+
+	mesg("");
+	if(blockinput){
+		flushevents(Emouse|Ekeyboard);
+		blockinput = 0;
+	}
 }
 
 int
@@ -557,6 +636,9 @@
 	uchar buf[256];
 	char *data;
 
+	mesg("reading %s", file);
+	blockinput = 1;
+
 	buf[0] = '\0';
 	errstr((char*)buf, sizeof buf);	/* flush pending error message */
 	memmove(oerr, err, sizeof err);