shithub: sam

Info  •  Files  •  Log  •  Branches

Set current menu hit when plumbing a file address.

Also get rid of USED() when we don't need to USE them.

--- a/sam/sam.c

+++ b/sam/sam.c

@@ -319,7 +319,7 @@

 		seq++;

 }

-File *

+File*

 current(File *f)

 {

 	return curfile = f;

--- a/sam/xec.c

+++ b/sam/xec.c

@@ -79,7 +79,7 @@

 b_cmd(File *f, Cmd *cp)

 {

 	String *s;

-	USED(f);

+

 	s = cp->ctext;

 	if(nest > 0 && s->s[0] == 0){

 		if(f == nil)

@@ -87,9 +87,8 @@

 		tofile(&f->name, 0);

 		current(f);

 		newcur = 1;

-	}else{

+	}else

 		f = cp->cmdc=='b'? tofile(s, 1) : getfile(s);

-	}

 	if(f->unread)

 		load(f);

 	else if(nest == 0 || newcur)

@@ -106,9 +105,8 @@

 }

 int

-d_cmd(File *f, Cmd *cp)

+d_cmd(File *f, Cmd *)

 {

-	USED(cp);

 	logdelete(f, addr.r.p1, addr.r.p2);

 	f->ndot.r.p1 = f->ndot.r.p2 = addr.r.p1;

 	return TRUE;

@@ -157,9 +155,8 @@

 }

 int

-k_cmd(File *f, Cmd *cp)

+k_cmd(File *f, Cmd *)

 {

-	USED(cp);

 	f->mark = addr.r;

 	return TRUE;

 }

@@ -178,9 +175,8 @@

 }

 int

-M_cmd(File *f, Cmd *cp)

+M_cmd(File *, Cmd *cp)

 {

-	USED(f);

 	if(downloaded)

 		outTS(Hmenucmd, cp->ctext);

 	else

@@ -189,11 +185,11 @@

 }

 int

-n_cmd(File *f, Cmd *cp)

+n_cmd(File *, Cmd *)

 {

+	File *f;

 	int i;

-	USED(f);

-	USED(cp);

+

 	for(i = 0; i<file.nused; i++){

 		if(file.filepptr[i] == cmd)

 			continue;

@@ -205,17 +201,14 @@

 }

 int

-p_cmd(File *f, Cmd *cp)

+p_cmd(File *f, Cmd *)

 {

-	USED(cp);

 	return display(f);

 }

 int

-q_cmd(File *f, Cmd *cp)

+q_cmd(File *, Cmd *)

 {

-	USED(cp);

-	USED(f);

 	trytoquit();

 	if(downloaded){

 		outT0(Hexit);

@@ -290,8 +283,6 @@

 {

 	int n;

-	USED(f);

-	USED(cp);

 	n = cp->num;

 	if(n >= 0)

 		while(n-- && undo(TRUE))

@@ -328,9 +319,8 @@

 }

 int

-X_cmd(File *f, Cmd *cp)

+X_cmd(File *, Cmd *cp)

 {

-	USED(f);

 	filelooper(cp, cp->cmdc=='X');

 	return TRUE;

 }

@@ -385,9 +375,8 @@

 }

 int

-cd_cmd(File *f, Cmd *cp)

+cd_cmd(File *, Cmd *cp)

 {

-	USED(f);

 	cd(cp->ctext);

 	return TRUE;

 }

--- a/samterm/menu.c

+++ b/samterm/menu.c

@@ -150,6 +150,12 @@

 }

 void

+setmenufile(int n)

+{

+	menu3.lasthit = n + NMENU3;

+}

+

+void

 menu3hit(void)

 {

 	Rectangle r;

@@ -397,7 +403,7 @@

 		return p;

 	return paren(p);

 }

-char *

+char*

 genmenu3(int n)

 {

 	Text *t;

--- a/samterm/mesg.c

+++ b/samterm/mesg.c

@@ -137,7 +137,7 @@

 			break;

 		t = whichtext(m);

 		i = which && ((Text *)which->user1) == &cmd && m != cmd.tag;

-		if(!t && (t = sweeptext(0, m)) == 0)

+		if(!t && !(t = sweeptext(0, m)))

 			break;

 		if(!t->l[t->front].textfn)

 			panic("Hcurrent");

@@ -146,6 +146,7 @@

 			flupfront(lp);

 			flborder(lp, 0);

 			work = lp;

+			setmenufile(menu);

 		}else

 			current(lp);

 		break;

--- a/samterm/samterm.h

+++ b/samterm/samterm.h

@@ -144,6 +144,7 @@

 Rune*	rload(Rasp*, ulong, ulong, ulong*);

 void	menuins(int, uchar*, Text*, int, int);

 void	menudel(int);

+void	setmenufile(int);

 Text	*sweeptext(int, int);

 void	setpat(char*);

 void	menucmd(char*);