X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fxcb.c;h=5dda5ccee1bc6d940842af8100fb04209923ff03;hb=fa93f275bb03462e6d236fd50da0b96ddbd690da;hp=48906a26148145ffe3cbaa62ad2ef87b97bc20a9;hpb=f2b73b64beee5831a5def220a951fe8e90fca195;p=i3%2Fi3 diff --git a/src/xcb.c b/src/xcb.c index 48906a26..5dda5cce 100644 --- a/src/xcb.c +++ b/src/xcb.c @@ -1,3 +1,5 @@ +#undef I3__FILE__ +#define I3__FILE__ "xcb.c" /* * vim:ts=4:sw=4:expandtab * @@ -16,23 +18,28 @@ unsigned int xcb_numlock_mask; * for errors. * */ -xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_class, - enum xcursor_cursor_t cursor, bool map, uint32_t mask, uint32_t *values) { +xcb_window_t create_window(xcb_connection_t *conn, Rect dims, + uint16_t depth, xcb_visualid_t visual, uint16_t window_class, + enum xcursor_cursor_t cursor, bool map, uint32_t mask, uint32_t *values) { xcb_window_t result = xcb_generate_id(conn); - /* If the window class is XCB_WINDOW_CLASS_INPUT_ONLY, depth has to be 0 */ - uint16_t depth = (window_class == XCB_WINDOW_CLASS_INPUT_ONLY ? 0 : XCB_COPY_FROM_PARENT); + /* If the window class is XCB_WINDOW_CLASS_INPUT_ONLY, we copy depth and + * visual id from the parent window. */ + if (window_class == XCB_WINDOW_CLASS_INPUT_ONLY) { + depth = XCB_COPY_FROM_PARENT; + visual = XCB_COPY_FROM_PARENT; + } xcb_create_window(conn, - depth, - result, /* the window id */ - root, /* parent == root */ - dims.x, dims.y, dims.width, dims.height, /* dimensions */ - 0, /* border = 0, we draw our own */ - window_class, - XCB_WINDOW_CLASS_COPY_FROM_PARENT, /* copy visual from parent */ - mask, - values); + depth, + result, /* the window id */ + root, /* parent == root */ + dims.x, dims.y, dims.width, dims.height, /* dimensions */ + 0, /* border = 0, we draw our own */ + window_class, + visual, + mask, + values); /* Set the cursor */ if (xcursor_supported) { @@ -43,8 +50,9 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_cl xcb_cursor_t cursor_id = xcb_generate_id(conn); i3Font cursor_font = load_font("cursor", false); int xcb_cursor = xcursor_get_xcb_cursor(cursor); - xcb_create_glyph_cursor(conn, cursor_id, cursor_font.id, cursor_font.id, - xcb_cursor, xcb_cursor + 1, 0, 0, 0, 65535, 65535, 65535); + xcb_create_glyph_cursor(conn, cursor_id, cursor_font.specific.xcb.id, + cursor_font.specific.xcb.id, xcb_cursor, xcb_cursor + 1, 0, 0, 0, + 65535, 65535, 65535); xcb_change_window_attributes(conn, result, XCB_CW_CURSOR, &cursor_id); xcb_free_cursor(conn, cursor_id); } @@ -62,9 +70,9 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_cl */ void xcb_draw_line(xcb_connection_t *conn, xcb_drawable_t drawable, xcb_gcontext_t gc, uint32_t colorpixel, uint32_t x, uint32_t y, uint32_t to_x, uint32_t to_y) { - xcb_change_gc(conn, gc, XCB_GC_FOREGROUND, (uint32_t[]){ colorpixel }); + xcb_change_gc(conn, gc, XCB_GC_FOREGROUND, (uint32_t[]){colorpixel}); xcb_poly_line(conn, XCB_COORD_MODE_ORIGIN, drawable, gc, 2, - (xcb_point_t[]) { {x, y}, {to_x, to_y} }); + (xcb_point_t[]){{x, y}, {to_x, to_y}}); } /* @@ -73,7 +81,7 @@ void xcb_draw_line(xcb_connection_t *conn, xcb_drawable_t drawable, xcb_gcontext */ void xcb_draw_rect(xcb_connection_t *conn, xcb_drawable_t drawable, xcb_gcontext_t gc, uint32_t colorpixel, uint32_t x, uint32_t y, uint32_t width, uint32_t height) { - xcb_change_gc(conn, gc, XCB_GC_FOREGROUND, (uint32_t[]){ colorpixel }); + xcb_change_gc(conn, gc, XCB_GC_FOREGROUND, (uint32_t[]){colorpixel}); xcb_rectangle_t rect = {x, y, width, height}; xcb_poly_fill_rectangle(conn, drawable, gc, 1, &rect); } @@ -102,7 +110,7 @@ void fake_absolute_configure_notify(Con *con) { * Sends the WM_TAKE_FOCUS ClientMessage to the given window * */ -void send_take_focus(xcb_window_t window) { +void send_take_focus(xcb_window_t window, xcb_timestamp_t timestamp) { /* Every X11 event is 32 bytes long. Therefore, XCB will copy 32 bytes. * In order to properly initialize these bytes, we allocate 32 bytes even * though we only need less for an xcb_configure_notify_event_t */ @@ -114,10 +122,10 @@ void send_take_focus(xcb_window_t window) { ev->type = A_WM_PROTOCOLS; ev->format = 32; ev->data.data32[0] = A_WM_TAKE_FOCUS; - ev->data.data32[1] = XCB_CURRENT_TIME; + ev->data.data32[1] = timestamp; DLOG("Sending WM_TAKE_FOCUS to the client\n"); - xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev); + xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char *)ev); free(event); } @@ -126,7 +134,7 @@ void send_take_focus(xcb_window_t window) { * */ void xcb_raise_window(xcb_connection_t *conn, xcb_window_t window) { - uint32_t values[] = { XCB_STACK_MODE_ABOVE }; + uint32_t values[] = {XCB_STACK_MODE_ABOVE}; xcb_configure_window(conn, window, XCB_CONFIG_WINDOW_STACK_MODE, values); } @@ -137,11 +145,11 @@ void xcb_raise_window(xcb_connection_t *conn, xcb_window_t window) { void xcb_set_window_rect(xcb_connection_t *conn, xcb_window_t window, Rect r) { xcb_void_cookie_t cookie; cookie = xcb_configure_window(conn, window, - XCB_CONFIG_WINDOW_X | - XCB_CONFIG_WINDOW_Y | - XCB_CONFIG_WINDOW_WIDTH | - XCB_CONFIG_WINDOW_HEIGHT, - &(r.x)); + XCB_CONFIG_WINDOW_X | + XCB_CONFIG_WINDOW_Y | + XCB_CONFIG_WINDOW_WIDTH | + XCB_CONFIG_WINDOW_HEIGHT, + &(r.x)); /* ignore events which are generated because we configured a window */ add_ignore_event(cookie.sequence, -1); } @@ -163,7 +171,6 @@ bool xcb_reply_contains_atom(xcb_get_property_reply_t *prop, xcb_atom_t atom) { return true; return false; - } /** @@ -188,9 +195,53 @@ void xcb_set_root_cursor(int cursor) { xcb_cursor_t cursor_id = xcb_generate_id(conn); i3Font cursor_font = load_font("cursor", false); int xcb_cursor = xcursor_get_xcb_cursor(cursor); - xcb_create_glyph_cursor(conn, cursor_id, cursor_font.id, cursor_font.id, - xcb_cursor, xcb_cursor + 1, 0, 0, 0, 65535, 65535, 65535); + xcb_create_glyph_cursor(conn, cursor_id, cursor_font.specific.xcb.id, + cursor_font.specific.xcb.id, xcb_cursor, xcb_cursor + 1, 0, 0, 0, + 65535, 65535, 65535); xcb_change_window_attributes(conn, root, XCB_CW_CURSOR, &cursor_id); xcb_free_cursor(conn, cursor_id); xcb_flush(conn); } + +/* + * Get depth of visual specified by visualid + * + */ +uint16_t get_visual_depth(xcb_visualid_t visual_id) { + xcb_depth_iterator_t depth_iter; + + depth_iter = xcb_screen_allowed_depths_iterator(root_screen); + for (; depth_iter.rem; xcb_depth_next(&depth_iter)) { + xcb_visualtype_iterator_t visual_iter; + + visual_iter = xcb_depth_visuals_iterator(depth_iter.data); + for (; visual_iter.rem; xcb_visualtype_next(&visual_iter)) { + if (visual_id == visual_iter.data->visual_id) { + return depth_iter.data->depth; + } + } + } + return 0; +} + +/* + * Get visualid with specified depth + * + */ +xcb_visualid_t get_visualid_by_depth(uint16_t depth) { + xcb_depth_iterator_t depth_iter; + + depth_iter = xcb_screen_allowed_depths_iterator(root_screen); + for (; depth_iter.rem; xcb_depth_next(&depth_iter)) { + if (depth_iter.data->depth != depth) + continue; + + xcb_visualtype_iterator_t visual_iter; + + visual_iter = xcb_depth_visuals_iterator(depth_iter.data); + if (!visual_iter.rem) + continue; + return visual_iter.data->visual_id; + } + return 0; +}