Merge branch 'master' into next

[i3/i3] / include / xcb.h

diff --git a/include/xcb.h b/include/xcb.h
index ef6ed197eb49340354cc83de4b3b55078df0a659..8c7d5422b79c083ccbd312c05176c00b2f45db30 100644 (file)
--- a/include/xcb.h
+++ b/include/xcb.h
@@ -2,10 +2,9 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * xcb.c: Helper functions for easier usage of XCB
  *
  */
 #ifndef _XCB_H
@@ -52,14 +51,6 @@
 
 extern unsigned int xcb_numlock_mask;
 
-/**
- * Loads a font for usage, also getting its height. If fallback is true,
- * i3 loads 'fixed' or '-misc-*' if the font cannot be found instead of
- * exiting.
- *
- */
-i3Font load_font(const char *pattern, bool fallback);
-
 /**
  * Convenience wrapper around xcb_create_window which takes care of depth,
  * generating an ID and checking for errors.
@@ -68,14 +59,6 @@ i3Font load_font(const char *pattern, bool fallback);
 xcb_window_t create_window(xcb_connection_t *conn, Rect r, uint16_t window_class,
         enum xcursor_cursor_t cursor, bool map, uint32_t mask, uint32_t *values);
 
-/**
- * Changes a single value in the graphic context (so one doesn’t have to
- * define an array of values)
- *
- */
-void xcb_change_gc_single(xcb_connection_t *conn, xcb_gcontext_t gc,
-                          uint32_t mask, uint32_t value);
-
 /**
  * Draws a line from x,y to to_x,to_y using the given color
  *
@@ -105,26 +88,12 @@ void fake_absolute_configure_notify(Con *con);
  */
 void send_take_focus(xcb_window_t window);
 
-/**
- * Finds out which modifier mask is the one for numlock, as the user may
- * change this.
- *
- */
-void xcb_get_numlock_mask(xcb_connection_t *conn);
-
 /**
  * Raises the given window (typically client->frame) above all other windows
  *
  */
 void xcb_raise_window(xcb_connection_t *conn, xcb_window_t window);
 
-/**
- * Calculate 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(char *text, int length);
-
 /**
  * Configures the given window to have the size/position specified by given rect
  *