return 1;
}
-#if YAJL_MAJOR >= 2
static int json_map_key(void *ctx, const unsigned char *stringval, size_t stringlen) {
-#else
-static int json_map_key(void *ctx, const unsigned char *stringval, unsigned int stringlen) {
-#endif
parse_error_key = (stringlen >= strlen("parse_error") &&
strncmp((const char*)stringval, "parse_error", strlen("parse_error")) == 0);
return 1;
}
static yajl_callbacks command_error_callbacks = {
- NULL,
- &json_boolean,
- NULL,
- NULL,
- NULL,
- NULL,
- &json_start_map,
- &json_map_key,
- &json_end_map,
- NULL,
- NULL
+ .yajl_boolean = json_boolean,
+ .yajl_start_map = json_start_map,
+ .yajl_map_key = json_map_key,
+ .yajl_end_map = json_end_map,
};
/*
DLOG("%s %d, state raw = %d\n", (key_release ? "KeyRelease" : "KeyPress"), event->detail, event->state);
- /* Remove the numlock bit, all other bits are modifiers we can bind to */
- uint16_t state_filtered = event->state & ~(xcb_numlock_mask | XCB_MOD_MASK_LOCK);
- DLOG("(removed numlock, state = %d)\n", state_filtered);
- /* Only use the lower 8 bits of the state (modifier masks) so that mouse
- * button masks are filtered out */
- state_filtered &= 0xFF;
- DLOG("(removed upper 8 bits, state = %d)\n", state_filtered);
-
- if (xkb_current_group == XkbGroup2Index)
- state_filtered |= BIND_MODE_SWITCH;
-
- DLOG("(checked mode_switch, state %d)\n", state_filtered);
-
- /* Find the binding */
- Binding *bind = get_binding(state_filtered, key_release, event->detail);
-
- /* No match? Then the user has Mode_switch enabled but does not have a
- * specific keybinding. Fall back to the default keybindings (without
- * Mode_switch). Makes it much more convenient for users of a hybrid
- * layout (like us, ru). */
- if (bind == NULL) {
- state_filtered &= ~(BIND_MODE_SWITCH);
- DLOG("no match, new state_filtered = %d\n", state_filtered);
- if ((bind = get_binding(state_filtered, key_release, event->detail)) == NULL) {
- /* This is not a real error since we can have release and
- * non-release keybindings. On a KeyPress event for which there is
- * only a !release-binding, but no release-binding, the
- * corresponding KeyRelease event will trigger this. No problem,
- * though. */
- DLOG("Could not lookup key binding (modifiers %d, keycode %d)\n",
- state_filtered, event->detail);
- return;
- }
- }
+ Binding *bind = get_binding_from_xcb_event((xcb_generic_event_t *)event);
+
+ /* if we couldn't find a binding, we are done */
+ if (bind == NULL)
+ return;
char *command_copy = sstrdup(bind->command);
struct CommandResult *command_output = parse_command(command_copy);
/* 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;
-#if YAJL_MAJOR >= 2
size_t length;
yajl_handle handle = yajl_alloc(&command_error_callbacks, NULL, NULL);
-#else
- unsigned int length;
- yajl_parser_config parse_conf = { 0, 0 };
-
- yajl_handle handle = yajl_alloc(&command_error_callbacks, &parse_conf, NULL, NULL);
-#endif
yajl_gen_get_buf(command_output->json_gen, &reply, &length);
current_nesting_level = 0;