Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement move{left,up,right,down} following exchange* variants #59

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

implement move{left,up,right,down} following exchange* variants #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions keybinding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,49 @@ swap_tile_bottom(struct cg_tile *tile) {
swap_tile(tile, find_bottom_tile);
}

void
move_tile(struct cg_tile *tile,
struct cg_tile *(*find_tile)(const struct cg_tile *)) {
struct cg_tile *move_tile = find_tile(tile);
if(move_tile == NULL || move_tile == tile) {
return;
}
workspace_tile_update_view(move_tile, tile->view);
workspace_tile_update_view(tile, NULL);
struct cg_server *server = move_tile->workspace->server;
workspace_focus_tile(
server->curr_output->workspaces[server->curr_output->curr_workspace],
move_tile);
seat_set_focus(server->seat, move_tile->view);
ipc_send_event(
move_tile->workspace->output->server,
"{\"event_name\":\"move_tile\",\"tile_id\":%d,\"move_"
"tile_id\":%d,\"workspace\":%d,\"output\":\"%s\",\"output_id\":%d}",
move_tile->id, move_tile->workspace->num + 1,
move_tile->workspace->output->wlr_output->name,
output_get_num(move_tile->workspace->output));
}

void
move_tile_left(struct cg_tile *tile) {
move_tile(tile, find_left_tile);
}

void
move_tile_right(struct cg_tile *tile) {
move_tile(tile, find_right_tile);
}

void
move_tile_top(struct cg_tile *tile) {
move_tile(tile, find_top_tile);
}

void
move_tile_bottom(struct cg_tile *tile) {
move_tile(tile, find_bottom_tile);
}

void
focus_tile(struct cg_tile *tile,
struct cg_tile *(*find_tile)(const struct cg_tile *tile)) {
Expand Down Expand Up @@ -1759,6 +1802,30 @@ run_action(enum keybinding_action action, struct cg_server *server,
->focused_tile);
break;
}
case KEYBINDING_MOVE_LEFT: {
move_tile_left(
server->curr_output->workspaces[server->curr_output->curr_workspace]
->focused_tile);
break;
}
case KEYBINDING_MOVE_RIGHT: {
move_tile_right(
server->curr_output->workspaces[server->curr_output->curr_workspace]
->focused_tile);
break;
}
case KEYBINDING_MOVE_TOP: {
move_tile_top(
server->curr_output->workspaces[server->curr_output->curr_workspace]
->focused_tile);
break;
}
case KEYBINDING_MOVE_BOTTOM: {
move_tile_bottom(
server->curr_output->workspaces[server->curr_output->curr_workspace]
->focused_tile);
break;
}
case KEYBINDING_FOCUS_LEFT: {
focus_tile_left(
server->curr_output->workspaces[server->curr_output->curr_workspace]
Expand Down
5 changes: 5 additions & 0 deletions keybinding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ struct cg_server;
KEYBINDING(KEYBINDING_SWAP_TOP, exchangeup) \
KEYBINDING(KEYBINDING_SWAP_BOTTOM, exchangedown) \
\
KEYBINDING(KEYBINDING_MOVE_LEFT, moveleft) \
KEYBINDING(KEYBINDING_MOVE_RIGHT, moveright) \
KEYBINDING(KEYBINDING_MOVE_TOP, moveup) \
KEYBINDING(KEYBINDING_MOVE_BOTTOM, movedown) \
\
KEYBINDING(KEYBINDING_FOCUS_LEFT, focusleft) \
KEYBINDING(KEYBINDING_FOCUS_RIGHT, focusright) \
KEYBINDING(KEYBINDING_FOCUS_TOP, focusup) \
Expand Down
8 changes: 8 additions & 0 deletions parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,14 @@ parse_command(struct cg_server *server, struct keybinding *keybinding,
keybinding->action = KEYBINDING_SWAP_TOP;
} else if(strcmp(action, "exchangedown") == 0) {
keybinding->action = KEYBINDING_SWAP_BOTTOM;
} else if(strcmp(action, "moveleft") == 0) {
keybinding->action = KEYBINDING_MOVE_LEFT;
} else if(strcmp(action, "moveright") == 0) {
keybinding->action = KEYBINDING_MOVE_RIGHT;
} else if(strcmp(action, "moveup") == 0) {
keybinding->action = KEYBINDING_MOVE_TOP;
} else if(strcmp(action, "movedown") == 0) {
keybinding->action = KEYBINDING_MOVE_BOTTOM;
} else if(strcmp(action, "focusleft") == 0) {
keybinding->action = KEYBINDING_FOCUS_LEFT;
} else if(strcmp(action, "focusright") == 0) {
Expand Down