cleanup, and don't send windows to desktop if they are already there

This commit is contained in:
Dana Jansens 2007-05-25 14:18:45 +00:00
parent 912f8eed50
commit ae65a6b25e

View file

@ -1587,9 +1587,8 @@ void action_send_to_desktop(union ActionData *data)
if (data->sendto.desk < screen_num_desktops ||
data->sendto.desk == DESKTOP_ALL) {
client_set_desktop(c, data->sendto.desk, data->sendto.follow);
if (data->sendto.follow)
screen_set_desktop(data->sendto.desk,
data->sendto.follow && c == focus_client);
if (data->sendto.follow && data->sendto.desk != screen_desktop)
screen_set_desktop(data->sendto.desk, c == focus_client);
}
}
@ -1646,7 +1645,7 @@ void action_send_to_desktop_dir(union ActionData *data)
{
client_set_desktop(c, d, data->sendtodir.follow);
if (data->sendtodir.follow && d != screen_desktop)
screen_set_desktop(d, data->sendtodir.follow && c == focus_client);
screen_set_desktop(d, c == focus_client);
}
}