xmlNodePtr node);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_desktop_startup()
+void action_desktop_startup(void)
{
actions_register("GoToDesktop", setup_go_func, g_free, run_func,
NULL, NULL);
}
else {
o->type = ABSOLUTE;
- o->abs.desktop = parse_int(doc, n) - 1;
+ o->abs.desktop = atoi(s) - 1;
}
g_free(s);
}
d = o->abs.desktop;
break;
case RELATIVE:
- d = screen_cycle_desktop(o->rel.dir,
- o->rel.wrap,
- o->rel.linear,
- FALSE, TRUE, FALSE);
+ d = screen_find_desktop(screen_desktop,
+ o->rel.dir, o->rel.wrap, o->rel.linear);
break;
}
if (d < screen_num_desktops && d != screen_desktop) {
gboolean go = TRUE;
+ actions_client_move(data, TRUE);
if (o->send && data->client && client_normal(data->client)) {
client_set_desktop(data->client, d, o->follow, FALSE);
go = o->follow;
}
if (go) screen_set_desktop(d, TRUE);
+ actions_client_move(data, FALSE);
}
return FALSE;
}