#include <assert.h>
#include <limits.h>
#include <locale.h>
+#include <fcntl.h>
+#include <getopt.h>
#include <X11/XKBlib.h>
#include <X11/extensions/XKB.h>
/* 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);
}
}
+/*
+ * 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;
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, "");
start_argv = argv;
- while ((opt = getopt(argc, argv, "c:va")) != -1) {
+ while ((opt = getopt_long(argc, argv, "c:vah", long_options, &option_index)) != -1) {
switch (opt) {
case 'a':
LOG("Autostart disabled using -a\n");
printf("i3 version " I3_VERSION " © 2009 Michael Stapelberg and contributors\n");
exit(EXIT_SUCCESS);
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 <configfile>: use the provided configfile instead\n");
exit(EXIT_FAILURE);
}
}
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");
}
/* 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);
/* 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);
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);
/* 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");
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);
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) {
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 = &workspaces[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);
projects / i3 / i3 / blobdiff