* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
*
* main.c: Initialization, main loop
*
/* Whether this version of i3 is a debug build or a release build. */
bool debug_build = false;
+/** The number of file descriptors passed via socket activation. */
+int listen_fds;
+
static int xkb_event_base;
int xkb_current_group;
xcb_screen_t *root_screen;
xcb_window_t root;
+
+/* Color depth, visual id and colormap to use when creating windows and
+ * pixmaps. Will use 32 bit depth and an appropriate visual, if available,
+ * otherwise the root window’s default (usually 24 bit TrueColor). */
uint8_t root_depth;
+xcb_visualid_t visual_id;
+xcb_colormap_t colormap;
struct ev_loop *main_loop;
* Exit handler which destroys the main_loop. Will trigger cleanup handlers.
*
*/
-static void i3_exit() {
+static void i3_exit(void) {
/* 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. */
}
int main(int argc, char *argv[]) {
+ /* Keep a symbol pointing to the I3_VERSION string constant so that we have
+ * it in gdb backtraces. */
+ const char *i3_version = I3_VERSION;
char *override_configpath = NULL;
bool autostart = true;
char *layout_path = NULL;
{0, 0, 0, 0}
};
int option_index = 0, opt;
+ xcb_void_cookie_t colormap_cookie;
setlocale(LC_ALL, "");
* (file) logging. */
init_logging();
- /* I3_VERSION contains either something like this:
+ /* i3_version contains either something like this:
* "4.0.2 (2011-11-11, branch "release")".
* or: "4.0.2-123-gCOFFEEBABE (2011-11-11, branch "next")".
*
* So we check for the offset of the first opening round bracket to
* determine whether this is a git version or a release version. */
- debug_build = ((strchr(I3_VERSION, '(') - I3_VERSION) > 10);
+ debug_build = ((strchr(i3_version, '(') - i3_version) > 10);
/* On non-release builds, disable SHM logging by default. */
shmlog_size = (debug_build ? 25 * 1024 * 1024 : 0);
break;
} else if (strcmp(long_options[option_index].name, "get-socketpath") == 0 ||
strcmp(long_options[option_index].name, "get_socketpath") == 0) {
- char *socket_path = socket_path_from_x11();
+ char *socket_path = root_atom_contents("I3_SOCKET_PATH");
if (socket_path) {
printf("%s\n", socket_path);
return 0;
optind++;
}
LOG("Command is: %s (%d bytes)\n", payload, strlen(payload));
- char *socket_path = socket_path_from_x11();
+ char *socket_path = root_atom_contents("I3_SOCKET_PATH");
if (!socket_path) {
ELOG("Could not get i3 IPC socket path\n");
return 1;
root_screen = xcb_aux_get_screen(conn, conn_screen);
root = root_screen->root;
+
+ /* By default, we use the same depth and visual as the root window, which
+ * usually is TrueColor (24 bit depth) and the corresponding visual.
+ * However, we also check if a 32 bit depth and visual are available (for
+ * transparency) and use it if so. */
root_depth = root_screen->root_depth;
+ visual_id = root_screen->root_visual;
+ colormap = root_screen->default_colormap;
+
+ DLOG("root_depth = %d, visual_id = 0x%08x.\n", root_depth, visual_id);
+
xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(conn, root);
xcb_query_pointer_cookie_t pointercookie = xcb_query_pointer(conn, root);
cookie = xcb_change_window_attributes_checked(conn, root, mask, values);
check_error(conn, cookie, "Another window manager seems to be running");
+ /* By now we already checked for replies once, so let’s see if colormap
+ * creation worked (if requested). */
+ if (colormap != root_screen->default_colormap) {
+ xcb_generic_error_t *error = xcb_request_check(conn, colormap_cookie);
+ if (error != NULL) {
+ ELOG("Could not create ColorMap for 32 bit visual, falling back to X11 default.\n");
+ root_depth = root_screen->root_depth;
+ visual_id = root_screen->root_visual;
+ colormap = root_screen->default_colormap;
+ DLOG("root_depth = %d, visual_id = 0x%08x.\n", root_depth, visual_id);
+ free(error);
+ }
+ }
+
xcb_get_geometry_reply_t *greply = xcb_get_geometry_reply(conn, gcookie, NULL);
if (greply == NULL) {
ELOG("Could not get geometry of the root window, exiting\n");
property_handlers_init();
- /* Set up the atoms we support */
- xcb_atom_t supported_atoms[] = {
-#define xmacro(atom) A_ ## atom,
-#include "atoms.xmacro"
-#undef xmacro
- };
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_SUPPORTED, XCB_ATOM_ATOM, 32, 16, supported_atoms);
- /* Set up the window manager’s name */
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_SUPPORTING_WM_CHECK, XCB_ATOM_WINDOW, 32, 1, &root);
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_WM_NAME, A_UTF8_STRING, 8, strlen("i3"), "i3");
+ ewmh_setup_hints();
keysyms = xcb_key_symbols_alloc(conn);
/* Also handle the UNIX domain sockets passed via socket activation. The
* parameter 1 means "remove the environment variables", we don’t want to
* pass these to child processes. */
- int fds = sd_listen_fds(1);
- if (fds < 0)
+ listen_fds = sd_listen_fds(0);
+ if (listen_fds < 0)
ELOG("socket activation: Error in sd_listen_fds\n");
- else if (fds == 0)
+ else if (listen_fds == 0)
DLOG("socket activation: no sockets passed\n");
else {
- for (int fd = SD_LISTEN_FDS_START; fd < (SD_LISTEN_FDS_START + fds); fd++) {
+ int flags;
+ for (int fd = SD_LISTEN_FDS_START;
+ fd < (SD_LISTEN_FDS_START + listen_fds);
+ fd++) {
DLOG("socket activation: also listening on fd %d\n", fd);
+
+ /* sd_listen_fds() enables FD_CLOEXEC by default.
+ * However, we need to keep the file descriptors open for in-place
+ * restarting, therefore we explicitly disable FD_CLOEXEC. */
+ if ((flags = fcntl(fd, F_GETFD)) < 0 ||
+ fcntl(fd, F_SETFD, flags & ~FD_CLOEXEC) < 0) {
+ ELOG("Could not disable FD_CLOEXEC on fd %d\n", fd);
+ }
+
struct ev_io *ipc_io = scalloc(sizeof(struct ev_io));
ev_io_init(ipc_io, ipc_new_client, fd, EV_READ);
ev_io_start(main_loop, ipc_io);
projects / i3 / i3 / blobdiff