From 2a62c5c7fb71fc815663281793ba6a89d2b246ed Mon Sep 17 00:00:00 2001
From: Half-Shot <half-shot@molrams.com>
Date: Thu, 20 Aug 2015 21:27:38 +0100
Subject: Basic left right move command implemented.
---
sway/commands.c | 25 ++++++++++++++++++++++---
sway/layout.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 66 insertions(+), 4 deletions(-)
(limited to 'sway')
diff --git a/sway/commands.c b/sway/commands.c
index 9a3ea5d6..1ca5c17f 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -282,8 +282,27 @@ static bool cmd_focus_follows_mouse(struct sway_config *config, int argc, char *
}
static bool cmd_move(struct sway_config *config, int argc, char **argv) {
- sway_log(L_DEBUG, "move cmd stub called");//Stubbed method until I get back.
+ if (!checkarg(argc, "workspace", EXPECTED_EQUAL_TO, 1)) {
+ return false;
+ }
+
+ swayc_t *view = get_focused_container(&root_container);
+
+ if (strcasecmp(argv[0], "left") == 0) {
+ move_container(view,&root_container,MOVE_LEFT);
+ } else if (strcasecmp(argv[0], "right") == 0) {
+ move_container(view,&root_container,MOVE_RIGHT);
+ } else if (strcasecmp(argv[0], "up") == 0) {
+ move_container(view,&root_container,MOVE_UP);
+ } else if (strcasecmp(argv[0], "down") == 0) {
+ move_container(view,&root_container,MOVE_DOWN);
+ } else
+ {
+ return false;
+ }
+
return true;
+
}
static bool cmd_kill(struct sway_config *config, int argc, char **argv) {
@@ -492,13 +511,13 @@ static struct cmd_handler handlers[] = {
{ "kill", cmd_kill },
{ "layout", cmd_layout },
{ "log_colors", cmd_log_colors },
+ { "move",cmd_move},
{ "reload", cmd_reload },
{ "set", cmd_set },
{ "split", cmd_split },
{ "splith", cmd_splith },
{ "splitv", cmd_splitv },
- { "workspace", cmd_workspace },
- { "cmd_move",cmd_move}
+ { "workspace", cmd_workspace }
};
static char **split_directive(char *line, int *argc) {
diff --git a/sway/layout.c b/sway/layout.c
index 105359d2..9fdfd62a 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -91,6 +91,50 @@ swayc_t *remove_child(swayc_t *child) {
return parent;
}
+void move_container(swayc_t *container,swayc_t* root,int direction){
+ sway_log(L_DEBUG, "Moved window");
+ swayc_t *temp;
+ int i;
+ uint clength = root->children->length;
+ //Rearrange
+ for (i = 0; i < clength; ++i) {
+ swayc_t *child = root->children->items[i];
+ if(child->handle == container->handle){
+ if(clength == 1){
+ //Only one container, meh.
+ break;
+ }
+
+ //TODO: Implement move to a different workspace.
+ if(direction == MOVE_LEFT && i > 0){
+ temp = root->children->items[i-1];
+ root->children->items[i] = temp;
+ root->children->items[i-1] = container;
+ arrange_windows(&root_container,-1,-1);
+ }
+ else if(direction == MOVE_RIGHT && i < clength-1){
+ temp = root->children->items[i+1];
+ root->children->items[i] = temp;
+ root->children->items[i+1] = container;
+ arrange_windows(&root_container,-1,-1);
+
+ }
+ else if(direction == MOVE_UP){
+ sway_log(L_INFO, "Moving up not implemented");
+ }
+ else if(direction == MOVE_DOWN){
+ sway_log(L_INFO, "Moving down not implemented");
+ }
+
+ break;
+ }
+ else if(child->children != NULL){
+ move_container(container,child,direction);
+ }
+ }
+
+}
+
void arrange_windows(swayc_t *container, int width, int height) {
int i;
@@ -282,4 +326,3 @@ swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent) {
}
return NULL;
}
-
--
cgit v1.2.3