applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More error checking, bugfix for mplayer (use visual CopyFromParent)

Browse Source
This commit is contained in:
Michael Stapelberg 2009-02-14 03:46:20 +01:00
parent fb4c851e2a
commit 031cf4ccda
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/layout.c
View File

@ -145,7 +145,6 @@ static void render_container(xcb_connection_t *connection, Container *container)
xcb_configure_window(connection, client->child, mask, values); xcb_configure_window(connection, client->child, mask, values);
} }
decorate_window(connection, client);
current_client++; current_client++;
} }
} else { } else {

5
src/mainx.c
View File

@ -162,7 +162,7 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
i3Font *font = load_font(conn, pattern); i3Font *font = load_font(conn, pattern);
/* Yo dawg, I heard you like windows, so I create a window around your window… */ /* Yo dawg, I heard you like windows, so I create a window around your window… */
xcb_create_window(conn, xcb_void_cookie_t cookie = xcb_create_window_checked(conn,
depth, depth,
new->frame, new->frame,
root, root,
@ -172,9 +172,10 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
height + 2 + 2 + font->height, /* 2 px border plus font’s height */ height + 2 + 2 + font->height, /* 2 px border plus font’s height */
0, /* border_width = 0, we draw our own borders */ 0, /* border_width = 0, we draw our own borders */
XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_WINDOW_CLASS_INPUT_OUTPUT,
visual, XCB_WINDOW_CLASS_COPY_FROM_PARENT,
mask, mask,
values); values);
check_error(conn, cookie, "Could not create frame");
xcb_change_save_set(conn, XCB_SET_MODE_INSERT, child); xcb_change_save_set(conn, XCB_SET_MODE_INSERT, child);
/* Map the window on the screen (= make it visible) */ /* Map the window on the screen (= make it visible) */

14
src/xcb.c
View File

@ -14,6 +14,7 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
/* All the helper functions needed for efficiently using XCB */ /* All the helper functions needed for efficiently using XCB */
#include "util.h"
/* /*
* Returns the colorpixel to use for the given hex color (think of HTML). * Returns the colorpixel to use for the given hex color (think of HTML).
@ -25,6 +26,7 @@
* *
*/ */
uint32_t get_colorpixel(xcb_connection_t *conn, xcb_window_t window, char *hex) { uint32_t get_colorpixel(xcb_connection_t *conn, xcb_window_t window, char *hex) {
/* TODO: We need to store the colorpixels per child to remove these unnecessary requests every time */
#define RGB_8_TO_16(i) (65535 * ((i) & 0xFF) / 255) #define RGB_8_TO_16(i) (65535 * ((i) & 0xFF) / 255)
char strgroups[3][3] = {{hex[1], hex[2], '\0'}, char strgroups[3][3] = {{hex[1], hex[2], '\0'},
{hex[3], hex[4], '\0'}, {hex[3], hex[4], '\0'},
@ -35,18 +37,20 @@ uint32_t get_colorpixel(xcb_connection_t *conn, xcb_window_t window, char *hex)
xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
xcb_colormap_t colormapId = xcb_generate_id(conn); xcb_colormap_t colormap_id = xcb_generate_id(conn);
xcb_create_colormap(conn, XCB_COLORMAP_ALLOC_NONE, colormapId, window, root_screen->root_visual); xcb_void_cookie_t cookie = xcb_create_colormap_checked(conn, XCB_COLORMAP_ALLOC_NONE,
colormap_id, window, root_screen->root_visual);
check_error(conn, cookie, "Could not create colormap");
xcb_alloc_color_reply_t *reply = xcb_alloc_color_reply(conn, xcb_alloc_color_reply_t *reply = xcb_alloc_color_reply(conn,
xcb_alloc_color(conn, colormapId, rgb16[0], rgb16[1], rgb16[2]), NULL); xcb_alloc_color(conn, colormap_id, rgb16[0], rgb16[1], rgb16[2]), NULL);
if (!reply) { if (!reply) {
printf("color fail\n"); printf("Could not allocate color\n");
exit(1); exit(1);
} }
uint32_t pixel = reply->pixel; uint32_t pixel = reply->pixel;
free(reply); free(reply);
xcb_free_colormap(conn, colormapId); xcb_free_colormap(conn, colormap_id);
return pixel; return pixel;
} }