* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
*
* key_press.c: key press handler
*
#include "all.h"
static int current_nesting_level;
-static bool success_key;
+static bool parse_error_key;
static bool command_failed;
-/* XXX: I don’t want to touch too much of the nagbar code at once, but we
- * should refactor this with src/cfgparse.y into a clean generic nagbar
- * interface. It might come in handy in other situations within i3, too. */
-static char *pager_script_path;
-static pid_t nagbar_pid = -1;
-
-/*
- * Handler which will be called when we get a SIGCHLD for the nagbar, meaning
- * it exited (or could not be started, depending on the exit code).
- *
- */
-static void nagbar_exited(EV_P_ ev_child *watcher, int revents) {
- ev_child_stop(EV_A_ watcher);
-
- if (unlink(pager_script_path) != 0)
- warn("Could not delete temporary i3-nagbar script %s", pager_script_path);
-
- if (!WIFEXITED(watcher->rstatus)) {
- fprintf(stderr, "ERROR: i3-nagbar did not exit normally.\n");
- return;
- }
-
- int exitcode = WEXITSTATUS(watcher->rstatus);
- printf("i3-nagbar process exited with status %d\n", exitcode);
- if (exitcode == 2) {
- fprintf(stderr, "ERROR: i3-nagbar could not be found. Is it correctly installed on your system?\n");
- }
-
- nagbar_pid = -1;
-}
-
-/* We need ev >= 4 for the following code. Since it is not *that* important (it
- * only makes sure that there are no i3-nagbar instances left behind) we still
- * support old systems with libev 3. */
-#if EV_VERSION_MAJOR >= 4
-/*
- * Cleanup handler. Will be called when i3 exits. Kills i3-nagbar with signal
- * SIGKILL (9) to make sure there are no left-over i3-nagbar processes.
- *
- */
-static void nagbar_cleanup(EV_P_ ev_cleanup *watcher, int revent) {
- if (nagbar_pid != -1) {
- LOG("Sending SIGKILL (%d) to i3-nagbar with PID %d\n", SIGKILL, nagbar_pid);
- kill(nagbar_pid, SIGKILL);
- }
-}
-#endif
-
-/*
- * Writes the given command as a shell script to path.
- * Returns true unless something went wrong.
- *
- */
-static bool write_nagbar_script(const char *path, const char *command) {
- int fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IXUSR);
- if (fd == -1) {
- warn("Could not create temporary script to store the nagbar command");
- return false;
- }
- write(fd, "#!/bin/sh\n", strlen("#!/bin/sh\n"));
- write(fd, command, strlen(command));
- close(fd);
- return true;
-}
-
-/*
- * Starts an i3-nagbar process which alerts the user that his configuration
- * file contains one or more errors. Also offers two buttons: One to launch an
- * $EDITOR on the config file and another one to launch a $PAGER on the error
- * logfile.
- *
- */
-static void start_commanderror_nagbar(void) {
- if (nagbar_pid != -1) {
- DLOG("i3-nagbar for command error already running, not starting again.\n");
- return;
- }
-
- DLOG("Starting i3-nagbar due to command error\n");
-
- /* We need to create a custom script containing our actual command
- * since not every terminal emulator which is contained in
- * i3-sensible-terminal supports -e with multiple arguments (and not
- * all of them support -e with one quoted argument either).
- *
- * NB: The paths need to be unique, that is, don’t assume users close
- * their nagbars at any point in time (and they still need to work).
- * */
- pager_script_path = get_process_filename("nagbar-cfgerror-pager");
-
- nagbar_pid = fork();
- if (nagbar_pid == -1) {
- warn("Could not fork()");
- return;
- }
-
- /* child */
- if (nagbar_pid == 0) {
- char *pager_command;
- sasprintf(&pager_command, "i3-sensible-pager \"%s\"\n", errorfilename);
- if (!write_nagbar_script(pager_script_path, pager_command))
- return;
-
- char *pageraction;
- sasprintf(&pageraction, "i3-sensible-terminal -e \"%s\"", pager_script_path);
- char *argv[] = {
- NULL, /* will be replaced by the executable path */
- "-t",
- "error",
- "-m",
- "The configured command for this shortcut could not be run successfully.",
- "-b",
- "show errors",
- pageraction,
- NULL
- };
- exec_i3_utility("i3-nagbar", argv);
- }
-
- /* parent */
- /* install a child watcher */
- ev_child *child = smalloc(sizeof(ev_child));
- ev_child_init(child, &nagbar_exited, nagbar_pid, 0);
- ev_child_start(main_loop, child);
-
-/* We need ev >= 4 for the following code. Since it is not *that* important (it
- * only makes sure that there are no i3-nagbar instances left behind) we still
- * support old systems with libev 3. */
-#if EV_VERSION_MAJOR >= 4
- /* install a cleanup watcher (will be called when i3 exits and i3-nagbar is
- * still running) */
- ev_cleanup *cleanup = smalloc(sizeof(ev_cleanup));
- ev_cleanup_init(cleanup, nagbar_cleanup);
- ev_cleanup_start(main_loop, cleanup);
-#endif
-}
-
-/*
- * Kills the commanderror i3-nagbar process, if any.
- *
- * Called when reloading/restarting, since the user probably fixed his wrong
- * keybindings.
- *
- * If wait_for_it is set (restarting), this function will waitpid(), otherwise,
- * ev is assumed to handle it (reloading).
- *
- */
-void kill_commanderror_nagbar(bool wait_for_it) {
- if (nagbar_pid == -1)
- return;
-
- if (kill(nagbar_pid, SIGTERM) == -1)
- warn("kill(configerror_nagbar) failed");
-
- if (!wait_for_it)
- return;
-
- /* When restarting, we don’t enter the ev main loop anymore and after the
- * exec(), our old pid is no longer watched. So, ev won’t handle SIGCHLD
- * for us and we would end up with a <defunct> process. Therefore we
- * waitpid() here. */
- waitpid(nagbar_pid, NULL, 0);
-}
+pid_t command_error_nagbar_pid = -1;
static int json_boolean(void *ctx, int boolval) {
- DLOG("Got bool: %d, success_key %d, nesting_level %d\n", boolval, success_key, current_nesting_level);
+ DLOG("Got bool: %d, parse_error_key %d, nesting_level %d\n", boolval, parse_error_key, current_nesting_level);
- if (success_key && current_nesting_level == 1 && !boolval)
+ if (parse_error_key && current_nesting_level == 1 && boolval)
command_failed = true;
return 1;
#else
static int json_map_key(void *ctx, const unsigned char *stringval, unsigned int stringlen) {
#endif
- success_key = (stringlen >= strlen("success") &&
- strncmp((const char*)stringval, "success", strlen("success")) == 0);
+ parse_error_key = (stringlen >= strlen("parse_error") &&
+ strncmp((const char*)stringval, "parse_error", strlen("parse_error")) == 0);
return 1;
}
};
/*
- * There was a key press. We compare this key code with our bindings table and pass
- * the bound action to parse_command().
+ * There was a KeyPress or KeyRelease (both events have the same fields). We
+ * compare this key code with our bindings table and pass the bound action to
+ * parse_command().
*
*/
void handle_key_press(xcb_key_press_event_t *event) {
+ bool key_release = (event->response_type == XCB_KEY_RELEASE);
last_timestamp = event->time;
- DLOG("Keypress %d, state raw = %d\n", event->detail, event->state);
+ 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("(checked mode_switch, state %d)\n", state_filtered);
/* Find the binding */
- Binding *bind = get_binding(state_filtered, event->detail);
+ 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
if (bind == NULL) {
state_filtered &= ~(BIND_MODE_SWITCH);
DLOG("no match, new state_filtered = %d\n", state_filtered);
- if ((bind = get_binding(state_filtered, event->detail)) == NULL) {
- ELOG("Could not lookup key binding (modifiers %d, keycode %d)\n",
+ 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;
}
yajl_gen_get_buf(command_output->json_gen, &reply, &length);
current_nesting_level = 0;
- success_key = false;
+ parse_error_key = false;
command_failed = false;
yajl_status state = yajl_parse(handle, reply, length);
if (state != yajl_status_ok) {
ELOG("Could not parse my own reply. That's weird. reply is %.*s\n", (int)length, reply);
} else {
- if (command_failed)
- start_commanderror_nagbar();
+ if (command_failed) {
+ char *pageraction;
+ sasprintf(&pageraction, "i3-sensible-pager \"%s\"\n", errorfilename);
+ char *argv[] = {
+ NULL, /* will be replaced by the executable path */
+ "-f",
+ config.font.pattern,
+ "-t",
+ "error",
+ "-m",
+ "The configured command for this shortcut could not be run successfully.",
+ "-b",
+ "show errors",
+ pageraction,
+ NULL
+ };
+ start_nagbar(&command_error_nagbar_pid, argv);
+ free(pageraction);
+ }
}
yajl_free(handle);