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

A few style fixes for the previous commit

This commit is contained in:
Michael Stapelberg 2012-03-26 17:00:35 +02:00
parent 9d68d780e2
commit e19c7b7bae
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/xcb.h
View File

@ -2,7 +2,7 @@
* vim:ts=4:sw=4:expandtab * vim:ts=4:sw=4:expandtab
* *
* i3 - an improved dynamic tiling window manager * i3 - an improved dynamic tiling window manager
* © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
* *
* xcb.c: Helper functions for easier usage of XCB * xcb.c: Helper functions for easier usage of XCB
* *
@ -117,8 +117,16 @@ void xcb_warp_pointer_rect(xcb_connection_t *conn, Rect *rect);
*/ */
void xcb_set_root_cursor(int cursor); void xcb_set_root_cursor(int cursor);
/**
* Get depth of visual specified by visualid
*
*/
uint16_t get_visual_depth(xcb_visualid_t visual_id); uint16_t get_visual_depth(xcb_visualid_t visual_id);
/**
* Get visualid with specified depth
*
*/
xcb_visualid_t get_visualid_by_depth(uint16_t depth); xcb_visualid_t get_visualid_by_depth(uint16_t depth);
#endif #endif

21
src/x.c
View File

@ -92,16 +92,19 @@ void x_con_init(Con *con, uint16_t depth) {
uint32_t mask = 0; uint32_t mask = 0;
uint32_t values[5]; uint32_t values[5];
xcb_visualid_t visual = XCB_COPY_FROM_PARENT;
xcb_colormap_t win_colormap = XCB_NONE;
if (depth != root_depth && depth != XCB_COPY_FROM_PARENT) {
/* For custom visuals, we need to create a colormap before creating
* this window. It will be freed directly after creating the window. */
visual = get_visualid_by_depth(depth);
win_colormap = xcb_generate_id(conn);
xcb_create_colormap_checked(conn, XCB_COLORMAP_ALLOC_NONE, win_colormap, root, visual);
/* We explicitly set a background color and border color (even though we /* We explicitly set a background color and border color (even though we
* don’t even have a border) because the X11 server requires us to when * don’t even have a border) because the X11 server requires us to when
* using 32 bit color depths, see * using 32 bit color depths, see
* http://stackoverflow.com/questions/3645632 */ * http://stackoverflow.com/questions/3645632 */
xcb_visualid_t visual = XCB_COPY_FROM_PARENT;
if (depth != root_depth && depth != XCB_COPY_FROM_PARENT) {
visual = get_visualid_by_depth(depth);
xcb_colormap_t win_colormap = xcb_generate_id(conn);
xcb_create_colormap_checked(conn, XCB_COLORMAP_ALLOC_NONE, win_colormap, root, visual);
mask |= XCB_CW_BACK_PIXEL; mask |= XCB_CW_BACK_PIXEL;
values[0] = root_screen->black_pixel; values[0] = root_screen->black_pixel;
@ -119,9 +122,11 @@ void x_con_init(Con *con, uint16_t depth) {
mask |= XCB_CW_COLORMAP; mask |= XCB_CW_COLORMAP;
values[4] = win_colormap; values[4] = win_colormap;
} else { } else {
/* our own frames should not be managed */
mask = XCB_CW_OVERRIDE_REDIRECT; mask = XCB_CW_OVERRIDE_REDIRECT;
values[0] = 1; values[0] = 1;
/* see include/xcb.h for the FRAME_EVENT_MASK */
mask |= XCB_CW_EVENT_MASK; mask |= XCB_CW_EVENT_MASK;
values[1] = FRAME_EVENT_MASK & ~XCB_EVENT_MASK_ENTER_WINDOW; values[1] = FRAME_EVENT_MASK & ~XCB_EVENT_MASK_ENTER_WINDOW;
@ -132,8 +137,8 @@ void x_con_init(Con *con, uint16_t depth) {
Rect dims = { -15, -15, 10, 10 }; Rect dims = { -15, -15, 10, 10 };
con->frame = create_window(conn, dims, depth, visual, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCURSOR_CURSOR_POINTER, false, mask, values); con->frame = create_window(conn, dims, depth, visual, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCURSOR_CURSOR_POINTER, false, mask, values);
if (depth != root_depth && depth != XCB_COPY_FROM_PARENT) if (win_colormap != XCB_NONE)
xcb_free_colormap(conn, values[4]); xcb_free_colormap(conn, win_colormap);
struct con_state *state = scalloc(sizeof(struct con_state)); struct con_state *state = scalloc(sizeof(struct con_state));
state->id = con->frame; state->id = con->frame;