Give layout enum a name: layout_t
This commit is contained in:
parent
55a338c919
commit
96575e14a0
|
@ -275,7 +275,7 @@ void con_set_border_style(Con *con, int border_style, int border_width);
|
||||||
* new split container before).
|
* new split container before).
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void con_set_layout(Con *con, int layout);
|
void con_set_layout(Con *con, layout_t layout);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This function toggles the layout of a given container. toggle_mode can be
|
* This function toggles the layout of a given container. toggle_mode can be
|
||||||
|
|
|
@ -95,7 +95,7 @@ struct Config {
|
||||||
char *ipc_socket_path;
|
char *ipc_socket_path;
|
||||||
const char *restart_state_path;
|
const char *restart_state_path;
|
||||||
|
|
||||||
int default_layout;
|
layout_t default_layout;
|
||||||
int container_stack_limit;
|
int container_stack_limit;
|
||||||
int container_stack_limit_value;
|
int container_stack_limit_value;
|
||||||
int default_border_width;
|
int default_border_width;
|
||||||
|
|
|
@ -79,6 +79,19 @@ enum {
|
||||||
BIND_MODE_SWITCH = (1 << 8)
|
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.
|
* 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.
|
* It needs to be packed so that the compiler will not add any padding bytes.
|
||||||
|
@ -531,15 +544,7 @@ struct Con {
|
||||||
* parent and opening new containers). Instead, it stores the requested
|
* parent and opening new containers). Instead, it stores the requested
|
||||||
* layout in workspace_layout and creates a new split container with that
|
* layout in workspace_layout and creates a new split container with that
|
||||||
* layout whenever a new container is attached to the workspace. */
|
* layout whenever a new container is attached to the workspace. */
|
||||||
enum {
|
layout_t layout, last_split_layout, workspace_layout;
|
||||||
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;
|
|
||||||
border_style_t border_style;
|
border_style_t border_style;
|
||||||
/** floating? (= not in tiling layout) This cannot be simply a bool
|
/** 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
|
* because we want to keep track of whether the status was set by the
|
||||||
|
|
|
@ -1547,7 +1547,7 @@ void cmd_layout(I3_CMD, char *layout_str) {
|
||||||
if (strcmp(layout_str, "stacking") == 0)
|
if (strcmp(layout_str, "stacking") == 0)
|
||||||
layout_str = "stacked";
|
layout_str = "stacked";
|
||||||
owindow *current;
|
owindow *current;
|
||||||
int layout;
|
layout_t layout;
|
||||||
/* default is a special case which will be handled in con_set_layout(). */
|
/* default is a special case which will be handled in con_set_layout(). */
|
||||||
if (strcmp(layout_str, "default") == 0)
|
if (strcmp(layout_str, "default") == 0)
|
||||||
layout = L_DEFAULT;
|
layout = L_DEFAULT;
|
||||||
|
|
|
@ -1209,7 +1209,7 @@ void con_set_border_style(Con *con, int border_style, int border_width) {
|
||||||
* new split container before).
|
* new split container before).
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void con_set_layout(Con *con, int layout) {
|
void con_set_layout(Con *con, layout_t layout) {
|
||||||
DLOG("con_set_layout(%p, %d), con->type = %d\n",
|
DLOG("con_set_layout(%p, %d), con->type = %d\n",
|
||||||
con, layout, con->type);
|
con, layout, con->type);
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,7 @@ static void handle_enter_notify(xcb_enter_notify_event_t *event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* see if the user entered the window on a certain window decoration */
|
/* see if the user entered the window on a certain window decoration */
|
||||||
int layout = (enter_child ? con->parent->layout : con->layout);
|
layout_t layout = (enter_child ? con->parent->layout : con->layout);
|
||||||
if (layout == L_DEFAULT) {
|
if (layout == L_DEFAULT) {
|
||||||
Con *child;
|
Con *child;
|
||||||
TAILQ_FOREACH(child, &(con->nodes_head), nodes)
|
TAILQ_FOREACH(child, &(con->nodes_head), nodes)
|
||||||
|
|
Loading…
Reference in New Issue