koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor parse_command

Browse Source 
parse_command returns a struct that contains useful information about
the result of a command as a whole (instead of the intermediate
representation used during parsing).

parse_command now requires the caller to allocate the yajl_gen used for
generating a json reply. This is passed as the second parameter to
parse_command. If NULL is passed, no json reply will be generated.
This commit is contained in:
Tony Crisci
2014-05-28 02:01:50 -04:00
committed by Michael Stapelberg
parent 62ea60ba42
commit c7aae56030
6 changed files with 99 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/key_press.c
View File

@ -72,19 +72,23 @@ void handle_key_press(xcb_key_press_event_t *event) {
if (bind == NULL)
return;
yajl_gen gen = yajl_gen_alloc(NULL);
char *command_copy = sstrdup(bind->command);
struct CommandResultIR *command_output = parse_command(command_copy);
CommandResult *result = parse_command(command_copy, gen);
free(command_copy);
if (command_output->needs_tree_render)
if (result->needs_tree_render)
tree_render();
command_result_free(result);
/* We parse the JSON reply to figure out whether there was an error
* ("success" being false in on of the returned dictionaries). */
const unsigned char *reply;
size_t length;
yajl_handle handle = yajl_alloc(&command_error_callbacks, NULL, NULL);
yajl_gen_get_buf(command_output->json_gen, &reply, &length);
yajl_gen_get_buf(gen, &reply, &length);
current_nesting_level = 0;
parse_error_key = false;
@ -116,5 +120,5 @@ void handle_key_press(xcb_key_press_event_t *event) {
yajl_free(handle);
yajl_gen_free(command_output->json_gen);
yajl_gen_free(gen);
}