+#undef I3__FILE__
+#define I3__FILE__ "main.c"
/*
* vim:ts=4:sw=4:expandtab
*
DLOG("Expected X11 Error received for sequence %x\n", event->sequence);
else {
xcb_generic_error_t *error = (xcb_generic_error_t*)event;
- ELOG("X11 Error received! sequence 0x%x, error_code = %d\n",
+ DLOG("X11 Error received (probably harmless)! sequence 0x%x, error_code = %d\n",
error->sequence, error->error_code);
}
free(event);
* Unlinks the SHM log and re-raises the signal.
*
*/
-static void handle_signal(int sig, siginfo_t *info, void *data) {
+static void handle_signal(struct ev_loop *loop, ev_signal *w, int revents) {
+ int sig = w->signum;
fprintf(stderr, "Received signal %d, terminating\n", sig);
if (*shmlogname != '\0') {
fprintf(stderr, "Closing SHM log \"%s\"\n", shmlogname);
shm_unlink(shmlogname);
}
fflush(stderr);
+ ev_signal_stop(loop, w);
raise(sig);
}
{"no-autostart", no_argument, 0, 'a'},
{"config", required_argument, 0, 'c'},
{"version", no_argument, 0, 'v'},
+ {"moreversion", no_argument, 0, 'm'},
+ {"more-version", no_argument, 0, 'm'},
+ {"more_version", no_argument, 0, 'm'},
{"help", no_argument, 0, 'h'},
{"layout", required_argument, 0, 'L'},
{"restart", required_argument, 0, 0},
start_argv = argv;
- while ((opt = getopt_long(argc, argv, "c:CvaL:hld:V", long_options, &option_index)) != -1) {
+ while ((opt = getopt_long(argc, argv, "c:CvmaL:hld:V", long_options, &option_index)) != -1) {
switch (opt) {
case 'a':
LOG("Autostart disabled using -a\n");
case 'v':
printf("i3 version " I3_VERSION " © 2009-2012 Michael Stapelberg and contributors\n");
exit(EXIT_SUCCESS);
+ break;
+ case 'm':
+ printf("Binary i3 version: " I3_VERSION " © 2009-2012 Michael Stapelberg and contributors\n");
+ display_running_version();
+ exit(EXIT_SUCCESS);
+ break;
case 'V':
set_verbosity(true);
break;
char *socket_path = root_atom_contents("I3_SOCKET_PATH");
if (socket_path) {
printf("%s\n", socket_path);
- return 0;
+ exit(EXIT_SUCCESS);
}
- return 1;
+ exit(EXIT_FAILURE);
} else if (strcmp(long_options[option_index].name, "shmlog-size") == 0 ||
strcmp(long_options[option_index].name, "shmlog_size") == 0) {
shmlog_size = atoi(optarg);
fprintf(stderr, "\t--force-xinerama\n"
"\tUse Xinerama instead of RandR.\n"
"\tThis option should only be used if you are stuck with the\n"
- "\tnvidia closed source driver which does not support RandR.\n");
+ "\told nVidia closed source driver (older than 302.17), which does\n"
+ "\tnot support RandR.\n");
fprintf(stderr, "\n");
fprintf(stderr, "\t--get-socketpath\n"
"\tRetrieve the i3 IPC socket path from X11, print it, then exit.\n");
}
}
- LOG("i3 (tree) version " I3_VERSION " starting\n");
+ LOG("i3 " I3_VERSION " starting\n");
conn = xcb_connect(NULL, &conn_screen);
if (xcb_connection_has_error(conn))
uint32_t mask = XCB_CW_EVENT_MASK;
uint32_t values[] = { XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT |
+ XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_STRUCTURE_NOTIFY | /* when the user adds a screen (e.g. video
projector), the root window gets a
ConfigureNotify */
randr_init(&randr_base);
}
+ scratchpad_fix_resolution();
+
xcb_query_pointer_reply_t *pointerreply;
Output *output = NULL;
if (!(pointerreply = xcb_query_pointer_reply(conn, pointercookie, NULL))) {
xcb_flush(conn);
- manage_existing_windows(root);
+ /* What follows is a fugly consequence of X11 protocol race conditions like
+ * the following: In an i3 in-place restart, i3 will reparent all windows
+ * to the root window, then exec() itself. In the new process, it calls
+ * manage_existing_windows. However, in case any application sent a
+ * generated UnmapNotify message to the WM (as GIMP does), this message
+ * will be handled by i3 *after* managing the window, thus i3 thinks the
+ * window just closed itself. In reality, the message was sent in the time
+ * period where i3 wasn’t running yet.
+ *
+ * To prevent this, we grab the server (disables processing of any other
+ * connections), then discard all pending events (since we didn’t do
+ * anything, there cannot be any meaningful responses), then ungrab the
+ * server. */
+ xcb_grab_server(conn);
+ {
+ xcb_aux_sync(conn);
+ xcb_generic_event_t *event;
+ while ((event = xcb_poll_for_event(conn)) != NULL) {
+ free(event);
+ }
+ manage_existing_windows(root);
+ }
+ xcb_ungrab_server(conn);
- struct sigaction action;
- action.sa_sigaction = handle_signal;
- action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
- sigemptyset(&action.sa_mask);
+#define HANDLE_SIGNAL_EV(signum) \
+ do { \
+ struct ev_signal *signal_watcher = scalloc(sizeof(struct ev_signal)); \
+ ev_signal_init(signal_watcher, handle_signal, signum); \
+ ev_signal_start(main_loop, signal_watcher); \
+ } while (0)
if (!disable_signalhandler)
setup_signal_handler();
else {
/* Catch all signals with default action "Core", see signal(7) */
- if (sigaction(SIGQUIT, &action, NULL) == -1 ||
- sigaction(SIGILL, &action, NULL) == -1 ||
- sigaction(SIGABRT, &action, NULL) == -1 ||
- sigaction(SIGFPE, &action, NULL) == -1 ||
- sigaction(SIGSEGV, &action, NULL) == -1)
- ELOG("Could not setup signal handler");
+ HANDLE_SIGNAL_EV(SIGQUIT);
+ HANDLE_SIGNAL_EV(SIGILL);
+ HANDLE_SIGNAL_EV(SIGABRT);
+ HANDLE_SIGNAL_EV(SIGFPE);
+ HANDLE_SIGNAL_EV(SIGSEGV);
}
/* Catch all signals with default action "Term", see signal(7) */
- if (sigaction(SIGHUP, &action, NULL) == -1 ||
- sigaction(SIGINT, &action, NULL) == -1 ||
- sigaction(SIGALRM, &action, NULL) == -1 ||
- sigaction(SIGUSR1, &action, NULL) == -1 ||
- sigaction(SIGUSR2, &action, NULL) == -1)
- ELOG("Could not setup signal handler");
+ HANDLE_SIGNAL_EV(SIGHUP);
+ HANDLE_SIGNAL_EV(SIGINT);
+ HANDLE_SIGNAL_EV(SIGALRM);
+ HANDLE_SIGNAL_EV(SIGTERM);
+ HANDLE_SIGNAL_EV(SIGUSR1);
+ HANDLE_SIGNAL_EV(SIGUSR2);
/* Ignore SIGPIPE to survive errors when an IPC client disconnects
* while we are sending him a message */
projects / i3 / i3 / blobdiff