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.

---
 xevents.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'xevents.c')

diff --git a/xevents.c b/xevents.c
index ff7420e..125cff7 100644
--- a/xevents.c
+++ b/xevents.c
@@ -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: xevents.c,v 1.88 2013/07/10 14:15:58 okan Exp $
+ * $OpenBSD: xevents.c,v 1.89 2013/07/15 14:50:44 okan Exp $
  */
 
 /*
@@ -209,7 +209,7 @@ xev_handle_propertynotify(XEvent *ee)
 	} else {
 		TAILQ_FOREACH(sc, &Screenq, entry) {
 			if (sc->rootwin == e->window) {
-				if (e->atom == ewmh[_NET_DESKTOP_NAMES].atom)
+				if (e->atom == ewmh[_NET_DESKTOP_NAMES])
 					group_update_names(sc);
 			}
 		}
@@ -348,21 +348,21 @@ xev_handle_clientmessage(XEvent *ee)
 	if ((cc = client_find(e->window)) == NULL)
 		return;
 
-	if (e->message_type == cwmh[WM_CHANGE_STATE].atom &&
+	if (e->message_type == cwmh[WM_CHANGE_STATE] &&
 	    e->format == 32 && e->data.l[0] == IconicState)
 		client_hide(cc);
 
-	if (e->message_type == ewmh[_NET_CLOSE_WINDOW].atom)
+	if (e->message_type == ewmh[_NET_CLOSE_WINDOW])
 		client_send_delete(cc);
 
-	if (e->message_type == ewmh[_NET_ACTIVE_WINDOW].atom &&
+	if (e->message_type == ewmh[_NET_ACTIVE_WINDOW] &&
 	    e->format == 32) {
 		old_cc = client_current();
 		if (old_cc)
 			client_ptrsave(old_cc);
 		client_ptrwarp(cc);
 	}
-	if (e->message_type == ewmh[_NET_WM_STATE].atom &&
+	if (e->message_type == ewmh[_NET_WM_STATE] &&
 	    e->format == 32)
 		xu_ewmh_handle_net_wm_state_msg(cc,
 		    e->data.l[0], e->data.l[1], e->data.l[2]);
-- 
cgit v1.2.3-2-gb3c3