while (0)
#include "xcb.h"
-#include "ipc.h"
+#include "libi3.h"
enum { STEP_WELCOME, STEP_GENERATE } current_step = STEP_WELCOME;
-enum { MOD_ALT, MOD_SUPER } modifier = MOD_SUPER;
+enum { MOD_Mod1, MOD_Mod4 } modifier = MOD_Mod4;
static char *config_path;
static xcb_connection_t *conn;
+static xcb_get_modifier_mapping_reply_t *modmap_reply;
static uint32_t font_id;
static uint32_t font_bold_id;
static char *socket_path;
char *rewrite_binding(const char *bindingline);
static void finish();
+#if defined(__APPLE__)
+
+/*
+ * Taken from FreeBSD
+ * Returns a pointer to a new string which is a duplicate of the
+ * string, but only copies at most n characters.
+ *
+ */
+char *strndup(const char *str, size_t n) {
+ size_t len;
+ char *copy;
+
+ for (len = 0; len < n && str[len]; len++)
+ continue;
+
+ if ((copy = malloc(len + 1)) == NULL)
+ return (NULL);
+ memcpy(copy, str, len);
+ copy[len] = '\0';
+ return (copy);
+}
+
+#endif
+
/*
* This function resolves ~ in pathnames.
* It may resolve wildcards in the first part of the path, but if no match
return result;
}
-/*
- * Try to get the socket path from X11 and return NULL if it doesn’t work.
- * As i3-msg is a short-running tool, we don’t bother with cleaning up the
- * connection and leave it up to the operating system on exit.
- *
- */
-static char *socket_path_from_x11() {
- xcb_connection_t *conn;
- int screen;
- if ((conn = xcb_connect(NULL, &screen)) == NULL ||
- xcb_connection_has_error(conn))
- return NULL;
- xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screen);
- xcb_window_t root = root_screen->root;
-
- xcb_intern_atom_cookie_t atom_cookie;
- xcb_intern_atom_reply_t *atom_reply;
-
- atom_cookie = xcb_intern_atom(conn, 0, strlen("I3_SOCKET_PATH"), "I3_SOCKET_PATH");
- atom_reply = xcb_intern_atom_reply(conn, atom_cookie, NULL);
- if (atom_reply == NULL)
- return NULL;
-
- xcb_get_property_cookie_t prop_cookie;
- xcb_get_property_reply_t *prop_reply;
- prop_cookie = xcb_get_property_unchecked(conn, false, root, atom_reply->atom,
- XCB_GET_PROPERTY_TYPE_ANY, 0, PATH_MAX);
- prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL);
- if (prop_reply == NULL || xcb_get_property_value_length(prop_reply) == 0)
- return NULL;
- if (asprintf(&socket_path, "%.*s", xcb_get_property_value_length(prop_reply),
- (char*)xcb_get_property_value(prop_reply)) == -1)
- return NULL;
- return socket_path;
-}
-
/*
* Handles expose events, that is, draws the window contents.
*
*/
static int handle_expose() {
/* re-draw the background */
- xcb_rectangle_t border = {0, 0, 300, (15*font_height) + 8},
- inner = {2, 2, 296, (15*font_height) + 8 - 4};
- xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#285577"));
- xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &border);
+ xcb_rectangle_t border = {0, 0, 300, (15*font_height) + 8};
xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000"));
- xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &inner);
+ xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &border);
xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FONT, font_id);
/* restore font color */
xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FFFFFF"));
- txt(10, 1, "i3: first configuration");
- txt(10, 4, "You have not configured i3 yet.");
- txt(10, 5, "Do you want me to generate ~/.i3/config?");
- txt(85, 8, "Yes, generate ~/.i3/config");
- txt(85, 10, "No, I will use the defaults");
+ txt(10, 2, "You have not configured i3 yet.");
+ txt(10, 3, "Do you want me to generate ~/.i3/config?");
+ txt(85, 5, "Yes, generate ~/.i3/config");
+ txt(85, 7, "No, I will use the defaults");
/* green */
xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#00FF00"));
- txt(25, 8, "<Enter>");
+ txt(25, 5, "<Enter>");
/* red */
xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FF0000"));
- txt(31, 10, "<ESC>");
+ txt(31, 7, "<ESC>");
}
if (current_step == STEP_GENERATE) {
xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FFFFFF"));
- txt(10, 1, "i3: generate config");
-
- txt(10, 4, "Please choose either:");
- txt(85, 6, "Win as default modifier");
- txt(85, 7, "Alt as default modifier");
- txt(10, 9, "Afterwards, press");
- txt(85, 11, "to write ~/.i3/config");
- txt(85, 12, "to abort");
+ txt(10, 2, "Please choose either:");
+ txt(85, 4, "Win as default modifier");
+ txt(85, 5, "Alt as default modifier");
+ txt(10, 7, "Afterwards, press");
+ txt(85, 9, "to write ~/.i3/config");
+ txt(85, 10, "to abort");
/* the not-selected modifier */
- if (modifier == MOD_SUPER)
- txt(31, 7, "<Alt>");
- else txt(31, 6, "<Win>");
+ if (modifier == MOD_Mod4)
+ txt(31, 5, "<Alt>");
+ else txt(31, 4, "<Win>");
/* the selected modifier */
xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FONT, font_bold_id);
- if (modifier == MOD_SUPER)
- txt(31, 6, "<Win>");
- else txt(31, 7, "<Alt>");
+ if (modifier == MOD_Mod4)
+ txt(31, 4, "<Win>");
+ else txt(31, 5, "<Alt>");
/* green */
uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_FONT;
uint32_t values[] = { get_colorpixel(conn, "#00FF00"), font_id };
xcb_change_gc(conn, pixmap_gc, mask, values);
- txt(25, 11, "<Enter>");
+ txt(25, 9, "<Enter>");
/* red */
xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FF0000"));
- txt(31, 12, "<ESC>");
+ txt(31, 10, "<ESC>");
}
/* Copy the contents of the pixmap to the real window */
static int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_t *event) {
printf("Keypress %d, state raw = %d\n", event->detail, event->state);
- xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, event->state);
+ /* Remove the numlock bit, all other bits are modifiers we can bind to */
+ uint16_t state_filtered = event->state & ~(xcb_numlock_mask | XCB_MOD_MASK_LOCK);
+ /* Only use the lower 8 bits of the state (modifier masks) so that mouse
+ * button masks are filtered out */
+ state_filtered &= 0xFF;
+
+ xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, state_filtered);
printf("sym = %c (%d)\n", sym, sym);
- if (sym == XK_Return) {
- if (current_step == STEP_WELCOME)
+ if (sym == XK_Return || sym == XK_KP_Enter) {
+ if (current_step == STEP_WELCOME) {
current_step = STEP_GENERATE;
+ /* Set window title */
+ xcb_change_property(conn,
+ XCB_PROP_MODE_REPLACE,
+ win,
+ A__NET_WM_NAME,
+ A_UTF8_STRING,
+ 8,
+ strlen("i3: generate config"),
+ "i3: generate config");
+ xcb_flush(conn);
+ }
else finish();
}
if (sym == XK_Escape)
exit(0);
- if (sym == XK_Alt_L)
- modifier = MOD_ALT;
+ /* Check if this is Mod1 or Mod4. The modmap contains Shift, Lock, Control,
+ * Mod1, Mod2, Mod3, Mod4, Mod5 (in that order) */
+ xcb_keycode_t *modmap = xcb_get_modifier_mapping_keycodes(modmap_reply);
+ /* Mod1? */
+ int mask = 3;
+ for (int i = 0; i < modmap_reply->keycodes_per_modifier; i++) {
+ xcb_keycode_t code = modmap[(mask * modmap_reply->keycodes_per_modifier) + i];
+ if (code == XCB_NONE)
+ continue;
+ printf("Modifier keycode for Mod1: 0x%02x\n", code);
+ if (code == event->detail) {
+ modifier = MOD_Mod1;
+ printf("This is Mod1!\n");
+ }
+ }
- if (sym == XK_Super_L)
- modifier = MOD_SUPER;
+ /* Mod4? */
+ mask = 6;
+ for (int i = 0; i < modmap_reply->keycodes_per_modifier; i++) {
+ xcb_keycode_t code = modmap[(mask * modmap_reply->keycodes_per_modifier) + i];
+ if (code == XCB_NONE)
+ continue;
+ printf("Modifier keycode for Mod4: 0x%02x\n", code);
+ if (code == event->detail) {
+ modifier = MOD_Mod4;
+ printf("This is Mod4!\n");
+ }
+ }
handle_expose();
return 1;
}
+/*
+ * Handle button presses to make clicking on "<win>" and "<alt>" work
+ *
+ */
+static void handle_button_press(xcb_button_press_event_t* event) {
+ if (current_step != STEP_GENERATE)
+ return;
+
+ if (event->event_x >= 32 && event->event_x <= 68 &&
+ event->event_y >= 45 && event->event_y <= 54) {
+ modifier = MOD_Mod4;
+ handle_expose();
+ }
+
+ if (event->event_x >= 32 && event->event_x <= 68 &&
+ event->event_y >= 56 && event->event_y <= 70) {
+ modifier = MOD_Mod1;
+ handle_expose();
+ }
+
+ return;
+}
+
/*
* Creates the config file and tells i3 to reload.
*
char *line = NULL;
size_t len = 0;
+#if !defined(__APPLE__)
ssize_t read;
+#endif
bool head_of_file = true;
/* write a header about auto-generation to the output file */
fputs("# this file and re-run i3-config-wizard(1).\n", ks_config);
fputs("#\n", ks_config);
+#if defined(__APPLE__)
+ while ((line = fgetln(kc_config, &len)) != NULL) {
+#else
while ((read = getline(&line, &len, kc_config)) != -1) {
+#endif
/* skip the warning block at the beginning of the input file */
if (head_of_file &&
strncmp("# WARNING", line, strlen("# WARNING")) == 0)
/* Set the modifier the user chose */
if (strncmp(walk, "set $mod ", strlen("set $mod ")) == 0) {
- if (modifier == MOD_ALT)
+ if (modifier == MOD_Mod1)
fputs("set $mod Mod1\n", ks_config);
else fputs("set $mod Mod4\n", ks_config);
continue;
fclose(ks_config);
/* tell i3 to reload the config file */
- int sockfd = connect_ipc(socket_path);
+ int sockfd = ipc_connect(socket_path);
ipc_send_message(sockfd, strlen("reload"), 0, (uint8_t*)"reload");
close(sockfd);
socket_path = "/tmp/i3-ipc.sock";
int screens;
- conn = xcb_connect(NULL, &screens);
- if (xcb_connection_has_error(conn))
+ if ((conn = xcb_connect(NULL, &screens)) == NULL ||
+ xcb_connection_has_error(conn))
errx(1, "Cannot open display\n");
+ xcb_get_modifier_mapping_cookie_t modmap_cookie;
+ modmap_cookie = xcb_get_modifier_mapping(conn);
+
+ /* Place requests for the atoms we need as soon as possible */
+ #define xmacro(atom) \
+ xcb_intern_atom_cookie_t atom ## _cookie = xcb_intern_atom(conn, 0, strlen(#atom), #atom);
+ #include "atoms.xmacro"
+ #undef xmacro
+
xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens);
root = root_screen->root;
+ if (!(modmap_reply = xcb_get_modifier_mapping_reply(conn, modmap_cookie, NULL)))
+ errx(EXIT_FAILURE, "Could not get modifier mapping\n");
+
+ /* XXX: we should refactor xcb_get_numlock_mask so that it uses the
+ * modifier mapping we already have */
+ xcb_get_numlock_mask(conn);
+
symbols = xcb_key_symbols_alloc(conn);
font_id = get_font_id(conn, pattern, &font_height);
/* Open an input window */
win = open_input_window(conn, 300, 205);
+ /* Setup NetWM atoms */
+ #define xmacro(name) \
+ do { \
+ xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(conn, name ## _cookie, NULL); \
+ if (!reply) \
+ errx(EXIT_FAILURE, "Could not get atom " # name "\n"); \
+ \
+ A_ ## name = reply->atom; \
+ free(reply); \
+ } while (0);
+ #include "atoms.xmacro"
+ #undef xmacro
+
+ /* Set dock mode */
+ xcb_change_property(conn,
+ XCB_PROP_MODE_REPLACE,
+ win,
+ A__NET_WM_WINDOW_TYPE,
+ A_ATOM,
+ 32,
+ 1,
+ (unsigned char*) &A__NET_WM_WINDOW_TYPE_DIALOG);
+
+ /* Set window title */
+ xcb_change_property(conn,
+ XCB_PROP_MODE_REPLACE,
+ win,
+ A__NET_WM_NAME,
+ A_UTF8_STRING,
+ 8,
+ strlen("i3: first configuration"),
+ "i3: first configuration");
+
/* Create pixmap */
pixmap = xcb_generate_id(conn);
pixmap_gc = xcb_generate_id(conn);
xcb_create_pixmap(conn, root_screen->root_depth, pixmap, win, 500, 500);
xcb_create_gc(conn, pixmap_gc, pixmap, 0, 0);
- /* Set input focus (we have override_redirect=1, so the wm will not do
- * this for us) */
- xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, win, XCB_CURRENT_TIME);
-
/* Grab the keyboard to get all input */
xcb_flush(conn);
/* TODO: handle mappingnotify */
+ case XCB_BUTTON_PRESS:
+ handle_button_press((xcb_button_press_event_t*)event);
+ break;
+
case XCB_EXPOSE:
handle_expose();
break;