cache: hide details of struct atom_entry

Signed-off-by: Yuxuan Shui <[email protected]>

src/atom.c

@@ -8,6 +8,11 @@
 #include "log.h"
 #include "utils.h"
 
+struct atom_entry {
+	struct cache_handle entry;
+	xcb_atom_t atom;
+};
+
 static inline int atom_getter(struct cache *cache attr_unused, const char *atom_name,
                               struct cache_handle **value, void *user_data) {
 	xcb_connection_t *c = user_data;
@@ -45,6 +50,10 @@ xcb_atom_t get_atom(struct atom *a, const char *key, xcb_connection_t *c) {
 	return cache_entry(entry, struct atom_entry, entry)->atom;
 }
 
+xcb_atom_t get_atom_cached(struct atom *a, const char *key) {
+	return cache_entry(cache_get(&a->c, key), struct atom_entry, entry)->atom;
+}
+
 /**
  * Create a new atom structure and fetch all predefined atoms
  */

src/atom.h

@@ -1,10 +1,7 @@
 #pragma once
-#include <stdlib.h>
-
 #include <xcb/xcb.h>
 
 #include "cache.h"
-#include "log.h"
 #include "meta.h"
 
 // clang-format off
@@ -54,24 +51,18 @@
 
 #define ATOM_DEF(x) xcb_atom_t a##x
 
+struct atom_entry;
 struct atom {
 	struct cache c;
 	LIST_APPLY(ATOM_DEF, SEP_COLON, ATOM_LIST1);
 	LIST_APPLY(ATOM_DEF, SEP_COLON, ATOM_LIST2);
 };
 
-struct atom_entry {
-	struct cache_handle entry;
-	xcb_atom_t atom;
-};
-
 /// Create a new atom object with a xcb connection. `struct atom` does not hold
 /// a reference to the connection.
 struct atom *init_atoms(xcb_connection_t *c);
 
 xcb_atom_t get_atom(struct atom *a, const char *key, xcb_connection_t *c);
-static inline xcb_atom_t get_atom_cached(struct atom *a, const char *key) {
-	return cache_entry(cache_get(&a->c, key), struct atom_entry, entry)->atom;
-}
+xcb_atom_t get_atom_cached(struct atom *a, const char *key);
 
 void destroy_atoms(struct atom *a);