nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't leak the cursor_id. 

Fixes a server-side leak. The cursor_id is not needed when we're
using themed cursors (we never freed it either).
This commit is contained in:
Fernando Tarlá Cardoso Lemos 2011-07-28 20:40:05 -03:00 committed by Michael Stapelberg
parent 7a18dcc89e
commit ae9c90ba19
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xcb.c
View File

@ -93,7 +93,6 @@ uint32_t get_colorpixel(char *hex) {
xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_class, 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) { enum xcursor_cursor_t cursor, bool map, uint32_t mask, uint32_t *values) {
xcb_window_t result = xcb_generate_id(conn); xcb_window_t result = xcb_generate_id(conn);
xcb_cursor_t cursor_id = xcb_generate_id(conn);
/* If the window class is XCB_WINDOW_CLASS_INPUT_ONLY, depth has to be 0 */ /* 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); uint16_t depth = (window_class == XCB_WINDOW_CLASS_INPUT_ONLY ? 0 : XCB_COPY_FROM_PARENT);
@ -115,6 +114,7 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_cl
values[0] = xcursor_get_cursor(cursor); values[0] = xcursor_get_cursor(cursor);
xcb_change_window_attributes(conn, result, mask, values); xcb_change_window_attributes(conn, result, mask, values);
} else { } else {
xcb_cursor_t cursor_id = xcb_generate_id(conn);
i3Font cursor_font = load_font("cursor", false); i3Font cursor_font = load_font("cursor", false);
int xcb_cursor = xcursor_get_xcb_cursor(cursor); int xcb_cursor = xcursor_get_xcb_cursor(cursor);
xcb_create_glyph_cursor(conn, cursor_id, cursor_font.id, cursor_font.id, xcb_create_glyph_cursor(conn, cursor_id, cursor_font.id, cursor_font.id,