Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-06-17 20:01:12 +01:00
6 changed files with 75 additions and 40 deletions

View File

@ -1392,3 +1392,28 @@ winlink_clear_flags(struct winlink *wl)
}
}
}
int
winlink_shuffle_up(struct session *s, struct winlink *wl)
{
int idx, last;
idx = wl->idx + 1;
/* Find the next free index. */
for (last = idx; last < INT_MAX; last++) {
if (winlink_find_by_index(&s->windows, last) == NULL)
break;
}
if (last == INT_MAX)
return (-1);
/* Move everything from last - 1 to idx up a bit. */
for (; last > idx; last--) {
wl = winlink_find_by_index(&s->windows, last - 1);
server_link_window(s, wl, s, last, 0, 0, NULL);
server_unlink_window(s, wl);
}
return (idx);
}