Fix shiftview behavior with scratchpads patch
Closes
void
shiftview(const Arg *arg)
{
- Arg a;
+ Arg shifted;
Client *c;
- unsigned visible = 0;
- int i = arg->i;
- int count = 0;
- int nextseltags, curseltags = selmon->tagset[selmon->seltags];
-
- do {
- if(i > 0) // left circular shift
- nextseltags = (curseltags << i) | (curseltags >> (LENGTH(tags) - i));
+ unsigned int tagmask = 0;
- else // right circular shift
- nextseltags = curseltags >> (- i) | (curseltags << (LENGTH(tags) + i));
+ for (c = selmon->clients; c; c = c->next)
+ if (!(c->tags & SPTAGMASK))
+ tagmask = tagmask | c->tags;
- // Check if tag is visible
- for (c = selmon->clients; c && !visible; c = c->next)
- if (nextseltags & c->tags) {
- visible = 1;
- break;
- }
- i += arg->i;
- } while (!visible && ++count < 10);
+ shifted.ui = selmon->tagset[selmon->seltags] & ~SPTAGMASK;
+ if (arg->i > 0) /* left circular shift */
+ do {
+ shifted.ui = (shifted.ui << arg->i)
+ | (shifted.ui >> (LENGTH(tags) - arg->i));
+ shifted.ui &= ~SPTAGMASK;
+ } while (tagmask && !(shifted.ui & tagmask));
+ else /* right circular shift */
+ do {
+ shifted.ui = (shifted.ui >> (- arg->i)
+ | shifted.ui << (LENGTH(tags) + arg->i));
+ shifted.ui &= ~SPTAGMASK;
+ } while (tagmask && !(shifted.ui & tagmask));
- if (count < 10) {
- a.i = nextseltags;
- view(&a);
- }
+ view(&shifted);
}
void
