Merge branch 'next' into master

[i3/i3] / include / output.h

diff --git a/include/output.h b/include/output.h
index e87da22e063b1314bffebb349b6764a079006013..8299a19bc1ddefd6fb7f37cec5f3bfbd4635e499 100644 (file)
--- a/include/output.h
+++ b/include/output.h
@@ -2,13 +2,12 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * output.c: Output (monitor) related functions.
  *
  */
-#ifndef I3_OUTPUT_H
-#define I3_OUTPUT_H
+#pragma once
 
 /**
  * Returns the output container below the given output container.
@@ -16,4 +15,16 @@
  */
 Con *output_get_content(Con *output);
 
-#endif
+/**
+ * Returns an 'output' corresponding to one of left/right/down/up or a specific
+ * output name.
+ *
+ */
+Output *get_output_from_string(Output *current_output, const char *output_str);
+
+/**
+ * Iterates over all outputs and pushes sticky windows to the currently visible
+ * workspace on that output.
+ *
+ */
+void output_push_sticky_windows(Con *to_focus);