X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmainx.c;h=322e51e28a0f9eb185f2cac1cf62465ecdc49e70;hb=8622cf3917e53585b62c8be0d72cddf3c440b30b;hp=03cb9d1b647d53034ec3e9abb0c63c6c679d70fb;hpb=e7bf93163d2356393e3b969d9f6e77631bd9179d;p=i3%2Fi3 diff --git a/src/mainx.c b/src/mainx.c index 03cb9d1b..322e51e2 100644 --- a/src/mainx.c +++ b/src/mainx.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include @@ -37,6 +39,7 @@ #include "data.h" #include "debug.h" #include "handlers.h" +#include "click.h" #include "i3.h" #include "layout.h" #include "queue.h" @@ -55,8 +58,10 @@ char **start_argv; /* This is our connection to X11 for use with XKB */ Display *xkbdpy; +xcb_key_symbols_t *keysyms; + /* The list of key bindings */ -struct bindings_head bindings = TAILQ_HEAD_INITIALIZER(bindings); +struct bindings_head *bindings; /* The list of exec-lines */ struct autostarts_head autostarts = TAILQ_HEAD_INITIALIZER(autostarts); @@ -109,6 +114,34 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { } } +/* + * When using xmodmap to change the keyboard mapping, this event + * is only sent via XKB. Therefore, we need this special handler. + * + */ +static void xkb_got_event(EV_P_ struct ev_io *w, int revents) { + LOG("got xkb event, yay\n"); + XEvent ev; + /* When using xmodmap, every change (!) gets an own event. + * Therefore, we just read all events and only handle the + * mapping_notify once (we do not receive any other XKB + * events anyway). */ + while (XPending(xkbdpy)) + XNextEvent(xkbdpy, &ev); + + xcb_key_symbols_free(keysyms); + keysyms = xcb_key_symbols_alloc(global_conn); + + xcb_get_numlock_mask(global_conn); + + ungrab_all_keys(global_conn); + LOG("Re-grabbing...\n"); + grab_all_keys(global_conn); + LOG("Done\n"); + +} + + int main(int argc, char *argv[], char *env[]) { int i, screens, opt; char *override_configpath = NULL; @@ -116,6 +149,14 @@ int main(int argc, char *argv[], char *env[]) { xcb_connection_t *conn; xcb_property_handlers_t prophs; xcb_intern_atom_cookie_t atom_cookies[NUM_ATOMS]; + static struct option long_options[] = { + {"no-autostart", no_argument, 0, 'a'}, + {"config", required_argument, 0, 'c'}, + {"version", no_argument, 0, 'v'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + int option_index = 0; setlocale(LC_ALL, ""); @@ -125,7 +166,7 @@ int main(int argc, char *argv[], char *env[]) { start_argv = argv; - while ((opt = getopt(argc, argv, "c:va")) != -1) { + while ((opt = getopt_long(argc, argv, "c:vahl", long_options, &option_index)) != -1) { switch (opt) { case 'a': LOG("Autostart disabled using -a\n"); @@ -137,8 +178,15 @@ int main(int argc, char *argv[], char *env[]) { case 'v': printf("i3 version " I3_VERSION " © 2009 Michael Stapelberg and contributors\n"); exit(EXIT_SUCCESS); + case 'l': + config_use_lexer = true; + break; default: - fprintf(stderr, "Usage: %s [-c configfile]\n", argv[0]); + fprintf(stderr, "Usage: %s [-c configfile] [-a] [-v]\n", argv[0]); + fprintf(stderr, "\n"); + fprintf(stderr, "-a: disable autostart\n"); + fprintf(stderr, "-v: display version and exit\n"); + fprintf(stderr, "-c : use the provided configfile instead\n"); exit(EXIT_FAILURE); } } @@ -158,6 +206,14 @@ int main(int argc, char *argv[], char *env[]) { load_configuration(conn, override_configpath, false); + /* Create the initial container on the first workspace. This used to + * be part of init_table, but since it possibly requires an X + * connection and a loaded configuration (default mode for new + * containers may be stacking, which requires a new window to be + * created), it had to be delayed. */ + expand_table_cols(TAILQ_FIRST(workspaces)); + expand_table_rows(TAILQ_FIRST(workspaces)); + /* Place requests for the atoms we need as soon as possible */ #define REQUEST_ATOM(name) atom_cookies[name] = xcb_intern_atom(conn, 0, strlen(#name), #name); @@ -178,6 +234,7 @@ int main(int argc, char *argv[], char *env[]) { REQUEST_ATOM(WM_DELETE_WINDOW); REQUEST_ATOM(UTF8_STRING); REQUEST_ATOM(WM_STATE); + REQUEST_ATOM(WM_CLIENT_LEADER); /* TODO: this has to be more beautiful somewhen */ int major, minor, error; @@ -192,6 +249,11 @@ int main(int argc, char *argv[], char *env[]) { return 1; } + if (fcntl(ConnectionNumber(xkbdpy), F_SETFD, FD_CLOEXEC) == -1) { + fprintf(stderr, "Could not set FD_CLOEXEC on xkbdpy\n"); + return 1; + } + int i1; if (!XkbQueryExtension(xkbdpy,&i1,&evBase,&errBase,&major,&minor)) { fprintf(stderr, "XKB not supported by X-server\n"); @@ -199,18 +261,30 @@ int main(int argc, char *argv[], char *env[]) { } /* end of ugliness */ + if (!XkbSelectEvents(xkbdpy, XkbUseCoreKbd, XkbMapNotifyMask, XkbMapNotifyMask)) { + fprintf(stderr, "Could not set XKB event mask\n"); + return 1; + } + /* Initialize event loop using libev */ struct ev_loop *loop = ev_default_loop(0); if (loop == NULL) die("Could not initialize libev. Bad LIBEV_FLAGS?\n"); 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)); 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); ev_io_start(loop, xcb_watcher); + ev_io_init(xkb, xkb_got_event, ConnectionNumber(xkbdpy), EV_READ); + ev_io_start(loop, xkb); + + /* Flush the buffer so that libev can properly get new events */ + XFlush(xkbdpy); + ev_check_init(xcb_check, xcb_check_cb); ev_check_start(loop, xcb_check); @@ -256,6 +330,13 @@ int main(int argc, char *argv[], char *env[]) { /* Configure request = window tried to change size on its own */ xcb_event_set_configure_request_handler(&evenths, handle_configure_request, NULL); + /* Motion notify = user moved his cursor (over the root window and may + * cross virtual screen boundaries doing that) */ + xcb_event_set_motion_notify_handler(&evenths, handle_motion_notify, NULL); + + /* Mapping notify = keyboard mapping changed (Xmodmap), re-grab bindings */ + xcb_event_set_mapping_notify_handler(&evenths, handle_mapping_notify, NULL); + /* Client message are sent to the root window. The only interesting client message for us is _NET_WM_STATE, we honour _NET_WM_STATE_FULLSCREEN */ xcb_event_set_client_message_handler(&evenths, handle_client_message, NULL); @@ -276,6 +357,7 @@ int main(int argc, char *argv[], char *env[]) { 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_change_window_attributes(conn, root, mask, values); @@ -308,6 +390,7 @@ int main(int argc, char *argv[], char *env[]) { GET_ATOM(WM_DELETE_WINDOW); GET_ATOM(UTF8_STRING); GET_ATOM(WM_STATE); + GET_ATOM(WM_CLIENT_LEADER); xcb_property_set_handler(&prophs, atoms[_NET_WM_WINDOW_TYPE], UINT_MAX, handle_window_type, NULL); /* TODO: In order to comply with EWMH, we have to watch _NET_WM_STRUT_PARTIAL */ @@ -324,6 +407,12 @@ int main(int argc, char *argv[], char *env[]) { /* Watch WM_CLASS (= class of the window) */ xcb_property_set_handler(&prophs, WM_CLASS, 128, handle_windowclass_change, NULL); + /* Watch WM_CLIENT_LEADER (= logical parent window for toolbars etc.) */ + xcb_property_set_handler(&prophs, atoms[WM_CLIENT_LEADER], UINT_MAX, handle_clientleader_change, NULL); + + /* Watch WM_HINTS (contains the urgent property) */ + xcb_property_set_handler(&prophs, WM_HINTS, UINT_MAX, handle_hints, NULL); + /* Set up the atoms we support */ check_error(conn, xcb_change_property_checked(conn, XCB_PROP_MODE_REPLACE, root, atoms[_NET_SUPPORTED], ATOM, 32, 7, atoms), "Could not set _NET_SUPPORTED"); @@ -331,6 +420,8 @@ int main(int argc, char *argv[], char *env[]) { xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, atoms[_NET_SUPPORTING_WM_CHECK], WINDOW, 32, 1, &root); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, atoms[_NET_WM_NAME], atoms[UTF8_STRING], 8, strlen("i3"), "i3"); + keysyms = xcb_key_symbols_alloc(conn); + xcb_get_numlock_mask(conn); grab_all_keys(conn); @@ -350,8 +441,6 @@ int main(int argc, char *argv[], char *env[]) { xcb_flush(conn); - manage_existing_windows(conn, &prophs, root); - /* Get pointer position to see on which screen we’re starting */ xcb_query_pointer_reply_t *reply; if ((reply = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, root), NULL)) == NULL) { @@ -361,14 +450,16 @@ int main(int argc, char *argv[], char *env[]) { i3Screen *screen = get_screen_containing(reply->root_x, reply->root_y); if (screen == NULL) { - LOG("ERROR: No screen at %d x %d\n", reply->root_x, reply->root_y); - return 0; - } - if (screen->current_workspace != 0) { - LOG("Ok, I need to go to the other workspace\n"); - c_ws = &workspaces[screen->current_workspace]; + LOG("ERROR: No screen at %d x %d, starting on the first screen\n", + reply->root_x, reply->root_y); + screen = TAILQ_FIRST(virtual_screens); } + LOG("Starting on %d\n", screen->current_workspace); + c_ws = screen->current_workspace; + + manage_existing_windows(conn, &prophs, root); + /* Create the UNIX domain socket for IPC */ if (config.ipc_socket_path != NULL) { int ipc_socket = ipc_create_socket(config.ipc_socket_path);