From 46ab86b88d686184abccab5d88aa4ab86c985ba4 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 18 Sep 2011 13:20:59 +0100 Subject: [PATCH 1/4] i3-input: reformat main.c --- i3-input/main.c | 570 ++++++++++++++++++++++++------------------------ 1 file changed, 285 insertions(+), 285 deletions(-) diff --git a/i3-input/main.c b/i3-input/main.c index fb2635a2..ccc56a5d 100644 --- a/i3-input/main.c +++ b/i3-input/main.c @@ -1,9 +1,9 @@ /* - * vim:ts=8:expandtab + * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager * - * © 2009 Michael Stapelberg and contributors + * © 2009-2011 Michael Stapelberg and contributors * * See file LICENSE for license information. * @@ -61,33 +61,33 @@ xcb_window_t root; * */ 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_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; + 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; + 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; + 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; } /* @@ -96,21 +96,21 @@ static char *socket_path_from_x11() { * */ static uint8_t *concat_strings(char **glyphs, int max) { - uint8_t *output = calloc(max+1, 4); - uint8_t *walk = output; - for (int c = 0; c < max; c++) { - printf("at %c\n", glyphs[c][0]); - /* if the first byte is 0, this has to be UCS2 */ - if (glyphs[c][0] == '\0') { - memcpy(walk, glyphs[c], 2); - walk += 2; - } else { - strcpy((char*)walk, glyphs[c]); - walk += strlen(glyphs[c]); - } + uint8_t *output = calloc(max+1, 4); + uint8_t *walk = output; + for (int c = 0; c < max; c++) { + printf("at %c\n", glyphs[c][0]); + /* if the first byte is 0, this has to be UCS2 */ + if (glyphs[c][0] == '\0') { + memcpy(walk, glyphs[c], 2); + walk += 2; + } else { + strcpy((char*)walk, glyphs[c]); + walk += strlen(glyphs[c]); } - printf("output = %s\n", output); - return output; + } + printf("output = %s\n", output); + return output; } /* @@ -119,37 +119,37 @@ static uint8_t *concat_strings(char **glyphs, int max) { * */ static int handle_expose(void *data, xcb_connection_t *conn, xcb_expose_event_t *event) { - printf("expose!\n"); + printf("expose!\n"); - /* re-draw the background */ - xcb_rectangle_t border = {0, 0, 500, font_height + 8}, inner = {2, 2, 496, font_height + 8 - 4}; - xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FF0000")); - xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &border); - xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000")); - xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &inner); + /* re-draw the background */ + xcb_rectangle_t border = {0, 0, 500, font_height + 8}, inner = {2, 2, 496, font_height + 8 - 4}; + xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FF0000")); + xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &border); + xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000")); + xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &inner); - /* restore font color */ - xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FFFFFF")); - uint8_t *con = concat_strings(glyphs_ucs, input_position); - char *full_text = (char*)con; - if (prompt != NULL) { - full_text = malloc((prompt_len + input_position) * 2 + 1); - if (full_text == NULL) - err(EXIT_FAILURE, "malloc() failed\n"); - memcpy(full_text, prompt, prompt_len * 2); - memcpy(full_text + (prompt_len * 2), con, input_position * 2); - } - xcb_image_text_16(conn, input_position + prompt_len, pixmap, pixmap_gc, 4 /* X */, - font_height + 2 /* Y = baseline of font */, (xcb_char2b_t*)full_text); + /* restore font color */ + xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FFFFFF")); + uint8_t *con = concat_strings(glyphs_ucs, input_position); + char *full_text = (char*)con; + if (prompt != NULL) { + full_text = malloc((prompt_len + input_position) * 2 + 1); + if (full_text == NULL) + err(EXIT_FAILURE, "malloc() failed\n"); + memcpy(full_text, prompt, prompt_len * 2); + memcpy(full_text + (prompt_len * 2), con, input_position * 2); + } + xcb_image_text_16(conn, input_position + prompt_len, pixmap, pixmap_gc, 4 /* X */, + font_height + 2 /* Y = baseline of font */, (xcb_char2b_t*)full_text); - /* Copy the contents of the pixmap to the real window */ - xcb_copy_area(conn, pixmap, win, pixmap_gc, 0, 0, 0, 0, /* */ 500, font_height + 8); - xcb_flush(conn); - free(con); - if (prompt != NULL) - free(full_text); + /* Copy the contents of the pixmap to the real window */ + xcb_copy_area(conn, pixmap, win, pixmap_gc, 0, 0, 0, 0, /* */ 500, font_height + 8); + xcb_flush(conn); + free(con); + if (prompt != NULL) + free(full_text); - return 1; + return 1; } /* @@ -157,37 +157,37 @@ static int handle_expose(void *data, xcb_connection_t *conn, xcb_expose_event_t * */ static int handle_key_release(void *ignored, xcb_connection_t *conn, xcb_key_release_event_t *event) { - printf("releasing %d, state raw = %d\n", event->detail, event->state); + printf("releasing %d, state raw = %d\n", event->detail, event->state); - /* fix state */ - event->state &= ~numlockmask; + /* fix state */ + event->state &= ~numlockmask; - xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, event->state); - if (sym == XK_Mode_switch) { - printf("Mode switch disabled\n"); - modeswitch_active = false; - } + xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, event->state); + if (sym == XK_Mode_switch) { + printf("Mode switch disabled\n"); + modeswitch_active = false; + } - return 1; + return 1; } static void finish_input() { - uint8_t *command = concat_strings(glyphs_utf8, input_position); - char *full_command = (char*)command; - /* prefix the command if a prefix was specified on commandline */ - if (command_prefix != NULL) { - if (asprintf(&full_command, "%s%s", command_prefix, command) == -1) - err(EXIT_FAILURE, "asprintf() failed\n"); - } - printf("command = %s\n", full_command); + uint8_t *command = concat_strings(glyphs_utf8, input_position); + char *full_command = (char*)command; + /* prefix the command if a prefix was specified on commandline */ + if (command_prefix != NULL) { + if (asprintf(&full_command, "%s%s", command_prefix, command) == -1) + err(EXIT_FAILURE, "asprintf() failed\n"); + } + printf("command = %s\n", full_command); - ipc_send_message(sockfd, strlen(full_command), 0, (uint8_t*)full_command); + ipc_send_message(sockfd, strlen(full_command), 0, (uint8_t*)full_command); #if 0 - free(command); - return 1; + free(command); + return 1; #endif - exit(0); + exit(0); } /* @@ -200,224 +200,224 @@ static void finish_input() { * */ 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); + printf("Keypress %d, state raw = %d\n", event->detail, event->state); - /* fix state */ - if (modeswitch_active) - event->state |= modeswitchmask; + /* fix state */ + if (modeswitch_active) + event->state |= modeswitchmask; - /* Apparantly, after activating numlock once, the numlock modifier - * stays turned on (use xev(1) to verify). So, to resolve useful - * keysyms, we remove the numlock flag from the event state */ - event->state &= ~numlockmask; + /* Apparantly, after activating numlock once, the numlock modifier + * stays turned on (use xev(1) to verify). So, to resolve useful + * keysyms, we remove the numlock flag from the event state */ + event->state &= ~numlockmask; - xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, event->state); - if (sym == XK_Mode_switch) { - printf("Mode switch enabled\n"); - modeswitch_active = true; - return 1; - } + xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, event->state); + if (sym == XK_Mode_switch) { + printf("Mode switch enabled\n"); + modeswitch_active = true; + return 1; + } - if (sym == XK_Return) - finish_input(); + if (sym == XK_Return) + finish_input(); - if (sym == XK_BackSpace) { - if (input_position == 0) - return 1; + if (sym == XK_BackSpace) { + if (input_position == 0) + return 1; - input_position--; - free(glyphs_ucs[input_position]); - free(glyphs_utf8[input_position]); - - handle_expose(NULL, conn, NULL); - return 1; - } - if (sym == XK_Escape) { - exit(0); - } - - /* TODO: handle all of these? */ - printf("is_keypad_key = %d\n", xcb_is_keypad_key(sym)); - printf("is_private_keypad_key = %d\n", xcb_is_private_keypad_key(sym)); - printf("xcb_is_cursor_key = %d\n", xcb_is_cursor_key(sym)); - printf("xcb_is_pf_key = %d\n", xcb_is_pf_key(sym)); - printf("xcb_is_function_key = %d\n", xcb_is_function_key(sym)); - printf("xcb_is_misc_function_key = %d\n", xcb_is_misc_function_key(sym)); - printf("xcb_is_modifier_key = %d\n", xcb_is_modifier_key(sym)); - - if (xcb_is_modifier_key(sym) || xcb_is_cursor_key(sym)) - return 1; - - printf("sym = %c (%d)\n", sym, sym); - - /* convert the keysym to UCS */ - uint16_t ucs = keysym2ucs(sym); - if ((int16_t)ucs == -1) { - fprintf(stderr, "Keysym could not be converted to UCS, skipping\n"); - return 1; - } - - /* store the UCS into a string */ - uint8_t inp[3] = {(ucs & 0xFF00) >> 8, (ucs & 0xFF), 0}; - - printf("inp[0] = %02x, inp[1] = %02x, inp[2] = %02x\n", inp[0], inp[1], inp[2]); - /* convert it to UTF-8 */ - char *out = convert_ucs_to_utf8((char*)inp); - printf("converted to %s\n", out); - - glyphs_ucs[input_position] = malloc(3 * sizeof(uint8_t)); - if (glyphs_ucs[input_position] == NULL) - err(EXIT_FAILURE, "malloc() failed\n"); - memcpy(glyphs_ucs[input_position], inp, 3); - glyphs_utf8[input_position] = strdup(out); - input_position++; - - if (input_position == limit) - finish_input(); + input_position--; + free(glyphs_ucs[input_position]); + free(glyphs_utf8[input_position]); handle_expose(NULL, conn, NULL); return 1; + } + if (sym == XK_Escape) { + exit(0); + } + + /* TODO: handle all of these? */ + printf("is_keypad_key = %d\n", xcb_is_keypad_key(sym)); + printf("is_private_keypad_key = %d\n", xcb_is_private_keypad_key(sym)); + printf("xcb_is_cursor_key = %d\n", xcb_is_cursor_key(sym)); + printf("xcb_is_pf_key = %d\n", xcb_is_pf_key(sym)); + printf("xcb_is_function_key = %d\n", xcb_is_function_key(sym)); + printf("xcb_is_misc_function_key = %d\n", xcb_is_misc_function_key(sym)); + printf("xcb_is_modifier_key = %d\n", xcb_is_modifier_key(sym)); + + if (xcb_is_modifier_key(sym) || xcb_is_cursor_key(sym)) + return 1; + + printf("sym = %c (%d)\n", sym, sym); + + /* convert the keysym to UCS */ + uint16_t ucs = keysym2ucs(sym); + if ((int16_t)ucs == -1) { + fprintf(stderr, "Keysym could not be converted to UCS, skipping\n"); + return 1; + } + + /* store the UCS into a string */ + uint8_t inp[3] = {(ucs & 0xFF00) >> 8, (ucs & 0xFF), 0}; + + printf("inp[0] = %02x, inp[1] = %02x, inp[2] = %02x\n", inp[0], inp[1], inp[2]); + /* convert it to UTF-8 */ + char *out = convert_ucs_to_utf8((char*)inp); + printf("converted to %s\n", out); + + glyphs_ucs[input_position] = malloc(3 * sizeof(uint8_t)); + if (glyphs_ucs[input_position] == NULL) + err(EXIT_FAILURE, "malloc() failed\n"); + memcpy(glyphs_ucs[input_position], inp, 3); + glyphs_utf8[input_position] = strdup(out); + input_position++; + + if (input_position == limit) + finish_input(); + + handle_expose(NULL, conn, NULL); + return 1; } int main(int argc, char *argv[]) { - socket_path = getenv("I3SOCK"); - char *pattern = "-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; - int o, option_index = 0; + socket_path = getenv("I3SOCK"); + char *pattern = "-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; + int o, option_index = 0; - static struct option long_options[] = { - {"socket", required_argument, 0, 's'}, - {"version", no_argument, 0, 'v'}, - {"limit", required_argument, 0, 'l'}, - {"prompt", required_argument, 0, 'P'}, - {"prefix", required_argument, 0, 'p'}, - {"font", required_argument, 0, 'f'}, - {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0} - }; + static struct option long_options[] = { + {"socket", required_argument, 0, 's'}, + {"version", no_argument, 0, 'v'}, + {"limit", required_argument, 0, 'l'}, + {"prompt", required_argument, 0, 'P'}, + {"prefix", required_argument, 0, 'p'}, + {"font", required_argument, 0, 'f'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; - char *options_string = "s:p:P:f:l:vh"; + char *options_string = "s:p:P:f:l:vh"; - while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) { - switch (o) { - case 's': - FREE(socket_path); - socket_path = strdup(optarg); - break; - case 'v': - printf("i3-input " I3_VERSION); - return 0; - case 'p': - FREE(command_prefix); - command_prefix = strdup(optarg); - break; - case 'l': - limit = atoi(optarg); - break; - case 'P': - FREE(prompt); - prompt = strdup(optarg); - break; - case 'f': - FREE(pattern); - pattern = strdup(optarg); - break; - case 'h': - printf("i3-input " I3_VERSION); - printf("i3-input [-s ] [-p ] [-l ] [-P ] [-f ] [-v]\n"); - return 0; - } + while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) { + switch (o) { + case 's': + FREE(socket_path); + socket_path = strdup(optarg); + break; + case 'v': + printf("i3-input " I3_VERSION); + return 0; + case 'p': + FREE(command_prefix); + command_prefix = strdup(optarg); + break; + case 'l': + limit = atoi(optarg); + break; + case 'P': + FREE(prompt); + prompt = strdup(optarg); + break; + case 'f': + FREE(pattern); + pattern = strdup(optarg); + break; + case 'h': + printf("i3-input " I3_VERSION); + printf("i3-input [-s ] [-p ] [-l ] [-P ] [-f ] [-v]\n"); + return 0; + } + } + + if (socket_path == NULL) + socket_path = socket_path_from_x11(); + + if (socket_path == NULL) + socket_path = "/tmp/i3-ipc.sock"; + + sockfd = connect_ipc(socket_path); + + if (prompt != NULL) + prompt = convert_utf8_to_ucs2(prompt, &prompt_len); + + int screens; + xcb_connection_t *conn = xcb_connect(NULL, &screens); + if (xcb_connection_has_error(conn)) + die("Cannot open display\n"); + + xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens); + root = root_screen->root; + + modeswitchmask = get_mod_mask(conn, XK_Mode_switch); + numlockmask = get_mod_mask(conn, XK_Num_Lock); + symbols = xcb_key_symbols_alloc(conn); + + uint32_t font_id = get_font_id(conn, pattern, &font_height); + + /* Open an input window */ + win = open_input_window(conn, 500, font_height + 8); + + /* Create pixmap */ + pixmap = xcb_generate_id(conn); + pixmap_gc = xcb_generate_id(conn); + xcb_create_pixmap(conn, root_screen->root_depth, pixmap, win, 500, font_height + 8); + 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); + + /* Create graphics context */ + xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FONT, font_id); + + /* Grab the keyboard to get all input */ + xcb_flush(conn); + + /* Try (repeatedly, if necessary) to grab the keyboard. We might not + * get the keyboard at the first attempt because of the keybinding + * still being active when started via a wm’s keybinding. */ + xcb_grab_keyboard_cookie_t cookie; + xcb_grab_keyboard_reply_t *reply = NULL; + + int count = 0; + while ((reply == NULL || reply->status != XCB_GRAB_STATUS_SUCCESS) && (count++ < 500)) { + cookie = xcb_grab_keyboard(conn, false, win, XCB_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC); + reply = xcb_grab_keyboard_reply(conn, cookie, NULL); + usleep(1000); + } + + if (reply->status != XCB_GRAB_STATUS_SUCCESS) { + fprintf(stderr, "Could not grab keyboard, status = %d\n", reply->status); + exit(-1); + } + + xcb_flush(conn); + + xcb_generic_event_t *event; + while ((event = xcb_wait_for_event(conn)) != NULL) { + if (event->response_type == 0) { + fprintf(stderr, "X11 Error received! sequence %x\n", event->sequence); + continue; } - if (socket_path == NULL) - socket_path = socket_path_from_x11(); + /* Strip off the highest bit (set if the event is generated) */ + int type = (event->response_type & 0x7F); - if (socket_path == NULL) - socket_path = "/tmp/i3-ipc.sock"; + switch (type) { + case XCB_KEY_PRESS: + handle_key_press(NULL, conn, (xcb_key_press_event_t*)event); + break; - sockfd = connect_ipc(socket_path); + case XCB_KEY_RELEASE: + handle_key_release(NULL, conn, (xcb_key_release_event_t*)event); + break; - if (prompt != NULL) - prompt = convert_utf8_to_ucs2(prompt, &prompt_len); - - int screens; - xcb_connection_t *conn = xcb_connect(NULL, &screens); - if (xcb_connection_has_error(conn)) - die("Cannot open display\n"); - - xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens); - root = root_screen->root; - - modeswitchmask = get_mod_mask(conn, XK_Mode_switch); - numlockmask = get_mod_mask(conn, XK_Num_Lock); - symbols = xcb_key_symbols_alloc(conn); - - uint32_t font_id = get_font_id(conn, pattern, &font_height); - - /* Open an input window */ - win = open_input_window(conn, 500, font_height + 8); - - /* Create pixmap */ - pixmap = xcb_generate_id(conn); - pixmap_gc = xcb_generate_id(conn); - xcb_create_pixmap(conn, root_screen->root_depth, pixmap, win, 500, font_height + 8); - 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); - - /* Create graphics context */ - xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FONT, font_id); - - /* Grab the keyboard to get all input */ - xcb_flush(conn); - - /* Try (repeatedly, if necessary) to grab the keyboard. We might not - * get the keyboard at the first attempt because of the keybinding - * still being active when started via a wm’s keybinding. */ - xcb_grab_keyboard_cookie_t cookie; - xcb_grab_keyboard_reply_t *reply = NULL; - - int count = 0; - while ((reply == NULL || reply->status != XCB_GRAB_STATUS_SUCCESS) && (count++ < 500)) { - cookie = xcb_grab_keyboard(conn, false, win, XCB_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC); - reply = xcb_grab_keyboard_reply(conn, cookie, NULL); - usleep(1000); + case XCB_EXPOSE: + handle_expose(NULL, conn, (xcb_expose_event_t*)event); + break; } - if (reply->status != XCB_GRAB_STATUS_SUCCESS) { - fprintf(stderr, "Could not grab keyboard, status = %d\n", reply->status); - exit(-1); - } + free(event); + } - xcb_flush(conn); - - xcb_generic_event_t *event; - while ((event = xcb_wait_for_event(conn)) != NULL) { - if (event->response_type == 0) { - fprintf(stderr, "X11 Error received! sequence %x\n", event->sequence); - continue; - } - - /* Strip off the highest bit (set if the event is generated) */ - int type = (event->response_type & 0x7F); - - switch (type) { - case XCB_KEY_PRESS: - handle_key_press(NULL, conn, (xcb_key_press_event_t*)event); - break; - - case XCB_KEY_RELEASE: - handle_key_release(NULL, conn, (xcb_key_release_event_t*)event); - break; - - case XCB_EXPOSE: - handle_expose(NULL, conn, (xcb_expose_event_t*)event); - break; - } - - free(event); - } - - return 0; + return 0; } From fddee471e81308f01f18360d9a839f2897125636 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 18 Sep 2011 13:21:45 +0100 Subject: [PATCH 2/4] i3-input: add missing \n in --help --- i3-input/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i3-input/main.c b/i3-input/main.c index ccc56a5d..1c2c4caa 100644 --- a/i3-input/main.c +++ b/i3-input/main.c @@ -322,7 +322,7 @@ int main(int argc, char *argv[]) { pattern = strdup(optarg); break; case 'h': - printf("i3-input " I3_VERSION); + printf("i3-input " I3_VERSION "\n"); printf("i3-input [-s ] [-p ] [-l ] [-P ] [-f ] [-v]\n"); return 0; } From 1737a78fcd8025e11398dbcf5acd65c6a07ae86d Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 18 Sep 2011 13:51:11 +0100 Subject: [PATCH 3/4] i3-input: implement -F (format) option, deprecate -p (prefix) This introduces the '-F format' parameter, which takes a format and replaces %s in it with the user input. An example: The user should enter the target workspace name. The appropriate i3-input invocation looks like this: i3-input -F 'workspace "%s"' -P 'Switch to workspace: ' --- i3-input/main.c | 69 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 14 deletions(-) diff --git a/i3-input/main.c b/i3-input/main.c index 1c2c4caa..7e1a18ff 100644 --- a/i3-input/main.c +++ b/i3-input/main.c @@ -35,6 +35,10 @@ #include "i3-input.h" +/* IPC format string. %s will be replaced with what the user entered, then + * the command will be sent to i3 */ +static char *format; + static char *socket_path; static int sockfd; static xcb_key_symbols_t *symbols; @@ -48,7 +52,6 @@ static char *glyphs_ucs[512]; static char *glyphs_utf8[512]; static int input_position; static int font_height; -static char *command_prefix; static char *prompt; static int prompt_len; static int limit; @@ -172,16 +175,41 @@ static int handle_key_release(void *ignored, xcb_connection_t *conn, xcb_key_rel } static void finish_input() { - uint8_t *command = concat_strings(glyphs_utf8, input_position); - char *full_command = (char*)command; - /* prefix the command if a prefix was specified on commandline */ - if (command_prefix != NULL) { - if (asprintf(&full_command, "%s%s", command_prefix, command) == -1) - err(EXIT_FAILURE, "asprintf() failed\n"); - } - printf("command = %s\n", full_command); + char *command = (char*)concat_strings(glyphs_utf8, input_position); - ipc_send_message(sockfd, strlen(full_command), 0, (uint8_t*)full_command); + /* count the occurences of %s in the string */ + int c; + int len = strlen(format); + int cnt = 0; + for (c = 0; c < (len-1); c++) + if (format[c] == '%' && format[c+1] == 's') + cnt++; + printf("occurences = %d\n", cnt); + + /* allocate space for the output */ + int inputlen = strlen(command); + char *full = calloc(1, + strlen(format) - (2 * cnt) /* format without all %s */ + + (inputlen * cnt) /* replaced %s */ + + 1); /* trailing NUL */ + char *dest = full; + for (c = 0; c < len; c++) { + /* if this is not % or it is % but without a following 's', + * just copy the character */ + if (format[c] != '%' || (c == (len-1)) || format[c+1] != 's') + *(dest++) = format[c]; + else { + strncat(dest, command, inputlen); + dest += inputlen; + /* skip the following 's' of '%s' */ + c++; + } + } + + /* prefix the command if a prefix was specified on commandline */ + printf("command = %s\n", full); + + ipc_send_message(sockfd, strlen(full), 0, (uint8_t*)full); #if 0 free(command); @@ -280,6 +308,7 @@ static int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press } int main(int argc, char *argv[]) { + format = strdup("%s"); socket_path = getenv("I3SOCK"); char *pattern = "-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; int o, option_index = 0; @@ -290,12 +319,13 @@ int main(int argc, char *argv[]) { {"limit", required_argument, 0, 'l'}, {"prompt", required_argument, 0, 'P'}, {"prefix", required_argument, 0, 'p'}, + {"format", required_argument, 0, 'F'}, {"font", required_argument, 0, 'f'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; - char *options_string = "s:p:P:f:l:vh"; + char *options_string = "s:p:P:f:l:F:vh"; while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) { switch (o) { @@ -307,8 +337,10 @@ int main(int argc, char *argv[]) { printf("i3-input " I3_VERSION); return 0; case 'p': - FREE(command_prefix); - command_prefix = strdup(optarg); + /* This option is deprecated, but will still work in i3 v4.1, 4.2 and 4.3 */ + fprintf(stderr, "i3-input: WARNING: the -p option is DEPRECATED in favor of the -F (format) option\n"); + FREE(format); + asprintf(&format, "%s%%s", optarg); break; case 'l': limit = atoi(optarg); @@ -321,13 +353,22 @@ int main(int argc, char *argv[]) { FREE(pattern); pattern = strdup(optarg); break; + case 'F': + FREE(format); + format = strdup(optarg); + break; case 'h': printf("i3-input " I3_VERSION "\n"); - printf("i3-input [-s ] [-p ] [-l ] [-P ] [-f ] [-v]\n"); + printf("i3-input [-s ] [-F ] [-l ] [-P ] [-f ] [-v]\n"); + printf("\n"); + printf("Example:\n"); + printf(" i3-input -F 'workspace \"%%s\"' -P 'Switch to workspace: '\n"); return 0; } } + printf("using format \"%s\"\n", format); + if (socket_path == NULL) socket_path = socket_path_from_x11(); From 12e096cf73222708406c74ccadc33b90f9f41f1c Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 18 Sep 2011 13:57:39 +0100 Subject: [PATCH 4/4] i3-input: update manpage --- man/i3-input.man | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/man/i3-input.man b/man/i3-input.man index cd85c92c..df7c4d9c 100644 --- a/man/i3-input.man +++ b/man/i3-input.man @@ -1,7 +1,7 @@ i3-input(1) ========= Michael Stapelberg -v3.delta, November 2009 +v4.1, September 2011 == NAME @@ -9,7 +9,7 @@ i3-input - interactively take a command for i3 window manager == SYNOPSIS -i3-input [-s ] [-p ] [-l ] [-P ] [-f ] [-v] +i3-input [-s ] [-F ] [-l ] [-P ] [-f ] [-v] == DESCRIPTION @@ -17,19 +17,28 @@ i3-input is a tool to take commands (or parts of a command) composed by the user, and send it/them to i3. This is useful, for example, for the mark/goto command. +The -F option takes a format string. In this string, every occurence of %s is +replaced by the user input. + == EXAMPLE ------------------------------------------------ -i3-input -p 'mark ' -l 1 -P 'Mark: ' +i3-input -F 'mark %s' -l 1 -P 'Mark: ' ------------------------------------------------ == ENVIRONMENT === I3SOCK -If no ipc-socket is specified on the commandline, this variable is used -to determine the path, at wich the unix domain socket is expected, on which -to connect to i3. +i3-input handles the different sources of socket paths in the following order: + +* I3SOCK environment variable +* I3SOCK gets overwritten by the -s parameter, if specified +* if neither are available, i3-input reads the socket path from the X11 + property, which is the recommended way +* if everything fails, i3-input tries +/tmp/i3-ipc.sock+ + +The socket path is necessary to connect to i3 and actually issue the command. == SEE ALSO