X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmain.c;h=878ea5bcf259314910490027c640ae0aa7a6accb;hb=a32b6da71249a71487b5708e0f043e5cb3b146c1;hp=b60bb6d7cbbe155881fee2d9790711d3fbc8e167;hpb=884627ef20dfb2edae9a5c99bb470bfbf0301904;p=i3%2Fi3 diff --git a/src/main.c b/src/main.c index b60bb6d7..878ea5bc 100644 --- a/src/main.c +++ b/src/main.c @@ -4,7 +4,7 @@ * 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 * @@ -19,6 +19,7 @@ #include #include #include "all.h" +#include "shmlog.h" #include "sd-daemon.h" @@ -30,6 +31,10 @@ struct rlimit original_rlimit_core; /** 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; @@ -67,6 +72,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; @@ -139,6 +147,23 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { } } +/* + * 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 @@ -233,12 +258,9 @@ static void i3_exit(void) { * */ 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); } @@ -257,6 +279,9 @@ int main(int argc, char *argv[]) { {"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}, @@ -269,6 +294,7 @@ int main(int argc, char *argv[]) { {"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; @@ -289,12 +315,12 @@ int main(int argc, char *argv[]) { * (file) logging. */ init_logging(); - /* On non-release builds, disable SHM logging by default. */ - shmlog_size = (is_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"); @@ -314,8 +340,14 @@ int main(int argc, char *argv[]) { only_check_config = true; break; case 'v': - printf("i3 version " I3_VERSION " © 2009-2012 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; @@ -341,7 +373,7 @@ 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); exit(EXIT_SUCCESS); @@ -366,6 +398,9 @@ int main(int argc, char *argv[]) { 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: @@ -382,7 +417,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"); @@ -427,7 +463,7 @@ int main(int argc, char *argv[]) { 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; @@ -449,14 +485,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; } @@ -471,21 +509,28 @@ int main(int argc, char *argv[]) { /* 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)) @@ -530,16 +575,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); @@ -590,18 +627,20 @@ 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; } } + restore_connect(); + /* Setup NetWM atoms */ #define xmacro(name) \ do { \ @@ -720,10 +759,11 @@ 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)); - 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); @@ -746,7 +786,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;