Merge branch 'master' into next

[i3/i3] / include / output.h

diff --git a/include/output.h b/include/output.h
index 67652fa102964aa713230ca2f3856b1354be76b5..e0125c06f74540d7c6ef96e4d655dd52a139ecc9 100644 (file)
--- a/include/output.h
+++ b/include/output.h
@@ -1,9 +1,13 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * output.c: Output (monitor) related functions.
+ *
  */
-
-#ifndef _OUTPUT_H
-#define _OUTPUT_H
+#pragma once
 
 /**
  * Returns the output container below the given output container.
@@ -11,4 +15,9 @@
  */
 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);