*
* i3 - an improved dynamic tiling window manager
*
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
*
* See file LICENSE for license information.
*
#include "i3.h"
#include "util.h"
#include "xcb.h"
+#include "log.h"
TAILQ_HEAD(cached_fonts_head, Font) cached_fonts = TAILQ_HEAD_INITIALIZER(cached_fonts);
unsigned int xcb_numlock_mask;
*
*/
xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_class, int cursor,
- uint32_t mask, uint32_t *values) {
+ bool map, uint32_t mask, uint32_t *values) {
xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
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 */
uint16_t depth = (window_class == XCB_WINDOW_CLASS_INPUT_ONLY ? 0 : XCB_COPY_FROM_PARENT);
- /* Use the default cursor (left pointer) */
- if (cursor > -1) {
- i3Font *cursor_font = load_font(conn, "cursor");
- xcb_create_glyph_cursor(conn, cursor_id, cursor_font->id, cursor_font->id,
- XCB_CURSOR_LEFT_PTR, XCB_CURSOR_LEFT_PTR + 1,
- 0, 0, 0, 65535, 65535, 65535);
- }
-
xcb_create_window(conn,
depth,
result, /* the window id */
mask,
values);
- if (cursor > -1)
- xcb_change_window_attributes(conn, result, XCB_CW_CURSOR, &cursor_id);
+ /* Set the cursor */
+ i3Font *cursor_font = load_font(conn, "cursor");
+ xcb_create_glyph_cursor(conn, cursor_id, cursor_font->id, cursor_font->id,
+ (cursor == -1 ? XCB_CURSOR_LEFT_PTR : cursor),
+ (cursor == -1 ? XCB_CURSOR_LEFT_PTR : 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);
/* Map the window (= make it visible) */
- xcb_map_window(conn, result);
+ if (map)
+ xcb_map_window(conn, result);
return result;
}
xcb_send_event(conn, false, window, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char*)&generated_event);
xcb_flush(conn);
-
- LOG("Told the client it is at %dx%d with %dx%d\n", r.x, r.y, r.width, r.height);
}
/*
absolute.x = client->rect.x + client->child_rect.x;
absolute.y = client->rect.y + client->child_rect.y;
- absolute.width = client->rect.width - (2 * client->child_rect.x);
- absolute.height = client->rect.height - client->child_rect.y - 1;
+ absolute.width = client->child_rect.width;
+ absolute.height = client->child_rect.height;
fake_configure_notify(conn, absolute, client->child);
}
#else
/* For now, we only use the first keysymbol. */
xcb_keycode_t *numlock_syms = xcb_key_symbols_get_keycode(keysyms, XCB_NUM_LOCK);
+ if (numlock_syms == NULL)
+ return;
xcb_keycode_t numlock = *numlock_syms;
free(numlock_syms);
#endif
*
*/
void cached_pixmap_prepare(xcb_connection_t *conn, struct Cached_Pixmap *pixmap) {
- LOG("preparing pixmap\n");
+ DLOG("preparing pixmap\n");
/* If the Rect did not change, the pixmap does not need to be recreated */
if (memcmp(&(pixmap->rect), pixmap->referred_rect, sizeof(Rect)) == 0)
memcpy(&(pixmap->rect), pixmap->referred_rect, sizeof(Rect));
if (pixmap->id == 0 || pixmap->gc == 0) {
- LOG("Creating new pixmap...\n");
+ DLOG("Creating new pixmap...\n");
pixmap->id = xcb_generate_id(conn);
pixmap->gc = xcb_generate_id(conn);
} else {
- LOG("Re-creating this pixmap...\n");
+ DLOG("Re-creating this pixmap...\n");
xcb_free_gc(conn, pixmap->gc);
xcb_free_pixmap(conn, pixmap->id);
}
}
/*
- * Returns the xcb_charinfo_t for the given character (specified by row and
- * column in the lookup table) if existing, otherwise the minimum bounds.
- *
- */
-static xcb_charinfo_t *get_charinfo(int col, int row, xcb_query_font_reply_t *font_info,
- xcb_charinfo_t *table, bool dont_fallback) {
- xcb_charinfo_t *result;
-
- /* Bounds checking */
- if (row < font_info->min_byte1 || row > font_info->max_byte1 ||
- col < font_info->min_char_or_byte2 || col > font_info->max_char_or_byte2)
- return NULL;
-
- /* If we don’t have a table to lookup the infos per character, return the
- * minimum bounds */
- if (table == NULL)
- return &font_info->min_bounds;
-
- result = &table[((row - font_info->min_byte1) *
- (font_info->max_char_or_byte2 - font_info->min_char_or_byte2 + 1)) +
- (col - font_info->min_char_or_byte2)];
-
- /* If the character has an entry in the table, return it */
- if (result->character_width != 0 ||
- (result->right_side_bearing |
- result->left_side_bearing |
- result->ascent |
- result->descent) != 0)
- return result;
-
- /* Otherwise, get the default character and return its charinfo */
- if (dont_fallback)
- return NULL;
-
- return get_charinfo((font_info->default_char >> 8),
- (font_info->default_char & 0xFF),
- font_info,
- table,
- true);
-}
-
-/*
- * Calculate the width of the given text (16-bit characters, UCS) with given
- * real length (amount of glyphs) using the given font.
+ * Query the width of the given text (16-bit characters, UCS) with given real
+ * length (amount of glyphs) using the given font.
*
*/
-int predict_text_width(xcb_connection_t *conn, char *font_pattern, char *text, int length) {
- xcb_query_font_reply_t *font_info;
- xcb_charinfo_t *table;
- int i, width;
+int predict_text_width(xcb_connection_t *conn, const char *font_pattern, char *text, int length) {
i3Font *font = load_font(conn, font_pattern);
- font_info = xcb_query_font_reply(conn, xcb_query_font_unchecked(conn, font->id), NULL);
- table = xcb_query_font_char_infos(font_info);
-
- for (i = 0; i < 2 * length; i += 2) {
- xcb_charinfo_t *info = get_charinfo(text[i+1], text[i], font_info, table, false);
- if (info == NULL)
- continue;
- width += info->character_width;
+ xcb_query_text_extents_cookie_t cookie;
+ xcb_query_text_extents_reply_t *reply;
+ xcb_generic_error_t *error;
+ int width;
+
+ cookie = xcb_query_text_extents(conn, font->id, length, (xcb_char2b_t*)text);
+ if ((reply = xcb_query_text_extents_reply(conn, cookie, &error)) == NULL) {
+ ELOG("Could not get text extents (X error code %d)\n",
+ error->error_code);
+ /* We return the rather safe guess of 7 pixels, because a
+ * rendering error is better than a crash. Plus, the user will
+ * see the error in his log. */
+ return 7;
}
+ width = reply->overall_width;
+ free(reply);
return width;
}
+
+/*
+ * Configures the given window to have the size/position specified by given rect
+ *
+ */
+void xcb_set_window_rect(xcb_connection_t *conn, xcb_window_t window, Rect r) {
+ xcb_configure_window(conn, window,
+ XCB_CONFIG_WINDOW_X |
+ XCB_CONFIG_WINDOW_Y |
+ XCB_CONFIG_WINDOW_WIDTH |
+ XCB_CONFIG_WINDOW_HEIGHT,
+ &(r.x));
+}