Merge remote-tracking branch 'taiyu-len/master'

3 files changed, 12 insertions, 12 deletions

diff --git a/include/container.h b/include/container.h
index 4e21461c..2ced248b 100644
--- a/include/container.h
+++ b/include/container.h
@@ -81,12 +81,21 @@ swayc_t *destroy_view(swayc_t *view);
 
 // Container Lookup
 
+swayc_t *swayc_by_test(swayc_t *container, bool (*test)(swayc_t *view, void *data), void *data);
 swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types);
 swayc_t *swayc_parent_by_layout(swayc_t *container, enum swayc_layouts);
+swayc_t *swayc_by_handle(wlc_handle handle);
+swayc_t *swayc_active_output(void);
+swayc_t *swayc_active_workspace(void);
+swayc_t *swayc_active_workspace_for(swayc_t *view);
 
-swayc_t *find_container(swayc_t *container, bool (*test)(swayc_t *view, void *data), void *data);
-void container_map(swayc_t *, void (*f)(swayc_t *, void *), void *);
+// Container information
+
+bool swayc_is_fullscreen(swayc_t *view);
 
+// Mapping functions
+
+void container_map(swayc_t *, void (*f)(swayc_t *, void *), void *);
 
 // Mappings
 void set_view_visibility(swayc_t *view, void *data);
diff --git a/include/layout.h b/include/layout.h
index 55bb6709..7b8829ed 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -19,17 +19,10 @@ swayc_t *remove_child(swayc_t *child);
 
 void move_container(swayc_t* container,swayc_t* root,enum movement_direction direction);
 
-
 // Layout
 void arrange_windows(swayc_t *container, double width, double height);
 
-// Focus
-void unfocus_all(swayc_t *container);
-void focus_view(swayc_t *view);
-void focus_view_for(swayc_t *ancestor, swayc_t *container);
-
 swayc_t *get_focused_container(swayc_t *parent);
-swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent);
 swayc_t *get_swayc_in_direction(swayc_t *container, enum movement_direction dir);
 
 void recursive_resize(swayc_t *container, double amount, enum wlc_resize_edge edge);
diff --git a/include/workspace.h b/include/workspace.h
index 042a15d9..d447ac2d 100644
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -5,11 +5,9 @@
 #include "list.h"
 #include "layout.h"
 
-extern swayc_t *active_workspace;
-
 char *workspace_next_name(void);
 swayc_t *workspace_create(const char*);
-swayc_t *workspace_find_by_name(const char*);
+swayc_t *workspace_by_name(const char*);
 void workspace_switch(swayc_t*);
 void workspace_output_next();
 void workspace_next();