From b048dc85890003b1b2048f6b6ba9733e578d6478 Mon Sep 17 00:00:00 2001
From: okan
Date: Mon, 15 Jul 2013 14:50:44 +0000
Subject: simplify atom handling; allows us to limit to one round-trip to
 server for gathering Atoms.

---
 calmwm.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'calmwm.h')

diff --git a/calmwm.h b/calmwm.h
index e3543ce..a536e9e 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.217 2013/07/09 01:24:49 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.218 2013/07/15 14:50:44 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -447,6 +447,7 @@ void			 menuq_clear(struct menu_q *);
 
 int			 parse_config(const char *, struct conf *);
 
+void			 conf_atoms(void);
 void			 conf_autogroup(struct conf *, int, char *);
 void			 conf_bind_kbd(struct conf *, char *, char *);
 int			 conf_bind_mouse(struct conf *, char *, char *);
@@ -464,7 +465,6 @@ void			 xev_loop(void);
 
 void			 xu_btn_grab(Window, int, u_int);
 void			 xu_btn_ungrab(Window, int, u_int);
-void			 xu_getatoms(void);
 int			 xu_getprop(Window, Atom, Atom, long, u_char **);
 int			 xu_get_wm_state(Window, int *);
 int			 xu_getstrprop(Window, Atom, char **);
@@ -558,11 +558,7 @@ enum {
 	_NET_WM_STATE_ADD,
 	_NET_WM_STATE_TOGGLE
 };
-struct atom_ctx {
-	char	*name;
-	Atom	 atom;
-};
-extern struct atom_ctx			 cwmh[CWMH_NITEMS];
-extern struct atom_ctx			 ewmh[EWMH_NITEMS];
+extern Atom				 cwmh[CWMH_NITEMS];
+extern Atom				 ewmh[EWMH_NITEMS];
 
 #endif /* _CALMWM_H_ */
-- 
cgit v1.2.3-2-gb3c3