Merge branch 'master' into next

[i3/i3] / include / libi3.h

diff --git a/include/libi3.h b/include/libi3.h
index 17f8a5eb99260bae09340ebff96c54929a7d8352..973c885d7997697e0bd4ec86a6b2fff670831417 100644 (file)
--- a/include/libi3.h
+++ b/include/libi3.h
@@ -47,13 +47,14 @@ struct Font {
 #endif
 
 /**
- * Try to get the socket path from X11 and return NULL if it doesn’t work.
+ * Try to get the contents of the given atom (for example I3_SOCKET_PATH) from
+ * the X11 root window and return NULL if it doesn’t work.
  *
- * The memory for the socket path is dynamically allocated and has to be
+ * The memory for the contents is dynamically allocated and has to be
  * free()d by the caller.
  *
  */
-char *socket_path_from_x11();
+char *root_atom_contents(const char *atomname);
 
 /**
  * Safe-wrapper around malloc which exits if malloc returns NULL (meaning that
@@ -186,6 +187,18 @@ uint32_t get_mod_mask_for(uint32_t keysym,
  */
 i3Font load_font(const char *pattern, const bool fallback);
 
+/**
+ * Defines the font to be used for the forthcoming calls.
+ *
+ */
+void set_font(i3Font *font);
+
+/**
+ * Frees the resources taken by the current font.
+ *
+ */
+void free_font();
+
 /**
  * Converts the given string to UTF-8 from UCS-2 big endian. The return value
  * must be freed after use.
@@ -202,13 +215,6 @@ char *convert_ucs2_to_utf8(xcb_char2b_t *text, size_t num_glyphs);
  */
 xcb_char2b_t *convert_utf8_to_ucs2(char *input, size_t *real_strlen);
 
-/**
- * Defines the font to be used for the forthcoming draw_text and
- * predict_text_width calls.
- *
- */
-void set_font(i3Font *font);
-
 /**
  * Defines the colors to be used for the forthcoming draw_text calls.
  *