/** The number of file descriptors passed via socket activation. */
int listen_fds;
+/* We keep the xcb_check watcher around to be able to enable and disable it
+ * temporarily for drag_pointer(). */
+static struct ev_check *xcb_check;
+
static int xkb_event_base;
int xkb_current_group;
}
}
+/*
+ * Enable or disable the main X11 event handling function.
+ * This is used by drag_pointer() which has its own, modal event handler, which
+ * takes precedence over the normal event handler.
+ *
+ */
+void main_set_x11_cb(bool enable) {
+ DLOG("Setting main X11 callback to enabled=%d\n", enable);
+ if (enable) {
+ ev_check_start(main_loop, xcb_check);
+ /* Trigger the watcher explicitly to handle all remaining X11 events.
+ * drag_pointer()’s event handler exits in the middle of the loop. */
+ ev_feed_event(main_loop, xcb_check, 0);
+ } else {
+ ev_check_stop(main_loop, xcb_check);
+ }
+}
/*
* When using xmodmap to change the keyboard mapping, this event
init_logging();
/* On release builds, disable SHM logging by default. */
- shmlog_size = (is_debug_build() ? default_shmlog_size : 0);
+ shmlog_size = (is_debug_build() || strstr(argv[0], "i3-with-shmlog") != NULL ? default_shmlog_size : 0);
start_argv = argv;
break;
} else if (strcmp(long_options[option_index].name, "get-socketpath") == 0 ||
strcmp(long_options[option_index].name, "get_socketpath") == 0) {
- char *socket_path = root_atom_contents("I3_SOCKET_PATH");
+ char *socket_path = root_atom_contents("I3_SOCKET_PATH", NULL, 0);
if (socket_path) {
printf("%s\n", socket_path);
exit(EXIT_SUCCESS);
optind++;
}
DLOG("Command is: %s (%zd bytes)\n", payload, strlen(payload));
- char *socket_path = root_atom_contents("I3_SOCKET_PATH");
+ char *socket_path = root_atom_contents("I3_SOCKET_PATH", NULL, 0);
if (!socket_path) {
ELOG("Could not get i3 IPC socket path\n");
return 1;
/* The following code is helpful, but not required. We thus don’t pay
* much attention to error handling, non-linux or other edge cases. */
- char cwd[PATH_MAX];
LOG("CORE DUMPS: You are running a development version of i3, so coredumps were automatically enabled (ulimit -c unlimited).\n");
- if (getcwd(cwd, sizeof(cwd)) != NULL)
+ size_t cwd_size = 1024;
+ char *cwd = smalloc(cwd_size);
+ char *cwd_ret;
+ while ((cwd_ret = getcwd(cwd, cwd_size)) == NULL && errno == ERANGE) {
+ cwd_size = cwd_size * 2;
+ cwd = srealloc(cwd, cwd_size);
+ }
+ if (cwd_ret != NULL)
LOG("CORE DUMPS: Your current working directory is \"%s\".\n", cwd);
int patternfd;
if ((patternfd = open("/proc/sys/kernel/core_pattern", O_RDONLY)) >= 0) {
- memset(cwd, '\0', sizeof(cwd));
- if (read(patternfd, cwd, sizeof(cwd)) > 0)
+ memset(cwd, '\0', cwd_size);
+ if (read(patternfd, cwd, cwd_size) > 0)
/* a trailing newline is included in cwd */
LOG("CORE DUMPS: Your core_pattern is: %s", cwd);
close(patternfd);
}
+ free(cwd);
}
LOG("i3 " I3_VERSION " starting\n");
}
}
+ restore_connect();
+
/* Setup NetWM atoms */
#define xmacro(name) \
do { \
/* Set up i3 specific atoms like I3_SOCKET_PATH and I3_CONFIG_PATH */
x_set_i3_atoms();
+ ewmh_update_workarea();
struct ev_io *xcb_watcher = scalloc(sizeof(struct ev_io));
struct ev_io *xkb = scalloc(sizeof(struct ev_io));
- struct ev_check *xcb_check = scalloc(sizeof(struct ev_check));
+ xcb_check = scalloc(sizeof(struct ev_check));
struct ev_prepare *xcb_prepare = scalloc(sizeof(struct ev_prepare));
ev_io_init(xcb_watcher, xcb_got_event, xcb_get_file_descriptor(conn), EV_READ);
}
xcb_ungrab_server(conn);
+ if (autostart) {
+ LOG("This is not an in-place restart, copying root window contents to a pixmap\n");
+ xcb_screen_t *root = xcb_aux_get_screen(conn, conn_screen);
+ uint16_t width = root->width_in_pixels;
+ uint16_t height = root->height_in_pixels;
+ xcb_pixmap_t pixmap = xcb_generate_id(conn);
+ xcb_gcontext_t gc = xcb_generate_id(conn);
+
+ xcb_create_pixmap(conn, root->root_depth, pixmap, root->root, width, height);
+
+ xcb_create_gc(conn, gc, root->root,
+ XCB_GC_FUNCTION | XCB_GC_PLANE_MASK | XCB_GC_FILL_STYLE | XCB_GC_SUBWINDOW_MODE,
+ (uint32_t[]){ XCB_GX_COPY, ~0, XCB_FILL_STYLE_SOLID, XCB_SUBWINDOW_MODE_INCLUDE_INFERIORS });
+
+ xcb_copy_area(conn, root->root, pixmap, gc, 0, 0, 0, 0, width, height);
+ xcb_change_window_attributes_checked(conn, root->root, XCB_CW_BACK_PIXMAP, (uint32_t[]){ pixmap });
+ xcb_flush(conn);
+ xcb_free_gc(conn, gc);
+ xcb_free_pixmap(conn, pixmap);
+ }
+
struct sigaction action;
action.sa_sigaction = handle_signal;