summaryrefslogtreecommitdiffstats
path: root/include/focus.h
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-08-20 07:38:04 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-08-20 07:38:04 -0400
commit14947c92aad2ff72d20fbf875957571cd8f69168 (patch)
treebba3293f642a0d60e48b11574c18b6d03990a5d5 /include/focus.h
parentMerge pull request #96 from KoffeinFlummi/gap-fix (diff)
parentchanges (diff)
downloadsway-14947c92aad2ff72d20fbf875957571cd8f69168.tar.gz
sway-14947c92aad2ff72d20fbf875957571cd8f69168.tar.zst
sway-14947c92aad2ff72d20fbf875957571cd8f69168.zip
Merge pull request #94 from taiyu-len/master
input_state.ch, and command conflicts resolved
Diffstat (limited to 'include/focus.h')
-rw-r--r--include/focus.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/focus.h b/include/focus.h
index 410ed134..383993fa 100644
--- a/include/focus.h
+++ b/include/focus.h
@@ -1,7 +1,5 @@
1#ifndef _SWAY_FOCUS_H 1#ifndef _SWAY_FOCUS_H
2#define _SWAY_FOCUS_H 2#define _SWAY_FOCUS_H
3#include "container.h"
4
5enum movement_direction { 3enum movement_direction {
6 MOVE_LEFT, 4 MOVE_LEFT,
7 MOVE_RIGHT, 5 MOVE_RIGHT,
@@ -10,6 +8,8 @@ enum movement_direction {
10 MOVE_PARENT 8 MOVE_PARENT
11}; 9};
12 10
11#include "container.h"
12
13// focused_container - the container found by following the `focused` pointer 13// focused_container - the container found by following the `focused` pointer
14// from a given container to a container with `is_focused` boolean set 14// from a given container to a container with `is_focused` boolean set
15// --- 15// ---