shithub: sam

Info  •  Files  •  Log  •  Branches

Missed some files.

--- a/sam/mesg.c

+++ b/sam/mesg.c

@@ -27,7 +27,6 @@

 void	setgenstr(File*, Posn, Posn);

-#ifdef DEBUG

 char *hname[] = {

 	[Hversion]	"Hversion",

 	[Hbindname]	"Hbindname",

@@ -87,40 +86,12 @@

 	[Tmenucmdsend]	"Tmenucmdsend",

 };

-void

-journal(int out, char *s)

-{

-	static int fd = -1;

+/* todo: add -d option. */

+int	debug;

+#define	journal(a, b) if(debug) debug = 1;

+#define journaln(a, b) if(debug) debug = 1;

+#define journalv(a, b) if(debug) debug = 1;

-	if(fd < 0)

-		fd = create("/tmp/sam.out", 1, 0666L);

-	if(fd >= 0)

-		fprint(fd, "%s%s\n", out? "out: " : "in:  ", s);

-}

-

-void

-journaln(int out, long n)

-{

-	char buf[32];

-

-	snprint(buf, sizeof(buf), "%ld", n);

-	journal(out, buf);

-}

-

-void

-journalv(int out, vlong v)

-{

-	char buf[32];

-

-	sprint(buf, sizeof(buf), "%lld", v);

-	journal(out, buf);

-}

-#else

-#define	journal(a, b)

-#define journaln(a, b)

-#define journalv(a, b)

-#endif

-

 int

 rcvchar(void){

 	static uchar buf[64];

@@ -259,9 +230,9 @@

 		journaln(0, p1-p0);

 		if(f->unread)

 			panic("Trequest: unread");

-		if(p1>f->nc)

+		if(p1 > f->nc)

 			p1 = f->nc;

-		if(p0>f->nc) /* can happen e.g. scrolling during command */

+		if(p0 > f->nc) /* can happen e.g. scrolling during command */

 			p0 = f->nc;

 		if(p0 == p1){

 			i = 0;

@@ -271,16 +242,20 @@

 			i = r.p2-r.p1;

 			bufread(f, r.p1, buf, i);

 		}

-		buf[i]=0;

+		buf[i] = 0;

 		outTslS(Hdata, f->tag, r.p1, tmprstr(buf, i+1));

 		break;

 	case Torigin:

 		s = inshort();

-		l = inlong();

+		l = inlong()-1;

 		l1 = inlong();

 		journaln(0, l1);

-		lookorigin(whichfile(s), l, l1);

+		f = whichfile(s);

+		while(l1--)

+			if(filereadc(f, --l) == '\n')

+				break;

+		outTsl(Horigin, s, ++l);

 		break;

 	case Tstartfile:

--- a/sam/mesg.h

+++ b/sam/mesg.h

@@ -8,6 +8,7 @@

 #define	TBLOCKSIZE 512		  /* largest piece of text sent to terminal */

 #define	DATASIZE  (UTFmax*TBLOCKSIZE+30) /* ... including protocol header stuff */

 #define	SNARFSIZE 32000		/* maximum length of exchanged snarf buffer, must fit in 15 bits */

+

 /*

  * Messages originating at the terminal

  */

@@ -41,6 +42,7 @@

 	Tmenucmdsend,	/* execute custom cmd from b2 menu */

 	TMAX,

 }Tmesg;

+

 /*

  * Messages originating at the host

  */

@@ -75,6 +77,7 @@

 	Hmenucmd,	/* modify custom cmds in b2 menu */

 	HMAX,

 }Hmesg;

+

 typedef struct Header{

 	uchar	type;		/* one of the above */

 	uchar	count0;		/* low bits of data size */

--- a/sam/moveto.c

+++ b/sam/moveto.c

@@ -31,63 +31,10 @@

 	patset = FALSE;

 }

-#define	CHARSHIFT	128

-

-void

-lookorigin(File *f, Posn p0, Posn ls)

-{

-	int nl, nc, c;

-	Posn p, oldp0;

-

-	if(p0 > f->nc)

-		p0 = f->nc;

-	oldp0 = p0;

-	p = p0;

-	for(nl=nc=c=0; c!=-1 && nl<ls && nc<ls*CHARSHIFT; nc++)

-		if((c=filereadc(f, --p)) == '\n'){

-			nl++;

-			oldp0 = p0-nc;

-		}

-	if(c == -1)

-		p0 = 0;

-	else if(nl==0){

-		if(p0>=CHARSHIFT/2)

-			p0-=CHARSHIFT/2;

-		else

-			p0 = 0;

-	}else

-		p0 = oldp0;

-	outTsl(Horigin, f->tag, p0);

-}

-

 int

-isalnum(int c)

-{

-	/*

-	 * Hard to get absolutely right.  Use what we know about ASCII

-	 * and assume anything above the Latin control characters is

-	 * potentially an alphanumeric.

-	 */

-	if(c<=' ')

-		return 0;

-	if(0x7F<=c && c<=0xA0)

-		return 0;

-	if(utfrune("!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", c))

-		return 0;

-	return 1;

-}

-

-int

-isspace(Rune c)

-{

-	return c == 0 || c == ' ' || c == '\t' ||

-		c == '\n' || c == '\r' || c == '\v';

-}

-

-int

 inmode(Rune r, int mode)

 {

-	return (mode == 0) ? isalnum(r) : r && !isspace(r);

+	return (mode == 0) ? isalpharune(r) : r && !isspacerune(r);

 }

 int

@@ -115,23 +62,6 @@

 	return cl=='\n' && nest==1;

 }

-Rune*

-strrune(Rune *s, Rune c)

-{

-	Rune c1;

-

-	if(c == 0) {

-		while(*s++)

-			;

-		return s-1;

-	}

-

-	while(c1 = *s++)

-		if(c1 == c)

-			return s-1;

-	return 0;

-}

-

 /*

  * Stretches a selection out over current text,

  * selecting matching range if possible.

@@ -158,8 +88,8 @@

 			c = '\n';

 		else

 			c = filereadc(f, p - 1);

-		if(strrune(l, c)){

-			if(clickmatch(f, c, r[strrune(l, c)-l], 1, &p)){

+		if(runestrchr(l, c)){

+			if(clickmatch(f, c, r[runestrchr(l, c)-l], 1, &p)){

 				f->dot.r.p1 = p1;

 				f->dot.r.p2 = p-(c!='\n');

 			}

@@ -171,8 +101,8 @@

 			c = '\n';

 		else

 			c = filereadc(f, p);

-		if(strrune(r, c)){

-			if(clickmatch(f, c, l[strrune(r, c)-r], -1, &p)){

+		if(runestrchr(r, c)){

+			if(clickmatch(f, c, l[runestrchr(r, c)-r], -1, &p)){

 				f->dot.r.p1 = p;

 				if(c!='\n' || p!=0 || filereadc(f, 0)=='\n')

 					f->dot.r.p1++;

--- a/sam/sam.h

+++ b/sam/sam.h

@@ -266,7 +266,6 @@

 void	listfree(List*);

 void	load(File*);

 File	*lookfile(String*);

-void	lookorigin(File*, Posn, Posn);

 int	lookup(int);

 void	move(File*, Address);

 void	moveto(File*, Range);