X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fdata.h;h=ea1d3240d4157938d017cc37195da934cc7db2a5;hb=6241419c86602a999a4766c24edb7b884395e433;hp=e78354f444989aa66d5ff057c30732903a0dfe79;hpb=28104a480ca9a2ab135488ab98545d67e81a9f9d;p=i3%2Fi3 diff --git a/include/data.h b/include/data.h index e78354f4..ea1d3240 100644 --- a/include/data.h +++ b/include/data.h @@ -14,7 +14,6 @@ #include #include -#include #include #include #include @@ -55,7 +54,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 = 2 } border_style_t; +typedef enum { BS_NORMAL = 0, BS_NONE = 1, BS_PIXEL = 2 } border_style_t; /** parameter to specify whether tree_close() and x_window_kill() should kill * only this specific window or the whole X11 client */ @@ -80,6 +79,19 @@ enum { BIND_MODE_SWITCH = (1 << 8) }; +/** + * Container layouts. See Con::layout. + */ +typedef enum { + L_DEFAULT = 0, + L_STACKED = 1, + L_TABBED = 2, + L_DOCKAREA = 3, + L_OUTPUT = 4, + L_SPLITV = 5, + L_SPLITH = 6 +} layout_t; + /** * Stores a rectangle, for example the size of a window, the child window etc. * It needs to be packed so that the compiler will not add any padding bytes. @@ -134,6 +146,7 @@ struct deco_render_params { struct width_height con_window_rect; Rect con_deco_rect; uint32_t background; + layout_t parent_layout; bool con_is_leaf; }; @@ -196,7 +209,8 @@ struct regex { /** * Holds a keybinding, consisting of a keycode combined with modifiers and the - * command which is executed as soon as the key is pressed (see src/cfgparse.y) + * command which is executed as soon as the key is pressed (see + * src/config_parser.c) * */ struct Binding { @@ -214,6 +228,14 @@ struct Binding { B_UPON_KEYRELEASE_IGNORE_MODS = 2, } release; + uint32_t number_keycodes; + + /** Keycode to bind */ + uint32_t keycode; + + /** Bitmask consisting of BIND_MOD_1, BIND_MODE_SWITCH, … */ + uint32_t mods; + /** Symbol the user specified in configfile, if any. This needs to be * stored with the binding to be able to re-convert it into a keycode * if the keyboard mapping changes (using Xmodmap for example) */ @@ -226,13 +248,6 @@ struct Binding { * This is an array of number_keycodes size. */ xcb_keycode_t *translated_to; - uint32_t number_keycodes; - - /** Keycode to bind */ - uint32_t keycode; - - /** Bitmask consisting of BIND_MOD_1, BIND_MODE_SWITCH, … */ - uint32_t mods; /** Command, like in command mode */ char *command; @@ -267,11 +282,6 @@ struct Autostart { struct xoutput { /** Output id, so that we can requery the output directly later */ xcb_randr_output_t id; - /** 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) */ @@ -283,6 +293,12 @@ struct xoutput { bool to_be_disabled; bool primary; + /** Name of the output */ + char *name; + + /** Pointer to the Con which represents this output */ + Con *con; + /** x, y, width, height */ Rect rect; @@ -302,6 +318,11 @@ struct Window { xcb_window_t leader; xcb_window_t transient_for; + /** Pointers to the Assignments which were already ran for this Window + * (assignments run only once) */ + uint32_t nr_assignments; + Assignment **ran_assignments; + char *class_class; char *class_instance; @@ -322,9 +343,6 @@ struct Window { /** Whether the application needs to receive WM_TAKE_FOCUS */ bool needs_take_focus; - /** When this window was marked urgent. 0 means not urgent */ - struct timeval urgent; - /** Whether this window accepts focus. We store this inverted so that the * default will be 'accepts focus'. */ bool doesnt_accept_focus; @@ -332,14 +350,12 @@ struct Window { /** Whether the window says it is a dock window */ enum { W_NODOCK = 0, W_DOCK_TOP = 1, W_DOCK_BOTTOM = 2 } dock; + /** When this window was marked urgent. 0 means not urgent */ + struct timeval urgent; + /** Pixels the window reserves. left/right/top/bottom */ struct reservedpx reserved; - /** Pointers to the Assignments which were already ran for this Window - * (assignments run only once) */ - uint32_t nr_assignments; - Assignment **ran_assignments; - /** Depth of the window */ uint16_t depth; }; @@ -372,8 +388,8 @@ struct Match { M_DOCK_BOTTOM = 3 } dock; xcb_window_t id; - Con *con_id; enum { M_ANY = 0, M_TILING, M_FLOATING } floating; + Con *con_id; /* Where the window looking for a match should be inserted: * @@ -386,12 +402,12 @@ struct Match { */ enum { M_HERE = 0, M_ASSIGN_WS, M_BELOW } insert_where; + TAILQ_ENTRY(Match) matches; + /* Whether this match was generated when restarting i3 inplace. * Leads to not setting focus when managing a new window, because the old * focus stack should be restored. */ bool restart_mode; - - TAILQ_ENTRY(Match) matches; }; /** @@ -440,8 +456,24 @@ struct Assignment { */ struct Con { bool mapped; - /** whether this is a split container or not */ - bool split; + + /* Should this container be marked urgent? This gets set when the window + * inside this container (if any) sets the urgency hint, for example. */ + bool urgent; + + /** 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; + + /* ids/pixmap/graphics context for the frame window */ + bool pixmap_recreated; + xcb_window_t frame; + xcb_pixmap_t pixmap; + xcb_gcontext_t pm_gc; + enum { CT_ROOT = 0, CT_OUTPUT = 1, @@ -450,6 +482,11 @@ struct Con { CT_WORKSPACE = 4, CT_DOCKAREA = 5 } type; + + /** 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; + struct Con *parent; struct Rect rect; @@ -460,10 +497,6 @@ 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 */ @@ -474,10 +507,8 @@ struct Con { double percent; - /* proportional width/height, calculated from WM_NORMAL_HINTS, used to - * apply an aspect ratio to windows (think of MPlayer) */ - int proportional_width; - int proportional_height; + /* aspect ratio from WM_NORMAL_HINTS (MPlayer uses this for example) */ + double aspect_ratio; /* the wanted size of the window, used in combination with size * increments (see below). */ int base_width; @@ -485,6 +516,7 @@ struct Con { /* the x11 border pixel attribute */ int border_width; + int current_border_width; /* minimum increment size specified for the window (in pixels) */ int width_increment; @@ -492,19 +524,9 @@ struct Con { struct Window *window; - /* Should this container be marked urgent? This gets set when the window - * inside this container (if any) sets the urgency hint, for example. */ - bool urgent; - /* timer used for disabling urgency */ struct ev_timer *urgency_timer; - /* ids/pixmap/graphics context for the frame window */ - xcb_window_t frame; - xcb_pixmap_t pixmap; - xcb_gcontext_t pm_gc; - bool pixmap_recreated; - /** Cache for the decoration rendering */ struct deco_render_params *deco_render_params; @@ -531,15 +553,7 @@ struct Con { * parent and opening new containers). Instead, it stores the requested * layout in workspace_layout and creates a new split container with that * layout whenever a new container is attached to the workspace. */ - enum { - L_DEFAULT = 0, - L_STACKED = 1, - L_TABBED = 2, - L_DOCKAREA = 3, - L_OUTPUT = 4, - L_SPLITV = 5, - L_SPLITH = 6 - } layout, last_split_layout, workspace_layout; + layout_t layout, last_split_layout, workspace_layout; 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 @@ -554,13 +568,6 @@ 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; TAILQ_ENTRY(Con) all_cons; @@ -570,14 +577,23 @@ struct Con { void(*on_remove_child)(Con *); enum { + /* Not a scratchpad window. */ SCRATCHPAD_NONE = 0, + + /* Just moved to scratchpad, not resized by the user yet. + * Window will be auto-centered and sized appropriately. */ SCRATCHPAD_FRESH = 1, + + /* The user changed position/size of the scratchpad window. */ SCRATCHPAD_CHANGED = 2 } scratchpad_state; /* The ID of this container before restarting. Necessary to correctly * interpret back-references in the JSON (such as the focus stack). */ int old_id; + + /* Depth of the container window */ + uint16_t depth; }; #endif