quick and dirty attempt at window motion

I also added a new builtin command 'New' to create a new column.
Currently the build is buggy and the user interface is kind of a
mess.

4 files changed, 62 insertions, 16 deletions

diff --git a/exec.c b/exec.c
index 1103cf5..d7f1f82 100644
--- a/exec.c
+++ b/exec.c
@@ -32,15 +32,26 @@ static int get(W *, EBuf *, unsigned);
 static int put(W *, EBuf *, unsigned);
 static int look(W *, EBuf *, unsigned);
 static int run(W *, EBuf *, unsigned);
+static int new(W *, EBuf *, unsigned);
 
 static char *errstr;
 static ECmd etab[] = {
 	{ "Get", get },
 	{ "Put", put },
 	{ "Look", look },
+	{ "New", new },
 	{ 0, run },
 };
 
+static int
+new(W *w, EBuf *eb, unsigned pos)
+{
+	extern W *curwin;
+
+	(void)w; (void)eb; (void)pos;
+	curwin = win_new(eb_new());
+	return 1;
+}
 
 /* ex_run - Execute a command in the current window at
  * position [p0].  The command is first searched among
diff --git a/main.c b/main.c
index d757502..a137d17 100644
--- a/main.c
+++ b/main.c
@@ -77,7 +77,7 @@ gev(int fd, int flag, void *unused)
 		case GMouseUp:
 			if (resizing) {
 				resizing = 0;
-				win_resize(mwin, e.mouse.x, e.mouse.y);
+				win_move(mwin, e.mouse.x, e.mouse.y);
 				g->setpointer(GPNormal);
 			}
 			break;
diff --git a/win.c b/win.c
index 465e272..aeaefb6 100644
--- a/win.c
+++ b/win.c
@@ -77,12 +77,13 @@ win_new(EBuf *eb)
 			break;
 	}
 
-	for (i=0, x=0; screen[i] && screen[i+1]; i++)
-		x += screen[i]->gr.w;
+	for (i=0; screen[i] && screen[i+1]; i++)
+		;
 	if (!screen[i])
 		size = fwidth;
 	else {
-		size = screen[i]->gr.w - screen[i]->gr.w / 2;
+		size = screen[i]->gr.w - screen[i]->gr.w / 2 - g->border;
+		x = screen[i]->gr.x;
 		x += (screen[i]->gr.w /= 2) + g->border;
 		win_update(screen[i]);
 		i++;
@@ -121,11 +122,9 @@ win_locus(int x1, int y1, unsigned *pos)
 	int i, x;
 	unsigned p;
 
-	for (i=0, x=0; (w = screen[i]); i++)
-		if (x <= x1 && x1 < x + w->gr.w)
+	for (i=0; (w = screen[i]); i++)
+		if (x1 < w->gr.x + w->gr.w)
 			break;
-		else
-			x += w->gr.w + g->border;
 	if (tag.visible && tag.owner == w)
 	if (y1 >= tag.win.gr.y)
 		w = &tag.win;
@@ -147,21 +146,55 @@ win_locus(int x1, int y1, unsigned *pos)
 	return w;
 }
 
-/* win_resize - Resize or move a window to the specified
- * location.  The upper-left corner of the window is what
- * moves to the passed coordinates.
+/* win_move - Resize or move a window to approximately set its
+ * upper-left corner to the specified location.
  */
 void
-win_resize(W *w, int x, int y)
+win_move(W *w, int x, int y)
 {
-	W *dwin;
-
+	W *w1;
+	int i, j, dx;
+
+	if (x < 0)
+		x = 0;
+	if (x > fwidth - g->hmargin)
+		x = fwidth - g->hmargin;
+	if (y < 0)
+		y = 0;
+	if (y > fheight - g->vmargin)
+		y = fheight - g->vmargin;
 	if (w == &tag.win) {
 		if (y > w->gr.y)
 			tag.owner->rev = 0;
 		move(w, w->gr.x, y, w->gr.w, fheight - y);
 		return;
 	}
+	for (i=j=0; screen[i+1]; i++)
+		if (screen[i] == w) {
+			w1 = screen[i+1];
+			screen[i+1] = screen[i];
+			screen[i] = w1;
+			j++;
+		}
+	for (; i>0 && x < screen[i-1]->gr.x; i--) {
+		w1 = screen[i-1];
+		screen[i-1] = screen[i];
+		screen[i] = w1;
+		j--;
+	}
+	if (j != 0)
+		/* window swap */
+		for (i=0, x=0; (w = screen[i]); i++) {
+			move(w, x, 0, w->gr.w, fheight);
+			x += w->gr.w + g->border;
+		}
+	else if (i != 0) {
+		/* window resize */
+		w1 = screen[i-1];
+		dx = x - w->gr.x;
+		move(w, x, 0, w->gr.w - dx, fheight);
+		move(w1, w1->gr.x, 0, w1->gr.w + dx, fheight);
+	}
 }
 
 /* win_resize_frame - Called when the whole frame
@@ -197,7 +230,8 @@ win_redraw_frame()
 	W *w;
 	int i;
 
-	for (i=0; (w = screen[i]); i++)
+	for (i=0; (w = screen[i]); i++) {
+		assert(!screen[i+1] || w->gr.x + w->gr.w + g->border == screen[i+1]->gr.x);
 		if (dirty(w)) {
 			if (screen[i+1]) {
 				b = (GRect){ w->gr.x + w->gr.w, 0, g->border, fheight };
@@ -207,6 +241,7 @@ win_redraw_frame()
 			if (tag.owner == w)
 				tag.win.rev = 0;
 		}
+	}
 	if (tag.visible && dirty(&tag.win)) {
 		b = tag.win.gr;
 		b.y -= g->border;
diff --git a/win.h b/win.h
index ede8f7a..a46d045 100644
--- a/win.h
+++ b/win.h
@@ -36,7 +36,7 @@ void win_init(struct gui *g);
 W *win_new(EBuf *eb);
 void win_delete(W *);
 W *win_locus(int, int, unsigned *);
-void win_resize(W *, int x, int y);
+void win_move(W *, int x, int y);
 void win_resize_frame(int w, int h);
 void win_redraw_frame(void);
 void win_scroll(W *, int);