gri3-wm/src/load_layout.c

691 lines
26 KiB
C
Raw Permalink Normal View History

/*
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
* © 2009 Michael Stapelberg and contributors (see also: LICENSE)
*
* load_layout.c: Restore (parts of) the layout, for example after an inplace
* restart.
*
*/
#include "all.h"
Remove some includes from all.h Also removes duplicates from other headers All used std* imports are included once in all.h for easy use - getopt: Only used in main.c and inject_randr1.5.c - glob: Not used in i3, only in i3bar & libi3 - inttypes: Only used in util.c - locale: A bit specific for all.h - math: Slow according to #4022 - unistd: I feel it's good to explicitly include per file that needs it - yajl: Specific to yajl_utils.h and ipc.h Related to #4022 Timing before: ``` Analyzing build trace from ... **** Time summary: Compilation (81 times): Parsing (frontend): 51.3 s Codegen & opts (backend): 7.7 s **** Files that took longest to parse (compiler frontend): 1254 ms: build/src/i3-commands.o 972 ms: build/src/i3-resize.o 945 ms: build/src/i3-con.o 921 ms: build/src/i3-scratchpad.o 907 ms: build/src/i3-main.o 904 ms: build/src/i3-handlers.o 904 ms: build/src/i3-config_directives.o 893 ms: build/src/i3-restore_layout.o 875 ms: build/src/i3-x.o 854 ms: build/src/i3-ipc.o **** Files that took longest to codegen (compiler backend): 863 ms: build/src/i3-commands.o 471 ms: build/i3bar/src/i3bar-xcb.o 377 ms: build/src/i3-con.o 360 ms: build/src/i3-ipc.o 306 ms: build/src/i3-x.o 290 ms: build/src/i3-main.o 238 ms: build/src/i3-config_parser.o 237 ms: build/src/i3-handlers.o 220 ms: build/i3-config-wizard/i3_config_wizard-main.o 214 ms: build/src/i3-bindings.o **** Functions that took longest to compile: 209 ms: main (../../i3/src/main.c) 95 ms: manage_window (../../i3/src/manage.c) 57 ms: reconfig_windows (../../i3/i3bar/src/xcb.c) 55 ms: x_draw_decoration (../../i3/src/x.c) 49 ms: x_push_node (../../i3/src/x.c) 48 ms: handle_client_message (../../i3/src/handlers.c) 48 ms: dump_node (../../i3/src/ipc.c) 47 ms: GENERATED_call (../../i3/src/config_parser.c) 45 ms: config_string_cb (../../i3/i3bar/src/config.c) 44 ms: GENERATED_call (../../i3/src/commands_parser.c) 42 ms: floating_check_size (../../i3/src/floating.c) 40 ms: con_swap (../../i3/src/con.c) 40 ms: parse_config (../../i3/src/config_parser.c) 39 ms: main (../../i3/i3-nagbar/main.c) 39 ms: cmd_rename_workspace (../../i3/src/commands.c) 38 ms: window_update_normal_hints (../../i3/src/window.c) 38 ms: cmd_swap (../../i3/src/commands.c) 37 ms: dump_bar_config (../../i3/src/ipc.c) 36 ms: translate_keysyms (../../i3/src/bindings.c) 35 ms: tree_close_internal (../../i3/src/tree.c) 34 ms: match_matches_window (../../i3/src/match.c) 34 ms: floating_enable (../../i3/src/floating.c) 34 ms: json_string (../../i3/src/load_layout.c) 33 ms: x_push_changes (../../i3/src/x.c) 33 ms: main (../../i3/i3-config-wizard/main.c) 31 ms: free_configuration (../../i3/src/config.c) 30 ms: parse_file (../../i3/src/config_parser.c) 28 ms: load_font (../../i3/libi3/font.c) 28 ms: handle_configure_request (../../i3/src/handlers.c) 28 ms: parse_command (../../i3/src/commands_parser.c) **** Function sets that took longest to compile / optimize: *** Expensive headers: 29287 ms: ../../i3/include/libi3.h (included 78 times, avg 375 ms), included via: i3-resize.o all.h data.h (576 ms) a-g_utf8_make_valid.o (491 ms) a-dpi.o (491 ms) a-get_colorpixel.o (483 ms) a-is_debug_build.o (478 ms) a-strndup.o (478 ms) ... 29221 ms: ../../i3/include/all.h (included 39 times, avg 749 ms), included via: i3-resize.o (946 ms) i3-scratchpad.o (895 ms) i3-restore_layout.o (865 ms) i3-handlers.o (839 ms) i3-drag.o (830 ms) i3-config_directives.o (793 ms) ... 5195 ms: /usr/include/xcb/xcb.h (included 79 times, avg 65 ms), included via: i3-handlers.o all.h (113 ms) i3-restore_layout.o all.h (108 ms) a-g_utf8_make_valid.o libi3.h (108 ms) i3bar-xcb.o common.h (105 ms) i3-scratchpad.o all.h (95 ms) a-get_colorpixel.o libi3.h (89 ms) ... 4100 ms: /usr/include/math.h (included 41 times, avg 100 ms), included via: i3-scratchpad.o all.h (180 ms) i3-fake_outputs.o all.h (138 ms) i3-regex.o all.h (130 ms) i3-restore_layout.o all.h (128 ms) i3-xcb.o all.h (121 ms) i3-move.o all.h (119 ms) ... 4046 ms: ../../i3/i3bar/include/common.h (included 9 times, avg 449 ms), included via: i3bar-main.o (503 ms) i3bar-xcb.o (501 ms) i3bar-workspaces.o (472 ms) i3bar-parse_json_header.o (446 ms) i3bar-child.o (438 ms) i3bar-ipc.o (434 ms) ... 2713 ms: ../../i3/include/i3.h (included 41 times, avg 66 ms), included via: i3-xcursor.o (450 ms) i3-config_directives.o all.h ipc.h configuration.h (87 ms) i3-config.o all.h ipc.h configuration.h (71 ms) i3-manage.o all.h ipc.h configuration.h (70 ms) i3-window.o all.h ipc.h configuration.h (68 ms) i3-x.o all.h ipc.h configuration.h (61 ms) ... 1492 ms: /usr/include/xcb/xkb.h (included 42 times, avg 35 ms), included via: i3-config_directives.o all.h ipc.h configuration.h i3.h (50 ms) i3-config.o all.h ipc.h configuration.h i3.h (45 ms) i3-window.o all.h ipc.h configuration.h i3.h (43 ms) i3-x.o all.h ipc.h configuration.h i3.h (42 ms) i3-manage.o all.h ipc.h configuration.h i3.h (41 ms) i3-config_parser.o all.h ipc.h configuration.h i3.h (38 ms) ... 1432 ms: /usr/include/stdlib.h (included 79 times, avg 18 ms), included via: i3-scratchpad.o all.h (48 ms) i3-restore_layout.o all.h (36 ms) i3-regex.o all.h (32 ms) i3-key_press.o all.h (28 ms) i3-commands.o all.h (28 ms) i3-bindings.o all.h (24 ms) ... 1349 ms: /usr/include/pthread.h (included 79 times, avg 17 ms), included via: i3bar-xcb.o common.h xcb.h (33 ms) a-ucs2_conversion.o libi3.h xcb.h (32 ms) i3-match.o all.h xcb.h (27 ms) i3-scratchpad.o all.h xcb.h (25 ms) a-g_utf8_make_valid.o libi3.h xcb.h (25 ms) i3_config_wizard-main.o xcb.h (24 ms) ... 1151 ms: /usr/include/X11/Xlib.h (included 45 times, avg 25 ms), included via: i3-output.o all.h data.h sn-launcher.h sn-common.h (50 ms) i3-config_parser.o all.h data.h sn-launcher.h sn-common.h (43 ms) i3-x.o all.h data.h sn-launcher.h sn-common.h (34 ms) i3-config_directives.o all.h data.h sn-launcher.h sn-common.h (32 ms) i3_config_wizard-main.o sn-launchee.h sn-common.h (30 ms) i3-drag.o all.h data.h sn-launcher.h sn-common.h (29 ms) ... ``` Timing after: ``` Analyzing build trace from ... **** Time summary: Compilation (81 times): Parsing (frontend): 47.6 s Codegen & opts (backend): 7.6 s **** Files that took longest to parse (compiler frontend): 1154 ms: build/src/i3-commands.o 929 ms: build/src/i3-display_version.o 852 ms: build/src/i3-bindings.o 847 ms: build/src/i3-con.o 806 ms: build/src/i3-ipc.o 801 ms: build/src/i3-floating.o 792 ms: build/src/i3-main.o 792 ms: build/src/i3-drag.o 792 ms: build/src/i3-window.o 776 ms: build/src/i3-config_directives.o **** Files that took longest to codegen (compiler backend): 885 ms: build/src/i3-commands.o 422 ms: build/i3bar/src/i3bar-xcb.o 382 ms: build/src/i3-con.o 348 ms: build/src/i3-x.o 288 ms: build/src/i3-ipc.o 268 ms: build/src/i3-handlers.o 254 ms: build/src/i3-main.o 251 ms: build/src/i3-floating.o 249 ms: build/src/i3-config_parser.o 194 ms: build/src/i3-randr.o **** Functions that took longest to compile: 186 ms: main (../../i3/src/main.c) 95 ms: manage_window (../../i3/src/manage.c) 65 ms: floating_check_size (../../i3/src/floating.c) 63 ms: x_draw_decoration (../../i3/src/x.c) 58 ms: handle_client_message (../../i3/src/handlers.c) 55 ms: x_push_node (../../i3/src/x.c) 54 ms: match_matches_window (../../i3/src/match.c) 51 ms: parse_config (../../i3/src/config_parser.c) 49 ms: dump_node (../../i3/src/ipc.c) 47 ms: reconfig_windows (../../i3/i3bar/src/xcb.c) 47 ms: config_string_cb (../../i3/i3bar/src/config.c) 45 ms: GENERATED_call (../../i3/src/config_parser.c) 45 ms: GENERATED_call (../../i3/src/commands_parser.c) 43 ms: floating_enable (../../i3/src/floating.c) 42 ms: handle_configure_request (../../i3/src/handlers.c) 40 ms: con_swap (../../i3/src/con.c) 36 ms: main (../../i3/i3-input/main.c) 36 ms: main (../../i3/i3-msg/main.c) 36 ms: main (../../i3/i3-nagbar/main.c) 36 ms: cmd_move_con_to_workspace_number (../../i3/src/commands.c) 35 ms: json_string (../../i3/src/load_layout.c) 35 ms: tree_restore (../../i3/src/tree.c) 35 ms: cmd_swap (../../i3/src/commands.c) 34 ms: x_push_changes (../../i3/src/x.c) 32 ms: main (../../i3/i3-config-wizard/main.c) 32 ms: ewmh_setup_hints (../../i3/src/ewmh.c) 31 ms: match_parse_property (../../i3/src/match.c) 30 ms: cmd_mark (../../i3/src/commands.c) 30 ms: translate_keysyms (../../i3/src/bindings.c) 30 ms: window_update_normal_hints (../../i3/src/window.c) **** Function sets that took longest to compile / optimize: *** Expensive headers: 29596 ms: ../../i3/include/libi3.h (included 78 times, avg 379 ms), included via: a-get_config_path.o (539 ms) i3_dump_log-main.o (522 ms) i3_config_wizard-main.o (501 ms) a-fake_configure_notify.o (500 ms) a-root_atom_contents.o (488 ms) i3-display_version.o all.h (466 ms) ... 26054 ms: ../../i3/include/all.h (included 41 times, avg 635 ms), included via: i3-display_version.o (901 ms) i3-drag.o (775 ms) i3-ewmh.o (703 ms) i3-startup.o (693 ms) i3-commands.o (687 ms) i3-xcb.o (680 ms) ... 5345 ms: /usr/include/xcb/xcb.h (included 79 times, avg 67 ms), included via: i3-display_version.o all.h (173 ms) i3_input-keysym2ucs.o keysym2ucs.h (106 ms) i3-ewmh.o all.h (106 ms) a-fake_configure_notify.o libi3.h (103 ms) a-get_config_path.o libi3.h (95 ms) i3bar-parse_json_header.o common.h (93 ms) ... 4127 ms: ../../i3/i3bar/include/common.h (included 9 times, avg 458 ms), included via: i3bar-child.o (524 ms) i3bar-mode.o (486 ms) i3bar-outputs.o (464 ms) i3bar-parse_json_header.o (463 ms) i3bar-config.o (457 ms) i3bar-ipc.o (448 ms) ... 1542 ms: /usr/include/xcb/xkb.h (included 42 times, avg 36 ms), included via: i3-con.o all.h ipc.h configuration.h i3.h (60 ms) i3-render.o all.h ipc.h configuration.h i3.h (56 ms) i3-bindings.o all.h ipc.h configuration.h i3.h (56 ms) i3-sighandler.o all.h ipc.h configuration.h i3.h (48 ms) i3-xcb.o all.h ipc.h configuration.h i3.h (47 ms) i3-resize.o all.h ipc.h configuration.h i3.h (39 ms) ... 1456 ms: /usr/include/stdlib.h (included 79 times, avg 18 ms), included via: i3-drag.o all.h (60 ms) i3-display_version.o all.h (55 ms) i3-fake_outputs.o all.h (39 ms) i3-config_directives.o all.h (33 ms) i3-xcursor.o all.h (30 ms) i3bar-mode.o common.h libi3.h pango.h pango-attributes.h pango-font.h pango-coverage.h glib-object.h gbinding.h glib.h gasyncqueue.h gthread.h gutils.h (29 ms) ... 1136 ms: /usr/include/X11/Xlib.h (included 44 times, avg 25 ms), included via: i3-con.o all.h data.h sn-launcher.h sn-common.h (35 ms) i3-resize.o all.h data.h sn-launcher.h sn-common.h (34 ms) i3-util.o all.h data.h sn-launcher.h sn-common.h (33 ms) i3-assignments.o all.h data.h sn-launcher.h sn-common.h (33 ms) i3-sighandler.o all.h data.h sn-launcher.h sn-common.h (31 ms) i3-xcb.o all.h data.h sn-launcher.h sn-common.h (31 ms) ... 808 ms: /usr/include/stdio.h (included 79 times, avg 10 ms), included via: i3-drag.o all.h (19 ms) i3-fake_outputs.o all.h (18 ms) a-font.o libi3.h (16 ms) i3bar-child.o common.h libi3.h (15 ms) a-safewrappers.o libi3.h (15 ms) a-ipc_send_message.o libi3.h (13 ms) ... 770 ms: /usr/include/xcb/randr.h (included 42 times, avg 18 ms), included via: i3-click.o all.h data.h (29 ms) i3-commands.o all.h data.h (27 ms) i3-assignments.o all.h data.h (25 ms) i3-xcb.o all.h data.h (21 ms) i3-resize.o all.h data.h (21 ms) i3-sighandler.o all.h data.h (20 ms) ... 688 ms: /usr/include/math.h (included 6 times, avg 114 ms), included via: a-dpi.o (145 ms) i3-render.o (127 ms) i3-floating.o (106 ms) a-root_atom_contents.o (106 ms) i3-window.o (102 ms) i3-bindings.o (99 ms) ... ```
2020-04-19 11:22:59 +02:00
#include <locale.h>
#include <yajl/yajl_parse.h>
/* TODO: refactor the whole parsing thing */
static char *last_key;
static int incomplete;
static Con *json_node;
static Con *to_focus;
static bool parsing_swallows;
static bool parsing_rect;
static bool parsing_deco_rect;
static bool parsing_window_rect;
static bool parsing_geometry;
static bool parsing_focus;
static bool parsing_marks;
struct Match *current_swallow;
static bool swallow_is_empty;
static int num_marks;
/* We need to save each container that needs to be marked if we want to support
* marking non-leaf containers. In their case, the end_map for their children is
* called before their own end_map, so marking json_node would end up marking
* the latest child. We can't just mark containers immediately after we parse a
* mark because of #2511. */
struct pending_marks {
char *mark;
Con *con_to_be_marked;
} * marks;
/* This list is used for reordering the focus stack after parsing the 'focus'
* array. */
struct focus_mapping {
int old_id;
TAILQ_ENTRY(focus_mapping)
focus_mappings;
};
static TAILQ_HEAD(focus_mappings_head, focus_mapping) focus_mappings =
TAILQ_HEAD_INITIALIZER(focus_mappings);
static int json_start_map(void *ctx) {
LOG("start of map, last_key = %s\n", last_key);
if (parsing_swallows) {
LOG("creating new swallow\n");
current_swallow = smalloc(sizeof(Match));
match_init(current_swallow);
current_swallow->dock = M_DONTCHECK;
TAILQ_INSERT_TAIL(&(json_node->swallow_head), current_swallow, matches);
swallow_is_empty = true;
} else {
if (!parsing_rect && !parsing_deco_rect && !parsing_window_rect && !parsing_geometry) {
if (last_key && strcasecmp(last_key, "floating_nodes") == 0) {
DLOG("New floating_node\n");
Con *ws = con_get_workspace(json_node);
json_node = con_new_skeleton(NULL, NULL);
json_node->name = NULL;
json_node->parent = ws;
DLOG("Parent is workspace = %p\n", ws);
} else {
Con *parent = json_node;
json_node = con_new_skeleton(NULL, NULL);
json_node->name = NULL;
json_node->parent = parent;
}
/* json_node is incomplete and should be removed if parsing fails */
incomplete++;
DLOG("incomplete = %d\n", incomplete);
}
}
return 1;
}
static int json_end_map(void *ctx) {
LOG("end of map\n");
if (!parsing_swallows && !parsing_rect && !parsing_deco_rect && !parsing_window_rect && !parsing_geometry) {
/* Set a few default values to simplify manually crafted layout files. */
if (json_node->layout == L_DEFAULT) {
DLOG("Setting layout = L_SPLITH\n");
json_node->layout = L_SPLITH;
}
/* Sanity check: swallow criteria dont make any sense on a split
* container. */
if (con_is_split(json_node) > 0 && !TAILQ_EMPTY(&(json_node->swallow_head))) {
DLOG("sanity check: removing swallows specification from split container\n");
while (!TAILQ_EMPTY(&(json_node->swallow_head))) {
Match *match = TAILQ_FIRST(&(json_node->swallow_head));
TAILQ_REMOVE(&(json_node->swallow_head), match, matches);
match_free(match);
2016-01-09 14:19:00 +01:00
free(match);
}
}
if (json_node->type == CT_WORKSPACE) {
/* Ensure the workspace has a name. */
DLOG("Attaching workspace. name = %s\n", json_node->name);
if (json_node->name == NULL || strcmp(json_node->name, "") == 0) {
json_node->name = sstrdup("unnamed");
}
/* Prevent name clashes when appending a workspace, e.g. when the
* user tries to restore a workspace called 1 but already has a
* workspace called 1. */
char *base = sstrdup(json_node->name);
int cnt = 1;
while (get_existing_workspace_by_name(json_node->name) != NULL) {
FREE(json_node->name);
sasprintf(&(json_node->name), "%s_%d", base, cnt++);
}
free(base);
/* Set num accordingly so that i3bar will properly sort it. */
json_node->num = ws_name_to_number(json_node->name);
}
// When appending JSON layout files that only contain the workspace
// _contents_, we might not have an upfront signal that the
// container were currently parsing is a floating container (like
// the “floating_nodes” key of the workspace container itself).
// Thats why we make sure the con is attached at the right place
// in the hierarchy in case its floating.
if (json_node->type == CT_FLOATING_CON) {
DLOG("fixing parent which currently is %p / %s\n", json_node->parent, json_node->parent->name);
json_node->parent = con_get_workspace(json_node->parent);
// Also set a size if none was supplied, otherwise the placeholder
// window cannot be created as X11 requests with width=0 or
// height=0 are invalid.
if (rect_equals(json_node->rect, (Rect){0, 0, 0, 0})) {
DLOG("Geometry not set, combining children\n");
Con *child;
TAILQ_FOREACH (child, &(json_node->nodes_head), nodes) {
DLOG("child geometry: %d x %d\n", child->geometry.width, child->geometry.height);
json_node->rect.width += child->geometry.width;
json_node->rect.height = max(json_node->rect.height, child->geometry.height);
}
}
floating_check_size(json_node, false);
}
if (num_marks > 0) {
for (int i = 0; i < num_marks; i++) {
Con *con = marks[i].con_to_be_marked;
char *mark = marks[i].mark;
con_mark(con, mark, MM_ADD);
free(mark);
}
2018-08-01 17:08:26 +02:00
FREE(marks);
num_marks = 0;
}
LOG("attaching\n");
con_attach(json_node, json_node->parent, true);
LOG("Creating window\n");
x_con_init(json_node);
/* Fix erroneous JSON input regarding floating containers to avoid
* crashing, see #3901. */
const int old_floating_mode = json_node->floating;
if (old_floating_mode >= FLOATING_AUTO_ON && json_node->parent->type != CT_FLOATING_CON) {
LOG("Fixing floating node without CT_FLOATING_CON parent\n");
/* Force floating_enable to work */
json_node->floating = FLOATING_AUTO_OFF;
floating_enable(json_node, false);
json_node->floating = old_floating_mode;
}
json_node = json_node->parent;
incomplete--;
DLOG("incomplete = %d\n", incomplete);
}
if (parsing_swallows && swallow_is_empty) {
/* We parsed an empty swallow definition. This is an invalid layout
* definition, hence we reject it. */
ELOG("Layout file is invalid: found an empty swallow definition.\n");
return 0;
}
parsing_rect = false;
parsing_deco_rect = false;
parsing_window_rect = false;
parsing_geometry = false;
return 1;
}
static int json_end_array(void *ctx) {
LOG("end of array\n");
if (!parsing_swallows && !parsing_focus && !parsing_marks) {
con_fix_percent(json_node);
}
if (parsing_swallows) {
parsing_swallows = false;
}
if (parsing_marks) {
parsing_marks = false;
}
if (parsing_focus) {
/* Clear the list of focus mappings */
struct focus_mapping *mapping;
TAILQ_FOREACH_REVERSE (mapping, &focus_mappings, focus_mappings_head, focus_mappings) {
LOG("focus (reverse) %d\n", mapping->old_id);
Con *con;
TAILQ_FOREACH (con, &(json_node->focus_head), focused) {
if (con->old_id != mapping->old_id)
continue;
LOG("got it! %p\n", con);
/* Move this entry to the top of the focus list. */
TAILQ_REMOVE(&(json_node->focus_head), con, focused);
TAILQ_INSERT_HEAD(&(json_node->focus_head), con, focused);
break;
}
}
while (!TAILQ_EMPTY(&focus_mappings)) {
mapping = TAILQ_FIRST(&focus_mappings);
TAILQ_REMOVE(&focus_mappings, mapping, focus_mappings);
free(mapping);
}
parsing_focus = false;
}
return 1;
}
static int json_key(void *ctx, const unsigned char *val, size_t len) {
LOG("key: %.*s\n", (int)len, val);
FREE(last_key);
last_key = scalloc(len + 1, 1);
memcpy(last_key, val, len);
if (strcasecmp(last_key, "swallows") == 0)
parsing_swallows = true;
if (strcasecmp(last_key, "rect") == 0)
parsing_rect = true;
if (strcasecmp(last_key, "deco_rect") == 0)
parsing_deco_rect = true;
if (strcasecmp(last_key, "window_rect") == 0)
parsing_window_rect = true;
if (strcasecmp(last_key, "geometry") == 0)
parsing_geometry = true;
if (strcasecmp(last_key, "focus") == 0)
parsing_focus = true;
if (strcasecmp(last_key, "marks") == 0) {
num_marks = 0;
parsing_marks = true;
}
return 1;
}
static int json_string(void *ctx, const unsigned char *val, size_t len) {
LOG("string: %.*s for key %s\n", (int)len, val, last_key);
if (parsing_swallows) {
char *sval;
sasprintf(&sval, "%.*s", len, val);
if (strcasecmp(last_key, "class") == 0) {
current_swallow->class = regex_new(sval);
swallow_is_empty = false;
} else if (strcasecmp(last_key, "instance") == 0) {
current_swallow->instance = regex_new(sval);
swallow_is_empty = false;
} else if (strcasecmp(last_key, "window_role") == 0) {
current_swallow->window_role = regex_new(sval);
swallow_is_empty = false;
} else if (strcasecmp(last_key, "title") == 0) {
current_swallow->title = regex_new(sval);
swallow_is_empty = false;
} else {
ELOG("swallow key %s unknown\n", last_key);
}
free(sval);
} else if (parsing_marks) {
char *mark;
sasprintf(&mark, "%.*s", (int)len, val);
marks = srealloc(marks, (++num_marks) * sizeof(struct pending_marks));
marks[num_marks - 1].mark = sstrdup(mark);
marks[num_marks - 1].con_to_be_marked = json_node;
} else {
if (strcasecmp(last_key, "name") == 0) {
json_node->name = scalloc(len + 1, 1);
memcpy(json_node->name, val, len);
} else if (strcasecmp(last_key, "title_format") == 0) {
json_node->title_format = scalloc(len + 1, 1);
memcpy(json_node->title_format, val, len);
} else if (strcasecmp(last_key, "sticky_group") == 0) {
json_node->sticky_group = scalloc(len + 1, 1);
memcpy(json_node->sticky_group, val, len);
LOG("sticky_group of this container is %s\n", json_node->sticky_group);
} else if (strcasecmp(last_key, "orientation") == 0) {
Introduce splith/splitv layouts, remove orientation With this commit, the "default" layout is replaced by the splith and splitv layouts. splith is equivalent to default with orientation horizontal and splitv is equivalent to default with orientation vertical. The "split h" and "split v" commands continue to work as before, they split the current container and you will end up in a split container with layout splith (after "split h") or splitv (after "split v"). To change a splith container into a splitv container, use either "layout splitv" or "layout toggle split". The latter command is used in the default config as mod+l (previously "layout default"). In case you have "layout default" in your config file, it is recommended to just replace it by "layout toggle split", which will work as "layout default" did before when pressing it once, but toggle between horizontal/vertical when pressing it repeatedly. The rationale behind this commit is that it’s cleaner to have all parameters that influence how windows are rendered in the layout itself rather than having a special parameter in combination with only one layout. This enables us to change existing split containers in all cases without breaking existing features (see ticket #464). Also, users should feel more confident about whether they are actually splitting or just changing an existing split container now. As a nice side-effect, this commit brings back the "layout toggle" feature we once had in i3 version 3 (see the userguide). AFAIK, it is safe to use in-place restart to upgrade into versions after this commit (switching to an older version will break your layout, though). Fixes #464
2012-08-04 03:04:00 +02:00
/* Upgrade path from older versions of i3 (doing an inplace restart
* to a newer version):
* "orientation" is dumped before "layout". Therefore, we store
* whether the orientation was horizontal or vertical in the
* last_split_layout. When we then encounter layout == "default",
* we will use the last_split_layout as layout instead. */
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
Introduce splith/splitv layouts, remove orientation With this commit, the "default" layout is replaced by the splith and splitv layouts. splith is equivalent to default with orientation horizontal and splitv is equivalent to default with orientation vertical. The "split h" and "split v" commands continue to work as before, they split the current container and you will end up in a split container with layout splith (after "split h") or splitv (after "split v"). To change a splith container into a splitv container, use either "layout splitv" or "layout toggle split". The latter command is used in the default config as mod+l (previously "layout default"). In case you have "layout default" in your config file, it is recommended to just replace it by "layout toggle split", which will work as "layout default" did before when pressing it once, but toggle between horizontal/vertical when pressing it repeatedly. The rationale behind this commit is that it’s cleaner to have all parameters that influence how windows are rendered in the layout itself rather than having a special parameter in combination with only one layout. This enables us to change existing split containers in all cases without breaking existing features (see ticket #464). Also, users should feel more confident about whether they are actually splitting or just changing an existing split container now. As a nice side-effect, this commit brings back the "layout toggle" feature we once had in i3 version 3 (see the userguide). AFAIK, it is safe to use in-place restart to upgrade into versions after this commit (switching to an older version will break your layout, though). Fixes #464
2012-08-04 03:04:00 +02:00
if (strcasecmp(buf, "none") == 0 ||
strcasecmp(buf, "horizontal") == 0)
json_node->last_split_layout = L_SPLITH;
else if (strcasecmp(buf, "vertical") == 0)
Introduce splith/splitv layouts, remove orientation With this commit, the "default" layout is replaced by the splith and splitv layouts. splith is equivalent to default with orientation horizontal and splitv is equivalent to default with orientation vertical. The "split h" and "split v" commands continue to work as before, they split the current container and you will end up in a split container with layout splith (after "split h") or splitv (after "split v"). To change a splith container into a splitv container, use either "layout splitv" or "layout toggle split". The latter command is used in the default config as mod+l (previously "layout default"). In case you have "layout default" in your config file, it is recommended to just replace it by "layout toggle split", which will work as "layout default" did before when pressing it once, but toggle between horizontal/vertical when pressing it repeatedly. The rationale behind this commit is that it’s cleaner to have all parameters that influence how windows are rendered in the layout itself rather than having a special parameter in combination with only one layout. This enables us to change existing split containers in all cases without breaking existing features (see ticket #464). Also, users should feel more confident about whether they are actually splitting or just changing an existing split container now. As a nice side-effect, this commit brings back the "layout toggle" feature we once had in i3 version 3 (see the userguide). AFAIK, it is safe to use in-place restart to upgrade into versions after this commit (switching to an older version will break your layout, though). Fixes #464
2012-08-04 03:04:00 +02:00
json_node->last_split_layout = L_SPLITV;
else
LOG("Unhandled orientation: %s\n", buf);
free(buf);
} else if (strcasecmp(last_key, "border") == 0) {
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
if (strcasecmp(buf, "none") == 0)
json_node->border_style = BS_NONE;
else if (strcasecmp(buf, "1pixel") == 0) {
json_node->border_style = BS_PIXEL;
json_node->current_border_width = 1;
} else if (strcasecmp(buf, "pixel") == 0)
json_node->border_style = BS_PIXEL;
else if (strcasecmp(buf, "normal") == 0)
json_node->border_style = BS_NORMAL;
else
LOG("Unhandled \"border\": %s\n", buf);
free(buf);
} else if (strcasecmp(last_key, "type") == 0) {
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
if (strcasecmp(buf, "root") == 0)
json_node->type = CT_ROOT;
else if (strcasecmp(buf, "output") == 0)
json_node->type = CT_OUTPUT;
else if (strcasecmp(buf, "con") == 0)
json_node->type = CT_CON;
else if (strcasecmp(buf, "floating_con") == 0)
json_node->type = CT_FLOATING_CON;
else if (strcasecmp(buf, "workspace") == 0)
json_node->type = CT_WORKSPACE;
else if (strcasecmp(buf, "dockarea") == 0)
json_node->type = CT_DOCKAREA;
else
LOG("Unhandled \"type\": %s\n", buf);
free(buf);
2011-06-02 17:12:18 +02:00
} else if (strcasecmp(last_key, "layout") == 0) {
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
2011-06-02 17:12:18 +02:00
if (strcasecmp(buf, "default") == 0)
Introduce splith/splitv layouts, remove orientation With this commit, the "default" layout is replaced by the splith and splitv layouts. splith is equivalent to default with orientation horizontal and splitv is equivalent to default with orientation vertical. The "split h" and "split v" commands continue to work as before, they split the current container and you will end up in a split container with layout splith (after "split h") or splitv (after "split v"). To change a splith container into a splitv container, use either "layout splitv" or "layout toggle split". The latter command is used in the default config as mod+l (previously "layout default"). In case you have "layout default" in your config file, it is recommended to just replace it by "layout toggle split", which will work as "layout default" did before when pressing it once, but toggle between horizontal/vertical when pressing it repeatedly. The rationale behind this commit is that it’s cleaner to have all parameters that influence how windows are rendered in the layout itself rather than having a special parameter in combination with only one layout. This enables us to change existing split containers in all cases without breaking existing features (see ticket #464). Also, users should feel more confident about whether they are actually splitting or just changing an existing split container now. As a nice side-effect, this commit brings back the "layout toggle" feature we once had in i3 version 3 (see the userguide). AFAIK, it is safe to use in-place restart to upgrade into versions after this commit (switching to an older version will break your layout, though). Fixes #464
2012-08-04 03:04:00 +02:00
/* This set above when we read "orientation". */
json_node->layout = json_node->last_split_layout;
2011-06-02 17:12:18 +02:00
else if (strcasecmp(buf, "stacked") == 0)
json_node->layout = L_STACKED;
else if (strcasecmp(buf, "tabbed") == 0)
json_node->layout = L_TABBED;
else if (strcasecmp(buf, "dockarea") == 0)
2011-06-02 17:12:18 +02:00
json_node->layout = L_DOCKAREA;
else if (strcasecmp(buf, "output") == 0)
2011-06-02 17:12:18 +02:00
json_node->layout = L_OUTPUT;
Introduce splith/splitv layouts, remove orientation With this commit, the "default" layout is replaced by the splith and splitv layouts. splith is equivalent to default with orientation horizontal and splitv is equivalent to default with orientation vertical. The "split h" and "split v" commands continue to work as before, they split the current container and you will end up in a split container with layout splith (after "split h") or splitv (after "split v"). To change a splith container into a splitv container, use either "layout splitv" or "layout toggle split". The latter command is used in the default config as mod+l (previously "layout default"). In case you have "layout default" in your config file, it is recommended to just replace it by "layout toggle split", which will work as "layout default" did before when pressing it once, but toggle between horizontal/vertical when pressing it repeatedly. The rationale behind this commit is that it’s cleaner to have all parameters that influence how windows are rendered in the layout itself rather than having a special parameter in combination with only one layout. This enables us to change existing split containers in all cases without breaking existing features (see ticket #464). Also, users should feel more confident about whether they are actually splitting or just changing an existing split container now. As a nice side-effect, this commit brings back the "layout toggle" feature we once had in i3 version 3 (see the userguide). AFAIK, it is safe to use in-place restart to upgrade into versions after this commit (switching to an older version will break your layout, though). Fixes #464
2012-08-04 03:04:00 +02:00
else if (strcasecmp(buf, "splith") == 0)
json_node->layout = L_SPLITH;
else if (strcasecmp(buf, "splitv") == 0)
json_node->layout = L_SPLITV;
else
LOG("Unhandled \"layout\": %s\n", buf);
2011-06-02 17:12:18 +02:00
free(buf);
} else if (strcasecmp(last_key, "workspace_layout") == 0) {
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
if (strcasecmp(buf, "default") == 0)
json_node->workspace_layout = L_DEFAULT;
else if (strcasecmp(buf, "stacked") == 0)
json_node->workspace_layout = L_STACKED;
else if (strcasecmp(buf, "tabbed") == 0)
json_node->workspace_layout = L_TABBED;
else
LOG("Unhandled \"workspace_layout\": %s\n", buf);
free(buf);
Introduce splith/splitv layouts, remove orientation With this commit, the "default" layout is replaced by the splith and splitv layouts. splith is equivalent to default with orientation horizontal and splitv is equivalent to default with orientation vertical. The "split h" and "split v" commands continue to work as before, they split the current container and you will end up in a split container with layout splith (after "split h") or splitv (after "split v"). To change a splith container into a splitv container, use either "layout splitv" or "layout toggle split". The latter command is used in the default config as mod+l (previously "layout default"). In case you have "layout default" in your config file, it is recommended to just replace it by "layout toggle split", which will work as "layout default" did before when pressing it once, but toggle between horizontal/vertical when pressing it repeatedly. The rationale behind this commit is that it’s cleaner to have all parameters that influence how windows are rendered in the layout itself rather than having a special parameter in combination with only one layout. This enables us to change existing split containers in all cases without breaking existing features (see ticket #464). Also, users should feel more confident about whether they are actually splitting or just changing an existing split container now. As a nice side-effect, this commit brings back the "layout toggle" feature we once had in i3 version 3 (see the userguide). AFAIK, it is safe to use in-place restart to upgrade into versions after this commit (switching to an older version will break your layout, though). Fixes #464
2012-08-04 03:04:00 +02:00
} else if (strcasecmp(last_key, "last_split_layout") == 0) {
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
if (strcasecmp(buf, "splith") == 0)
json_node->last_split_layout = L_SPLITH;
else if (strcasecmp(buf, "splitv") == 0)
json_node->last_split_layout = L_SPLITV;
else
LOG("Unhandled \"last_splitlayout\": %s\n", buf);
Introduce splith/splitv layouts, remove orientation With this commit, the "default" layout is replaced by the splith and splitv layouts. splith is equivalent to default with orientation horizontal and splitv is equivalent to default with orientation vertical. The "split h" and "split v" commands continue to work as before, they split the current container and you will end up in a split container with layout splith (after "split h") or splitv (after "split v"). To change a splith container into a splitv container, use either "layout splitv" or "layout toggle split". The latter command is used in the default config as mod+l (previously "layout default"). In case you have "layout default" in your config file, it is recommended to just replace it by "layout toggle split", which will work as "layout default" did before when pressing it once, but toggle between horizontal/vertical when pressing it repeatedly. The rationale behind this commit is that it’s cleaner to have all parameters that influence how windows are rendered in the layout itself rather than having a special parameter in combination with only one layout. This enables us to change existing split containers in all cases without breaking existing features (see ticket #464). Also, users should feel more confident about whether they are actually splitting or just changing an existing split container now. As a nice side-effect, this commit brings back the "layout toggle" feature we once had in i3 version 3 (see the userguide). AFAIK, it is safe to use in-place restart to upgrade into versions after this commit (switching to an older version will break your layout, though). Fixes #464
2012-08-04 03:04:00 +02:00
free(buf);
2011-08-07 18:42:23 +02:00
} else if (strcasecmp(last_key, "mark") == 0) {
DLOG("Found deprecated key \"mark\".\n");
2011-08-07 18:42:23 +02:00
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
con_mark(json_node, buf, MM_REPLACE);
} else if (strcasecmp(last_key, "floating") == 0) {
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
if (strcasecmp(buf, "auto_off") == 0)
json_node->floating = FLOATING_AUTO_OFF;
else if (strcasecmp(buf, "auto_on") == 0)
json_node->floating = FLOATING_AUTO_ON;
else if (strcasecmp(buf, "user_off") == 0)
json_node->floating = FLOATING_USER_OFF;
else if (strcasecmp(buf, "user_on") == 0)
json_node->floating = FLOATING_USER_ON;
free(buf);
} else if (strcasecmp(last_key, "scratchpad_state") == 0) {
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
if (strcasecmp(buf, "none") == 0)
json_node->scratchpad_state = SCRATCHPAD_NONE;
else if (strcasecmp(buf, "fresh") == 0)
json_node->scratchpad_state = SCRATCHPAD_FRESH;
else if (strcasecmp(buf, "changed") == 0)
json_node->scratchpad_state = SCRATCHPAD_CHANGED;
free(buf);
} else if (strcasecmp(last_key, "previous_workspace_name") == 0) {
FREE(previous_workspace_name);
previous_workspace_name = sstrndup((const char *)val, len);
}
}
return 1;
}
static int json_int(void *ctx, long long val) {
LOG("int %lld for key %s\n", val, last_key);
/* For backwards compatibility with i3 < 4.8 */
if (strcasecmp(last_key, "type") == 0)
json_node->type = val;
if (strcasecmp(last_key, "fullscreen_mode") == 0)
json_node->fullscreen_mode = val;
if (strcasecmp(last_key, "num") == 0)
json_node->num = val;
if (strcasecmp(last_key, "current_border_width") == 0)
json_node->current_border_width = val;
if (strcasecmp(last_key, "depth") == 0)
json_node->depth = val;
if (!parsing_swallows && strcasecmp(last_key, "id") == 0)
json_node->old_id = val;
if (parsing_focus) {
struct focus_mapping *focus_mapping = scalloc(1, sizeof(struct focus_mapping));
focus_mapping->old_id = val;
TAILQ_INSERT_TAIL(&focus_mappings, focus_mapping, focus_mappings);
}
if (parsing_rect || parsing_window_rect || parsing_geometry) {
Rect *r;
if (parsing_rect)
r = &(json_node->rect);
else if (parsing_window_rect)
r = &(json_node->window_rect);
else
r = &(json_node->geometry);
if (strcasecmp(last_key, "x") == 0)
r->x = val;
else if (strcasecmp(last_key, "y") == 0)
r->y = val;
else if (strcasecmp(last_key, "width") == 0)
r->width = val;
else if (strcasecmp(last_key, "height") == 0)
r->height = val;
else
ELOG("WARNING: unknown key %s in rect\n", last_key);
DLOG("rect now: (%d, %d, %d, %d)\n",
r->x, r->y, r->width, r->height);
}
if (parsing_swallows) {
if (strcasecmp(last_key, "id") == 0) {
current_swallow->id = val;
swallow_is_empty = false;
}
if (strcasecmp(last_key, "dock") == 0) {
current_swallow->dock = val;
swallow_is_empty = false;
}
if (strcasecmp(last_key, "insert_where") == 0) {
current_swallow->insert_where = val;
swallow_is_empty = false;
}
}
return 1;
}
static int json_bool(void *ctx, int val) {
LOG("bool %d for key %s\n", val, last_key);
if (strcasecmp(last_key, "focused") == 0 && val) {
to_focus = json_node;
}
if (strcasecmp(last_key, "sticky") == 0)
json_node->sticky = val;
if (parsing_swallows) {
if (strcasecmp(last_key, "restart_mode") == 0) {
current_swallow->restart_mode = val;
swallow_is_empty = false;
}
}
return 1;
}
static int json_double(void *ctx, double val) {
LOG("double %f for key %s\n", val, last_key);
if (strcasecmp(last_key, "percent") == 0) {
json_node->percent = val;
}
return 1;
}
static json_content_t content_result;
static int content_level;
static int json_determine_content_deeper(void *ctx) {
content_level++;
return 1;
}
static int json_determine_content_shallower(void *ctx) {
content_level--;
return 1;
}
static int json_determine_content_string(void *ctx, const unsigned char *val, size_t len) {
if (strcasecmp(last_key, "type") != 0 || content_level > 1)
return 1;
DLOG("string = %.*s, last_key = %s\n", (int)len, val, last_key);
if (strncasecmp((const char *)val, "workspace", len) == 0)
content_result = JSON_CONTENT_WORKSPACE;
return 0;
}
/*
* Returns true if the provided JSON could be parsed by yajl.
*
*/
bool json_validate(const char *buf, const size_t len) {
bool valid = true;
yajl_handle hand = yajl_alloc(NULL, NULL, NULL);
/* Allowing comments allows for more user-friendly layout files. */
yajl_config(hand, yajl_allow_comments, true);
/* Allow multiple values, i.e. multiple nodes to attach */
yajl_config(hand, yajl_allow_multiple_values, true);
setlocale(LC_NUMERIC, "C");
if (yajl_parse(hand, (const unsigned char *)buf, len) != yajl_status_ok) {
unsigned char *str = yajl_get_error(hand, 1, (const unsigned char *)buf, len);
ELOG("JSON parsing error: %s\n", str);
yajl_free_error(hand, str);
valid = false;
}
setlocale(LC_NUMERIC, "");
yajl_complete_parse(hand);
yajl_free(hand);
return valid;
}
/* Parses the given JSON file until it encounters the first “type” property to
* determine whether the file contains workspaces or regular containers, which
* is important to know when deciding where (and how) to append the contents.
* */
json_content_t json_determine_content(const char *buf, const size_t len) {
// We default to JSON_CONTENT_CON because it is legal to not include
// “"type": "con"” in the JSON files for better readability.
content_result = JSON_CONTENT_CON;
content_level = 0;
static yajl_callbacks callbacks = {
.yajl_string = json_determine_content_string,
.yajl_map_key = json_key,
.yajl_start_array = json_determine_content_deeper,
.yajl_start_map = json_determine_content_deeper,
.yajl_end_map = json_determine_content_shallower,
.yajl_end_array = json_determine_content_shallower,
};
yajl_handle hand = yajl_alloc(&callbacks, NULL, NULL);
/* Allowing comments allows for more user-friendly layout files. */
yajl_config(hand, yajl_allow_comments, true);
/* Allow multiple values, i.e. multiple nodes to attach */
yajl_config(hand, yajl_allow_multiple_values, true);
setlocale(LC_NUMERIC, "C");
const yajl_status stat = yajl_parse(hand, (const unsigned char *)buf, len);
if (stat != yajl_status_ok && stat != yajl_status_client_canceled) {
unsigned char *str = yajl_get_error(hand, 1, (const unsigned char *)buf, len);
ELOG("JSON parsing error: %s\n", str);
yajl_free_error(hand, str);
}
setlocale(LC_NUMERIC, "");
yajl_complete_parse(hand);
yajl_free(hand);
return content_result;
}
void tree_append_json(Con *con, const char *buf, const size_t len, char **errormsg) {
static yajl_callbacks callbacks = {
.yajl_boolean = json_bool,
.yajl_integer = json_int,
.yajl_double = json_double,
.yajl_string = json_string,
.yajl_start_map = json_start_map,
.yajl_map_key = json_key,
.yajl_end_map = json_end_map,
.yajl_end_array = json_end_array,
};
yajl_handle hand = yajl_alloc(&callbacks, NULL, NULL);
/* Allowing comments allows for more user-friendly layout files. */
yajl_config(hand, yajl_allow_comments, true);
/* Allow multiple values, i.e. multiple nodes to attach */
yajl_config(hand, yajl_allow_multiple_values, true);
/* We don't need to validate that the input is valid UTF8 here.
* tree_append_json is called in two cases:
* 1. With the append_layout command. json_validate is called first and will
* fail on invalid UTF8 characters so we don't need to recheck.
* 2. With an in-place restart. The rest of the codebase should be
* responsible for producing valid UTF8 JSON output. If not,
* tree_append_json will just preserve invalid UTF8 strings in the tree
* instead of failing to parse the layout file which could lead to
* problems like in #3156.
* Either way, disabling UTF8 validation slightly speeds up yajl. */
yajl_config(hand, yajl_dont_validate_strings, true);
json_node = con;
to_focus = NULL;
incomplete = 0;
parsing_swallows = false;
parsing_rect = false;
parsing_deco_rect = false;
parsing_window_rect = false;
parsing_geometry = false;
parsing_focus = false;
parsing_marks = false;
setlocale(LC_NUMERIC, "C");
const yajl_status stat = yajl_parse(hand, (const unsigned char *)buf, len);
if (stat != yajl_status_ok) {
unsigned char *str = yajl_get_error(hand, 1, (const unsigned char *)buf, len);
ELOG("JSON parsing error: %s\n", str);
if (errormsg != NULL)
*errormsg = sstrdup((const char *)str);
yajl_free_error(hand, str);
while (incomplete-- > 0) {
Con *parent = json_node->parent;
DLOG("freeing incomplete container %p\n", json_node);
if (json_node == to_focus) {
to_focus = NULL;
}
con_free(json_node);
json_node = parent;
}
}
/* In case not all containers were restored, we need to fix the
* percentages, otherwise i3 will crash immediately when rendering the
* next time. */
con_fix_percent(con);
setlocale(LC_NUMERIC, "");
yajl_complete_parse(hand);
2016-01-09 14:17:47 +01:00
yajl_free(hand);
if (to_focus) {
con_activate(to_focus);
}
}