mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

action: support {Go,Send}ToDesktop 'wrap' option

Browse source 
Make wrap 'true' by default for both GoToDesktop and SendToDesktop,
in order to default to the current behaviour, and to stay consistent
with Openbox behaviour.
This commit is contained in:
Tomi Ollila 2023-05-14 20:44:59 +03:00 • committed by Consolatis
parent 44645d06c2
commit f2c3f83041
5 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/action.c
View file

@ -179,6 +179,10 @@ action_arg_from_xml_node(struct action *action, char *nodename, char *content)
action_arg_add_str(action, argument, content);
goto cleanup;
}
if (!strcmp(argument, "wrap")) {
action_arg_add_bool(action, argument, parse_bool(content, true));
goto cleanup;
}
break;
case ACTION_TYPE_SNAP_TO_REGION:
if (!strcmp(argument, "region")) {
@ -546,18 +550,21 @@ actions_run(struct view *activator, struct server *server,
resize_edges);
}
break;
case ACTION_TYPE_GO_TO_DESKTOP:
if (!arg) {
wlr_log(WLR_ERROR, "Missing argument for GoToDesktop");
case ACTION_TYPE_GO_TO_DESKTOP: {
const char *to = get_arg_value_str(action, "to", NULL);
if (!to) {
wlr_log(WLR_ERROR,
"Missing 'to' argument for GoToDesktop");
break;
}
bool wrap = get_arg_value_bool(action, "wrap", true);
struct workspace *target;
const char *target_name = action_str_from_arg(arg);
target = workspaces_find(server->workspace_current, target_name);
target = workspaces_find(server->workspace_current, to, wrap);
if (target) {
workspaces_switch_to(target);
}
break;
}
case ACTION_TYPE_SEND_TO_DESKTOP:
if (view) {
const char *to = get_arg_value_str(action, "to", NULL);
@ -567,7 +574,9 @@ actions_run(struct view *activator, struct server *server,
break;
}
bool follow = get_arg_value_bool(action, "follow", true);
struct workspace *target = workspaces_find(view->workspace, to);
bool wrap = get_arg_value_bool(action, "wrap", true);
struct workspace *target;
target = workspaces_find(view->workspace, to, wrap);
if (target) {
view_move_to_workspace(view, target);
if (follow) {

22
src/workspaces.c
View file

@ -172,22 +172,30 @@ add_workspace(struct server *server, const char *name)
}
static struct workspace *
get_prev(struct workspace *current, struct wl_list *workspaces)
get_prev(struct workspace *current, struct wl_list *workspaces, bool wrap)
{
struct wl_list *target_link = current->link.prev;
if (target_link == workspaces) {
/* Current workspace is the first one, roll over */
/* Current workspace is the first one */
if (!wrap) {
return NULL;
}
/* Roll over */
target_link = target_link->prev;
}
return wl_container_of(target_link, current, link);
}
static struct workspace *
get_next(struct workspace *current, struct wl_list *workspaces)
get_next(struct workspace *current, struct wl_list *workspaces, bool wrap)
{
struct wl_list *target_link = current->link.next;
if (target_link == workspaces) {
/* Current workspace is the last one, roll over */
/* Current workspace is the last one */
if (!wrap) {
return NULL;
}
/* Roll over */
target_link = target_link->next;
}
return wl_container_of(target_link, current, link);
@ -304,7 +312,7 @@ workspaces_osd_hide(struct seat *seat)
}
struct workspace *
workspaces_find(struct workspace *anchor, const char *name)
workspaces_find(struct workspace *anchor, const char *name, bool wrap)
{
assert(anchor);
if (!name) {
@ -324,9 +332,9 @@ workspaces_find(struct workspace *anchor, const char *name)
} else if (!strcasecmp(name, "last")) {
return anchor->server->workspace_last;
} else if (!strcasecmp(name, "left")) {
return get_prev(anchor, workspaces);
return get_prev(anchor, workspaces, wrap);
} else if (!strcasecmp(name, "right")) {
return get_next(anchor, workspaces);
return get_next(anchor, workspaces, wrap);
} else {
wl_list_for_each(target, workspaces, link) {
if (!strcasecmp(target->name, name)) {