summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Half-Shot <half-shot@molrams.com>2015-08-20 21:45:00 +0100
committerLibravatar Half-Shot <half-shot@molrams.com>2015-08-20 21:45:00 +0100
commit713bf29ec901b711d782e96721898c32fcd5d56e (patch)
tree08a2ab6b97d1e729204fb611aed9c919b1b47a0a
parentMerge branch 'master' of https://github.com/Half-Shot/sway (diff)
downloadsway-713bf29ec901b711d782e96721898c32fcd5d56e.tar.gz
sway-713bf29ec901b711d782e96721898c32fcd5d56e.tar.zst
sway-713bf29ec901b711d782e96721898c32fcd5d56e.zip
Few stray bits
-rw-r--r--include/layout.h2
-rw-r--r--sway/commands.c1
-rw-r--r--sway/layout.c6
3 files changed, 5 insertions, 4 deletions
diff --git a/include/layout.h b/include/layout.h
index c1d7d8b4..5c73af99 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -17,7 +17,7 @@ swayc_t *add_sibling(swayc_t *sibling, swayc_t *child);
17swayc_t *replace_child(swayc_t *child, swayc_t *new_child); 17swayc_t *replace_child(swayc_t *child, swayc_t *new_child);
18swayc_t *remove_child(swayc_t *child); 18swayc_t *remove_child(swayc_t *child);
19 19
20void move_container(swayc_t* container,swayc_t* root,int direction); 20void move_container(swayc_t* container,swayc_t* root,enum movement_direction direction);
21 21
22 22
23// Layout 23// Layout
diff --git a/sway/commands.c b/sway/commands.c
index e39b781a..5d79104f 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -362,6 +362,7 @@ static bool cmd_move(struct sway_config *config, int argc, char **argv) {
362 } 362 }
363 363
364 return true; 364 return true;
365}
365 366
366static bool cmd_gaps(struct sway_config *config, int argc, char **argv) { 367static bool cmd_gaps(struct sway_config *config, int argc, char **argv) {
367 if (!checkarg(argc, "gaps", EXPECTED_AT_LEAST, 1)) { 368 if (!checkarg(argc, "gaps", EXPECTED_AT_LEAST, 1)) {
diff --git a/sway/layout.c b/sway/layout.c
index a48f15c4..0c1f736d 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -108,7 +108,9 @@ swayc_t *remove_child(swayc_t *child) {
108 return parent; 108 return parent;
109} 109}
110 110
111void move_container(swayc_t *container,swayc_t* root,int direction){ 111//TODO: Implement horizontal movement.
112//TODO: Implement move to a different workspace.
113void move_container(swayc_t *container,swayc_t* root,enum movement_direction direction){
112 sway_log(L_DEBUG, "Moved window"); 114 sway_log(L_DEBUG, "Moved window");
113 swayc_t *temp; 115 swayc_t *temp;
114 int i; 116 int i;
@@ -121,8 +123,6 @@ void move_container(swayc_t *container,swayc_t* root,int direction){
121 //Only one container, meh. 123 //Only one container, meh.
122 break; 124 break;
123 } 125 }
124 //TODO: Implement horizontal movement.
125 //TODO: Implement move to a different workspace.
126 if(direction == MOVE_LEFT && i > 0){ 126 if(direction == MOVE_LEFT && i > 0){
127 temp = root->children->items[i-1]; 127 temp = root->children->items[i-1];
128 root->children->items[i] = temp; 128 root->children->items[i] = temp;