* to i3.
*
*/
-#include <ev.h>
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
static xcb_window_t win;
static xcb_pixmap_t pixmap;
static xcb_gcontext_t pixmap_gc;
-static char *glyphs_ucs[512];
+static xcb_char2b_t glyphs_ucs[512];
static char *glyphs_utf8[512];
static int input_position;
static i3Font font;
static int limit;
xcb_window_t root;
xcb_connection_t *conn;
+xcb_screen_t *root_screen;
+static xcb_get_input_focus_cookie_t focus_cookie;
+
+/*
+ * Having verboselog() and errorlog() is necessary when using libi3.
+ *
+ */
+void verboselog(char *fmt, ...) {
+ va_list args;
+
+ va_start(args, fmt);
+ vfprintf(stdout, fmt, args);
+ va_end(args);
+}
+
+void errorlog(char *fmt, ...) {
+ va_list args;
+
+ va_start(args, fmt);
+ vfprintf(stderr, fmt, args);
+ va_end(args);
+}
/*
* Concats the glyphs (either UCS-2 or UTF-8) to a single string, suitable for
/* draw the prompt … */
if (prompt != NULL) {
- draw_text((char *)i3string_as_ucs2(prompt), i3string_get_num_glyphs(prompt), true, pixmap, pixmap_gc, 4, 4, 492);
+ draw_text(prompt, pixmap, pixmap_gc, 4, 4, 492);
}
/* … and the text */
if (input_position > 0)
{
- char *full_text = (char *)concat_strings(glyphs_ucs, input_position);
- draw_text(full_text, input_position, true, pixmap, pixmap_gc, 4, 4 + prompt_offset, 492 - prompt_offset);
- free(full_text);
+ i3String *input = i3string_from_ucs2(glyphs_ucs, input_position);
+ draw_text(input, pixmap, pixmap_gc, prompt_offset + 4, 4, 492);
+ i3string_free(input);
}
/* Copy the contents of the pixmap to the real window */
return 1;
input_position--;
- free(glyphs_ucs[input_position]);
free(glyphs_utf8[input_position]);
handle_expose(NULL, conn, NULL);
return 1;
}
- /* store the UCS into a string */
- uint8_t inp[3] = {(ucs & 0xFF00) >> 8, (ucs & 0xFF), 0};
+ xcb_char2b_t inp;
+ inp.byte1 = ( ucs & 0xff00 ) >> 2;
+ inp.byte2 = ( ucs & 0x00ff ) >> 0;
- printf("inp[0] = %02x, inp[1] = %02x, inp[2] = %02x\n", inp[0], inp[1], inp[2]);
+ printf("inp.byte1 = %02x, inp.byte2 = %02x\n", inp.byte1, inp.byte2);
/* convert it to UTF-8 */
- char *out = convert_ucs2_to_utf8((xcb_char2b_t*)inp, 1);
+ char *out = convert_ucs2_to_utf8(&inp, 1);
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_ucs[input_position] = inp;
glyphs_utf8[input_position] = out;
input_position++;
return 1;
}
+/*
+ * Restores the X11 input focus to whereever it was before.
+ * This is necessary because i3-input’s window has override_redirect=1
+ * (→ unmanaged by the window manager) and thus i3-input changes focus itself.
+ * This function is called on exit().
+ *
+ */
+static void restore_input_focus(void) {
+ xcb_generic_error_t *error;
+ xcb_get_input_focus_reply_t *reply = xcb_get_input_focus_reply(conn, focus_cookie, &error);
+ if (error != NULL) {
+ fprintf(stderr, "[i3-input] ERROR: Could not restore input focus (X error %d)\n", error->error_code);
+ return;
+ }
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, reply->focus, XCB_CURRENT_TIME);
+ xcb_flush(conn);
+}
+
int main(int argc, char *argv[]) {
format = strdup("%s");
socket_path = getenv("I3SOCK");
sockfd = ipc_connect(socket_path);
- if (prompt != NULL)
- prompt_offset = predict_text_width((char *)i3string_as_ucs2(prompt), i3string_get_num_glyphs(prompt), true);
-
int screens;
conn = xcb_connect(NULL, &screens);
if (!conn || xcb_connection_has_error(conn))
die("Cannot open display\n");
- xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens);
+ /* Request the current InputFocus to restore when i3-input exits. */
+ focus_cookie = xcb_get_input_focus(conn);
+
+ root_screen = xcb_aux_get_screen(conn, screens);
root = root_screen->root;
symbols = xcb_key_symbols_alloc(conn);
font = load_font(pattern, true);
set_font(&font);
+ if (prompt != NULL)
+ prompt_offset = predict_text_width(prompt);
+
/* Open an input window */
win = xcb_generate_id(conn);
xcb_create_window(
/* 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);
+ atexit(restore_input_focus);
/* Grab the keyboard to get all input */
xcb_flush(conn);