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;
/*
* 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, 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++;
sockfd = ipc_connect(socket_path);
if (prompt != NULL)
- prompt_offset = predict_text_width((char *)i3string_as_ucs2(prompt), i3string_get_num_glyphs(prompt), true);
+ prompt_offset = predict_text_width(prompt);
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);
+ root_screen = xcb_aux_get_screen(conn, screens);
root = root_screen->root;
symbols = xcb_key_symbols_alloc(conn);