X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=9f92207b0b29d2cabe89bfe4d2c5bba2debb450b;hb=d090bd5ac18d8418a40017345b7a60e76e983ab1;hp=7738dacc12e1e6725e975cce0446dd97fa5f6fde;hpb=2daa8d422ae63d55e4b952070e8e894c0963618f;p=i3%2Fi3 diff --git a/src/main.c b/src/main.c index 7738dacc..9f92207b 100644 --- a/src/main.c +++ b/src/main.c @@ -1,8 +1,10 @@ +#undef I3__FILE__ +#define I3__FILE__ "main.c" /* * 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) * * main.c: Initialization, main loop * @@ -17,6 +19,7 @@ #include #include #include "all.h" +#include "shmlog.h" #include "sd-daemon.h" @@ -25,9 +28,6 @@ * RLIM_INFINITY for i3 debugging versions. */ struct rlimit original_rlimit_core; -/* 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; @@ -53,7 +53,13 @@ xcb_timestamp_t last_timestamp = XCB_CURRENT_TIME; 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; @@ -62,6 +68,9 @@ xcb_key_symbols_t *keysyms; /* Those are our connections to X11 for use with libXcursor and XKB */ Display *xlibdpy, *xkbdpy; +/* Default shmlog size if not set by user. */ +const int default_shmlog_size = 25 * 1024 * 1024; + /* The list of key bindings */ struct bindings_head *bindings; @@ -118,7 +127,7 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { 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); @@ -206,7 +215,7 @@ static void xkb_got_event(EV_P_ struct ev_io *w, int revents) { * 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. */ @@ -228,26 +237,30 @@ static void i3_exit() { * */ static void handle_signal(int sig, siginfo_t *info, void *data) { - fprintf(stderr, "Received signal %d, terminating\n", sig); if (*shmlogname != '\0') { - fprintf(stderr, "Closing SHM log \"%s\"\n", shmlogname); shm_unlink(shmlogname); } - fflush(stderr); raise(sig); } 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 __attribute__ ((unused)) = I3_VERSION; char *override_configpath = NULL; bool autostart = true; char *layout_path = NULL; bool delete_layout_path = false; bool force_xinerama = false; + char *fake_outputs = NULL; bool disable_signalhandler = false; static struct option long_options[] = { {"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}, @@ -258,6 +271,9 @@ int main(int argc, char *argv[]) { {"shmlog_size", required_argument, 0, 0}, {"get-socketpath", no_argument, 0, 0}, {"get_socketpath", no_argument, 0, 0}, + {"fake_outputs", required_argument, 0, 0}, + {"fake-outputs", required_argument, 0, 0}, + {"force-old-config-parser-v4.4-only", no_argument, 0, 0}, {0, 0, 0, 0} }; int option_index = 0, opt; @@ -278,20 +294,12 @@ int main(int argc, char *argv[]) { * (file) logging. */ init_logging(); - /* 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); - - /* On non-release builds, disable SHM logging by default. */ - shmlog_size = (debug_build ? 25 * 1024 * 1024 : 0); + /* On release builds, disable SHM logging by default. */ + shmlog_size = (is_debug_build() || strstr(argv[0], "i3-with-shmlog") != NULL ? default_shmlog_size : 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"); @@ -311,14 +319,20 @@ int main(int argc, char *argv[]) { only_check_config = true; break; case 'v': - printf("i3 version " I3_VERSION " © 2009-2011 Michael Stapelberg and contributors\n"); + printf("i3 version " I3_VERSION " © 2009-2013 Michael Stapelberg and contributors\n"); + exit(EXIT_SUCCESS); + break; + case 'm': + printf("Binary i3 version: " I3_VERSION " © 2009-2013 Michael Stapelberg and contributors\n"); + display_running_version(); exit(EXIT_SUCCESS); + break; case 'V': set_verbosity(true); break; case 'd': - LOG("Enabling debug loglevel %s\n", optarg); - add_loglevel(optarg); + LOG("Enabling debug logging\n"); + set_debug_logging(true); break; case 'l': /* DEPRECATED, ignored for the next 3 versions (3.e, 3.f, 3.g) */ @@ -338,13 +352,13 @@ int main(int argc, char *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); - 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); @@ -358,15 +372,23 @@ int main(int argc, char *argv[]) { layout_path = sstrdup(optarg); delete_layout_path = true; break; + } else if (strcmp(long_options[option_index].name, "fake-outputs") == 0 || + strcmp(long_options[option_index].name, "fake_outputs") == 0) { + LOG("Initializing fake outputs: %s\n", optarg); + fake_outputs = sstrdup(optarg); + break; + } else if (strcmp(long_options[option_index].name, "force-old-config-parser-v4.4-only") == 0) { + ELOG("You are passing --force-old-config-parser-v4.4-only, but that flag was removed by now.\n"); + break; } /* fall-through */ default: - fprintf(stderr, "Usage: %s [-c configfile] [-d loglevel] [-a] [-v] [-V] [-C]\n", argv[0]); + fprintf(stderr, "Usage: %s [-c configfile] [-d all] [-a] [-v] [-V] [-C]\n", argv[0]); fprintf(stderr, "\n"); fprintf(stderr, "\t-a disable autostart ('exec' lines in config)\n"); fprintf(stderr, "\t-c use the provided configfile instead\n"); fprintf(stderr, "\t-C validate configuration file and exit\n"); - fprintf(stderr, "\t-d enable debug output with the specified loglevel\n"); + fprintf(stderr, "\t-d all enable debug output\n"); fprintf(stderr, "\t-L path to the serialized layout during restarts\n"); fprintf(stderr, "\t-v display version and exit\n"); fprintf(stderr, "\t-V enable verbose mode\n"); @@ -374,7 +396,8 @@ int main(int argc, char *argv[]) { 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"); @@ -399,7 +422,7 @@ int main(int argc, char *argv[]) { /* If the user passes more arguments, we act like i3-msg would: Just send * the arguments as an IPC message to i3. This allows for nice semantic * commands such as 'i3 border none'. */ - if (optind < argc) { + if (!only_check_config && optind < argc) { /* We enable verbose mode so that the user knows what’s going on. * This should make it easier to find mistakes when the user passes * arguments by mistake. */ @@ -418,8 +441,8 @@ int main(int argc, char *argv[]) { } optind++; } - LOG("Command is: %s (%d bytes)\n", payload, strlen(payload)); - char *socket_path = root_atom_contents("I3_SOCKET_PATH"); + DLOG("Command is: %s (%zd bytes)\n", payload, strlen(payload)); + 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; @@ -441,14 +464,16 @@ int main(int argc, char *argv[]) { err(EXIT_FAILURE, "IPC: write()"); uint32_t reply_length; + uint32_t reply_type; uint8_t *reply; int ret; - if ((ret = ipc_recv_message(sockfd, I3_IPC_MESSAGE_TYPE_COMMAND, - &reply_length, &reply)) != 0) { + if ((ret = ipc_recv_message(sockfd, &reply_type, &reply_length, &reply)) != 0) { if (ret == -1) err(EXIT_FAILURE, "IPC: read()"); return 1; } + if (reply_type != I3_IPC_MESSAGE_TYPE_COMMAND) + errx(EXIT_FAILURE, "IPC: received reply of type %d but expected %d (COMMAND)", reply_type, I3_IPC_MESSAGE_TYPE_COMMAND); printf("%.*s\n", reply_length, reply); return 0; } @@ -457,27 +482,34 @@ int main(int argc, char *argv[]) { init_logging(); /* Try to enable core dumps by default when running a debug build */ - if (debug_build) { + if (is_debug_build()) { struct rlimit limit = { RLIM_INFINITY, RLIM_INFINITY }; setrlimit(RLIMIT_CORE, &limit); /* 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 (tree) version " I3_VERSION " starting\n"); + LOG("i3 " I3_VERSION " starting\n"); conn = xcb_connect(NULL, &conn_screen); if (xcb_connection_has_error(conn)) @@ -494,7 +526,17 @@ int main(int argc, char *argv[]) { 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); @@ -512,16 +554,8 @@ int main(int argc, char *argv[]) { config.ipc_socket_path = sstrdup(config.ipc_socket_path); } - uint32_t mask = XCB_CW_EVENT_MASK; - uint32_t values[] = { XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | - XCB_EVENT_MASK_STRUCTURE_NOTIFY | /* when the user adds a screen (e.g. video - projector), the root window gets a - ConfigureNotify */ - XCB_EVENT_MASK_POINTER_MOTION | - XCB_EVENT_MASK_PROPERTY_CHANGE | - XCB_EVENT_MASK_ENTER_WINDOW }; xcb_void_cookie_t cookie; - cookie = xcb_change_window_attributes_checked(conn, root, mask, values); + cookie = xcb_change_window_attributes_checked(conn, root, XCB_CW_EVENT_MASK, (uint32_t[]){ ROOT_EVENT_MASK }); check_error(conn, cookie, "Another window manager seems to be running"); xcb_get_geometry_reply_t *greply = xcb_get_geometry_reply(conn, gcookie, NULL); @@ -572,13 +606,13 @@ int main(int argc, char *argv[]) { int i1; if (!XkbQueryExtension(xkbdpy,&i1,&xkb_event_base,&errBase,&major,&minor)) { fprintf(stderr, "XKB not supported by X-server\n"); - return 1; + xkb_supported = false; } /* end of ugliness */ - if (!XkbSelectEvents(xkbdpy, XkbUseCoreKbd, - XkbMapNotifyMask | XkbStateNotifyMask, - XkbMapNotifyMask | XkbStateNotifyMask)) { + if (xkb_supported && !XkbSelectEvents(xkbdpy, XkbUseCoreKbd, + XkbMapNotifyMask | XkbStateNotifyMask, + XkbMapNotifyMask | XkbStateNotifyMask)) { fprintf(stderr, "Could not set XKB event mask\n"); return 1; } @@ -622,21 +656,30 @@ int main(int argc, char *argv[]) { free(greply); - /* Force Xinerama (for drivers which don't support RandR yet, esp. the - * nVidia binary graphics driver), when specified either in the config - * file or on command-line */ - if (force_xinerama || config.force_xinerama) { + /* Setup fake outputs for testing */ + if (fake_outputs == NULL && config.fake_outputs != NULL) + fake_outputs = config.fake_outputs; + + if (fake_outputs != NULL) { + fake_outputs_init(fake_outputs); + FREE(fake_outputs); + config.fake_outputs = NULL; + } else if (force_xinerama || config.force_xinerama) { + /* Force Xinerama (for drivers which don't support RandR yet, esp. the + * nVidia binary graphics driver), when specified either in the config + * file or on command-line */ xinerama_init(); } else { DLOG("Checking for XRandR...\n"); 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))) { ELOG("Could not query pointer position, using first screen\n"); - output = get_first_output(); } else { DLOG("Pointer at %d, %d\n", pointerreply->root_x, pointerreply->root_y); output = get_output_containing(pointerreply->root_x, pointerreply->root_y); @@ -693,6 +736,7 @@ int main(int argc, char *argv[]) { /* 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)); @@ -719,7 +763,64 @@ int main(int argc, char *argv[]) { 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) { + if (event->response_type == 0) { + free(event); + continue; + } + + /* Strip off the highest bit (set if the event is generated) */ + int type = (event->response_type & 0x7F); + + /* We still need to handle MapRequests which are sent in the + * timespan starting from when we register as a window manager and + * this piece of code which drops events. */ + if (type == XCB_MAP_REQUEST) + handle_event(type, event); + + free(event); + } + manage_existing_windows(root); + } + 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;