Merge branch 'next' into master

[i3/i3] / include / data.h

diff --git a/include/data.h b/include/data.h
index 69a46e464331172172873a70940af6d348cb09bd..f55e003d0bd2abcea36f20d89cf992fb5f9fab87 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -477,6 +477,10 @@ struct Window {
     int min_width;
     int min_height;
 
+    /* Maximum size specified for the window. */
+    int max_width;
+    int max_height;
+
     /* aspect ratio from WM_NORMAL_HINTS (MPlayer uses this for example) */
     double aspect_ratio;
 };
@@ -573,7 +577,7 @@ struct Assignment {
     /** the criteria to check if a window matches */
     Match match;
 
-    /** destination workspace/command, depending on the type */
+    /** destination workspace/command/output, depending on the type */
     union {
         char *command;
         char *workspace;