Revisions to track protocol and track program.

The SIBLING flag has been split into ABOVE and BELOW flags.
This allows a view to be placed above or below a sibling view.
MS-Windows support is the immediate motivation for this change.

3 files changed, 11 insertions, 5 deletions

diff --git a/src/comm.c b/src/comm.c
index 2eee7ff..ff8c2fc 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -68,11 +68,16 @@ comm_do_update(struct client *c, struct buffer *b, struct view *v,
 	view_stack(v, VIEW_STACK_TOP, NULL);
     else if (m->flags & LINPICKER_FLAG_BOTMOST)
 	view_stack(v, VIEW_STACK_BOTTOM, NULL);
-    else if (m->flags & LINPICKER_FLAG_SIBLING) {
+    else if (m->flags & LINPICKER_FLAG_ABOVE) {
 	struct view *s = view_lookup(c, m->sibling);
 	if (s && s != v)
 	    view_stack(v, VIEW_STACK_ABOVE, s);
     }
+    else if (m->flags & LINPICKER_FLAG_BELOW) {
+	struct view *s = view_lookup(c, m->sibling);
+	if (s && s != v)
+	    view_stack(v, VIEW_STACK_BELOW, s);
+    }
 
     /* Set view visibility */
     if (m->flags & LINPICKER_FLAG_SHOWN)
diff --git a/src/comm_structs.h b/src/comm_structs.h
index 7918ced..efa72f2 100644
--- a/src/comm_structs.h
+++ b/src/comm_structs.h
@@ -39,9 +39,10 @@
 #define LINPICKER_FLAG_POSITION 1
 #define LINPICKER_FLAG_TOPMOST  2
 #define LINPICKER_FLAG_BOTMOST  4
-#define LINPICKER_FLAG_SIBLING  8
-#define LINPICKER_FLAG_HIDDEN   16
-#define LINPICKER_FLAG_SHOWN    32
+#define LINPICKER_FLAG_ABOVE    8
+#define LINPICKER_FLAG_BELOW    16
+#define LINPICKER_FLAG_HIDDEN   32
+#define LINPICKER_FLAG_SHOWN    64
 
 struct lin_message {
 	uint32_t type;
diff --git a/src/track.c b/src/track.c
index f17ad8a..cd98893 100644
--- a/src/track.c
+++ b/src/track.c
@@ -223,7 +223,7 @@ x_event(xcb_connection_t *conn, xcb_window_t root, xcb_generic_event_t *ev)
 		con = (typeof(con))ev;
 		m.type = LINPICKER_UPDATE;
 		m.view = con->window;
-		m.flags = LINPICKER_FLAG_POSITION | LINPICKER_FLAG_SIBLING;
+		m.flags = LINPICKER_FLAG_POSITION | LINPICKER_FLAG_ABOVE;
 		m.sibling = con->above_sibling;
 		m.x = con->x;
 		m.y = con->y;