Re-Implement support for RandR changes

[i3/i3] / include / data.h

diff --git a/include/data.h b/include/data.h
index d34fd733af1ab472c8c1197ba5bbfcffba09f41b..6174e4e427b90d82470be62cbec23464af06fbf5 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -42,6 +42,7 @@ typedef struct Window i3Window;
  *****************************************************************************/
 typedef enum { D_LEFT, D_RIGHT, D_UP, D_DOWN } direction_t;
 typedef enum { NO_ORIENTATION = 0, HORIZ, VERT } orientation_t;
+typedef enum { BS_NORMAL = 0, BS_NONE = 1, BS_1PIXEL = 3 } border_style_t;
 
 enum {
     BIND_NONE = 0,
@@ -186,6 +187,9 @@ struct xoutput {
     /** Name of the output */
     char *name;
 
+    /** Pointer to the Con which represents this output */
+    Con *con;
+
     /** Whether the output is currently active (has a CRTC attached with a
      * valid mode) */
     bool active;
@@ -198,6 +202,7 @@ struct xoutput {
     /** x, y, width, height */
     Rect rect;
 
+#if 0
     /** The bar window */
     xcb_window_t bar;
     xcb_gcontext_t bargc;
@@ -205,6 +210,7 @@ struct xoutput {
     /** Contains all clients with _NET_WM_WINDOW_TYPE ==
      * _NET_WM_WINDOW_TYPE_DOCK */
     SLIST_HEAD(dock_clients_head, Client) dock_clients;
+#endif
 
     TAILQ_ENTRY(xoutput) outputs;
 };
@@ -278,6 +284,10 @@ struct Con {
 
     char *name;
 
+    /** the workspace number, if this Con is of type CT_WORKSPACE and the
+     * workspace is not a named workspace (for named workspaces, num == -1) */
+    int num;
+
     /* a sticky-group is an identifier which bundles several containers to a
      * group. The contents are shared between all of them, that is they are
      * displayed on whichever of the containers is currently visible */
@@ -297,6 +307,9 @@ struct Con {
     int base_width;
     int base_height;
 
+    /* the x11 border pixel attribute */
+    int border_width;
+
     /* minimum increment size specified for the window (in pixels) */
     int width_increment;
     int height_increment;
@@ -321,7 +334,7 @@ struct Con {
 
     enum { CF_NONE = 0, CF_OUTPUT = 1, CF_GLOBAL = 2 } fullscreen_mode;
     enum { L_DEFAULT = 0, L_STACKED = 1, L_TABBED = 2 } layout;
-    enum { BS_NORMAL = 0, BS_NONE = 1, BS_1PIXEL = 3 } border_style;
+    border_style_t border_style;
     /** floating? (= not in tiling layout) This cannot be simply a bool
      * because we want to keep track of whether the status was set by the
      * application (by setting _NET_WM_WINDOW_TYPE appropriately) or by the
@@ -335,6 +348,12 @@ struct Con {
         FLOATING_USER_ON = 3
     } floating;
 
+    /** This counter contains the number of UnmapNotify events for this
+     * container (or, more precisely, for its ->frame) which should be ignored.
+     * UnmapNotify events need to be ignored when they are caused by i3 itself,
+     * for example when reparenting or when unmapping the window on a workspace
+     * change. */
+    uint8_t ignore_unmap;
 
     TAILQ_ENTRY(Con) nodes;
     TAILQ_ENTRY(Con) focused;