X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fdata.h;h=eba0f968088363202eb519130e05f4bee0ad30e3;hb=94b1e76af45431f8cb5878679591cd504f629e60;hp=b53e277d331aee1a9e2a7e17ac34b2d0c70b5c64;hpb=78e99440f6ff144bb6842f3fb33c1f65faadc4df;p=i3%2Fi3 diff --git a/include/data.h b/include/data.h index b53e277d..eba0f968 100644 --- a/include/data.h +++ b/include/data.h @@ -7,8 +7,7 @@ * include/data.h: This file defines all data structures used by i3 * */ -#ifndef I3_DATA_H -#define I3_DATA_H +#pragma once #define SN_API_NOT_YET_FROZEN 1 #include @@ -48,34 +47,42 @@ typedef struct Match Match; typedef struct Assignment Assignment; typedef struct Window i3Window; - /****************************************************************************** * Helper types *****************************************************************************/ -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_PIXEL = 2 } border_style_t; +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_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 */ -typedef enum { DONT_KILL_WINDOW = 0, KILL_WINDOW = 1, KILL_CLIENT = 2 } kill_window_t; +typedef enum { DONT_KILL_WINDOW = 0, + KILL_WINDOW = 1, + KILL_CLIENT = 2 } kill_window_t; /** describes if the window is adjacent to the output (physical screen) edges. */ typedef enum { ADJ_NONE = 0, ADJ_LEFT_SCREEN_EDGE = (1 << 0), ADJ_RIGHT_SCREEN_EDGE = (1 << 1), ADJ_UPPER_SCREEN_EDGE = (1 << 2), - ADJ_LOWER_SCREEN_EDGE = (1 << 4)} adjacent_t; + ADJ_LOWER_SCREEN_EDGE = (1 << 4) } adjacent_t; enum { BIND_NONE = 0, - BIND_SHIFT = XCB_MOD_MASK_SHIFT, /* (1 << 0) */ - BIND_CONTROL = XCB_MOD_MASK_CONTROL, /* (1 << 2) */ - BIND_MOD1 = XCB_MOD_MASK_1, /* (1 << 3) */ - BIND_MOD2 = XCB_MOD_MASK_2, /* (1 << 4) */ - BIND_MOD3 = XCB_MOD_MASK_3, /* (1 << 5) */ - BIND_MOD4 = XCB_MOD_MASK_4, /* (1 << 6) */ - BIND_MOD5 = XCB_MOD_MASK_5, /* (1 << 7) */ + BIND_SHIFT = XCB_MOD_MASK_SHIFT, /* (1 << 0) */ + BIND_CONTROL = XCB_MOD_MASK_CONTROL, /* (1 << 2) */ + BIND_MOD1 = XCB_MOD_MASK_1, /* (1 << 3) */ + BIND_MOD2 = XCB_MOD_MASK_2, /* (1 << 4) */ + BIND_MOD3 = XCB_MOD_MASK_3, /* (1 << 5) */ + BIND_MOD4 = XCB_MOD_MASK_4, /* (1 << 6) */ + BIND_MOD5 = XCB_MOD_MASK_5, /* (1 << 7) */ BIND_MODE_SWITCH = (1 << 8) }; @@ -92,6 +99,22 @@ typedef enum { L_SPLITH = 6 } layout_t; +/** + * Binding input types. See Binding::input_type. + */ +typedef enum { + B_KEYBOARD = 0, + B_MOUSE = 1 +} input_type_t; + +/** + * Mouse pointer warping modes. + */ +typedef enum { + POINTER_WARPING_OUTPUT = 0, + POINTER_WARPING_NONE = 1 +} warping_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. @@ -151,7 +174,7 @@ struct deco_render_params { }; /** - * Stores which workspace (by name) goes to which output. + * Stores which workspace (by name or number) goes to which output. * */ struct Workspace_Assignment { @@ -214,6 +237,10 @@ struct regex { * */ struct Binding { + /* The type of input this binding is for. (Mouse bindings are not yet + * implemented. All bindings are currently assumed to be keyboard bindings.) */ + input_type_t input_type; + /** If true, the binding should be executed upon a KeyRelease event, not a * KeyPress (the default). */ enum { @@ -228,6 +255,11 @@ struct Binding { B_UPON_KEYRELEASE_IGNORE_MODS = 2, } release; + /** If this is true for a mouse binding, the binding should be executed + * when the button is pressed over any part of the window, not just the + * title bar (default). */ + bool whole_window; + uint32_t number_keycodes; /** Keycode to bind */ @@ -248,7 +280,6 @@ struct Binding { * This is an array of number_keycodes size. */ xcb_keycode_t *translated_to; - /** Command, like in command mode */ char *command; @@ -348,7 +379,9 @@ struct Window { bool doesnt_accept_focus; /** Whether the window says it is a dock window */ - enum { W_NODOCK = 0, W_DOCK_TOP = 1, W_DOCK_BOTTOM = 2 } dock; + 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; @@ -374,7 +407,7 @@ struct Match { struct regex *class; struct regex *instance; struct regex *mark; - struct regex *role; + struct regex *window_role; enum { U_DONTCHECK = -1, U_LATEST = 0, @@ -388,7 +421,9 @@ struct Match { M_DOCK_BOTTOM = 3 } dock; xcb_window_t id; - enum { M_ANY = 0, M_TILING, M_FLOATING } floating; + enum { M_ANY = 0, + M_TILING, + M_FLOATING } floating; Con *con_id; /* Where the window looking for a match should be inserted: @@ -400,7 +435,9 @@ struct Match { * (dockareas) * */ - enum { M_HERE = 0, M_ASSIGN_WS, M_BELOW } insert_where; + enum { M_HERE = 0, + M_ASSIGN_WS, + M_BELOW } insert_where; TAILQ_ENTRY(Match) matches; @@ -413,7 +450,7 @@ struct Match { /** * An Assignment makes specific windows go to a specific workspace/output or * run a command for that window. With this mechanism, the user can -- for - * example -- assign his browser to workspace "www". Checking if a window is + * example -- assign their browser to workspace "www". Checking if a window is * assigned works by comparing the Match data structure with the window (see * match_matches_window()). * @@ -431,10 +468,10 @@ struct Assignment { * */ enum { - A_ANY = 0, - A_COMMAND = (1 << 0), + A_ANY = 0, + A_COMMAND = (1 << 0), A_TO_WORKSPACE = (1 << 1), - A_TO_OUTPUT = (1 << 2) + A_TO_OUTPUT = (1 << 2) } type; /** the criteria to check if a window matches */ @@ -450,6 +487,11 @@ struct Assignment { TAILQ_ENTRY(Assignment) assignments; }; +/** Fullscreen modes. Used by Con.fullscreen_mode. */ +typedef enum { CF_NONE = 0, + CF_OUTPUT = 1, + CF_GLOBAL = 2 } fullscreen_mode_t; + /** * A 'Con' represents everything from the X11 root window down to a single X11 window. * @@ -507,10 +549,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; @@ -540,7 +580,7 @@ struct Con { TAILQ_HEAD(swallow_head, Match) swallow_head; - enum { CF_NONE = 0, CF_OUTPUT = 1, CF_GLOBAL = 2 } fullscreen_mode; + fullscreen_mode_t fullscreen_mode; /* layout is the layout of this container: one of split[v|h], stacked or * tabbed. Special containers in the tree (above workspaces) have special * layouts like dockarea or output. @@ -576,7 +616,7 @@ struct Con { TAILQ_ENTRY(Con) floating_windows; /** callbacks */ - void(*on_remove_child)(Con *); + void (*on_remove_child)(Con *); enum { /* Not a scratchpad window. */ @@ -597,5 +637,3 @@ struct Con { /* Depth of the container window */ uint16_t depth; }; - -#endif