Merge branch 'master' into next

[i3/i3] / include / data.h

diff --git a/include/data.h b/include/data.h
index 6cb6babc56d5ec0668a55799bde0a3885f2f98ea..66000e45462fa03fda2b5f2b9548aa023b14272d 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -363,6 +363,8 @@ struct Window {
 
     /** The name of the window. */
     i3String *name;
+    /** The format with which the window's name should be displayed. */
+    char *title_format;
 
     /** The WM_WINDOW_ROLE of this window (for example, the pidgin buddy window
      * sets "buddy list"). Useful to match specific windows in assignments or
@@ -415,6 +417,7 @@ struct Match {
     struct regex *instance;
     struct regex *mark;
     struct regex *window_role;
+    struct regex *workspace;
     xcb_atom_t window_type;
     enum {
         U_DONTCHECK = -1,