From 09fffa12ea05bad315e08df9e9dcabae1a8cfb2b Mon Sep 17 00:00:00 2001
From: David Reveman <davidr@novell.com>
Date: Sat, 2 Aug 2008 10:56:01 -0400
Subject: [PATCH] Use dmxBEAtom where possible.

---
 hw/dmx/dmxatom.c   |  7 ++++++-
 hw/dmx/dmxprop.c   |  9 +++------
 hw/dmx/dmxrandr.c  | 24 +++++-------------------
 hw/dmx/dmxwindow.c | 16 ++++------------
 4 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/hw/dmx/dmxatom.c b/hw/dmx/dmxatom.c
index 94bc81c26..b15fbdb24 100644
--- a/hw/dmx/dmxatom.c
+++ b/hw/dmx/dmxatom.c
@@ -40,9 +40,12 @@ dmxAtom (DMXScreenInfo *dmxScreen,
 
     if (!atom)
     {
-	char *name;
+	char *name = NULL;
 
+	XLIB_PROLOGUE (dmxScreen);
 	name = XGetAtomName (dmxScreen->beDisplay, beAtom);
+	XLIB_EPILOGUE (dmxScreen);
+
 	if (!name)
 	    return None;
 
@@ -90,7 +93,9 @@ dmxBEAtom (DMXScreenInfo *dmxScreen,
 	if (!name)
 	    return None;
 
+	XLIB_PROLOGUE (dmxScreen);
 	beAtom = XInternAtom (dmxScreen->beDisplay, name, FALSE);
+	XLIB_EPILOGUE (dmxScreen);	
 
 	if (atom >= dmxScreen->beAtomTableSize)
 	{
diff --git a/hw/dmx/dmxprop.c b/hw/dmx/dmxprop.c
index 30ea61ee7..ed01fa2c3 100644
--- a/hw/dmx/dmxprop.c
+++ b/hw/dmx/dmxprop.c
@@ -63,6 +63,7 @@
 #include "dmxprop.h"
 #include "dmxwindow.h"
 #include "dmxlog.h"
+#include "dmxatom.h"
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
@@ -420,9 +421,7 @@ dmxDeleteProperty (WindowPtr pWin,
     XLIB_PROLOGUE (dmxScreen);
     XDeleteProperty (dmxScreen->beDisplay,
 		     pWinPriv->window,
-		     XInternAtom (dmxScreen->beDisplay,
-				  NameForAtom (property),
-				  FALSE));
+		     dmxBEAtom (dmxScreen, property));
     XLIB_EPILOGUE (dmxScreen);
 }
 
@@ -487,9 +486,7 @@ dmxRotateProperties (WindowPtr pWin,
 
     XLIB_PROLOGUE (dmxScreen);
     for (i = 0; i < nAtoms; i++)
-	buf[i] = XInternAtom (dmxScreen->beDisplay,
-			      NameForAtom (atoms[i]),
-			      FALSE);
+	buf[i] = dmxBEAtom (dmxScreen, atoms[i]);
 
     XRotateWindowProperties (dmxScreen->beDisplay,
 			     pWinPriv->window,
diff --git a/hw/dmx/dmxrandr.c b/hw/dmx/dmxrandr.c
index f4a06a73c..9efcc9b48 100644
--- a/hw/dmx/dmxrandr.c
+++ b/hw/dmx/dmxrandr.c
@@ -34,6 +34,7 @@
 #include "dmxcb.h"
 #include "dmxrandr.h"
 #include "dmxclient.h"
+#include "dmxatom.h"
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
@@ -897,11 +898,8 @@ dmxRROutputSetProperty (ScreenPtr	   pScreen,
 
     validValues = p->valid_values;
 
-    XLIB_PROLOGUE (dmxScreen);
-    atom = XInternAtom (dmxScreen->beDisplay, NameForAtom (property), FALSE);
-    type = XInternAtom (dmxScreen->beDisplay, NameForAtom (value->type),
-			FALSE);
-    XLIB_EPILOGUE (dmxScreen);
+    atom = dmxBEAtom (dmxScreen, property);
+    type = dmxBEAtom (dmxScreen, value->type);
 
     if (type == XA_ATOM && value->format == 32)
     {
@@ -934,13 +932,7 @@ dmxRROutputSetProperty (ScreenPtr	   pScreen,
 		return FALSE;
 
 	    for (i = 0; i < p->num_valid; i++)
-	    {
-		XLIB_PROLOGUE (dmxScreen);
-		validValues[i] = XInternAtom (dmxScreen->beDisplay,
-					      NameForAtom (p->valid_values[i]),
-					      FALSE);
-		XLIB_EPILOGUE (dmxScreen);
-	    }
+		validValues[i] = dmxBEAtom (dmxScreen, p->valid_values[i]);
 	}
 
 	if (value->size)
@@ -952,13 +944,7 @@ dmxRROutputSetProperty (ScreenPtr	   pScreen,
 		return FALSE;
 
 	    for (i = 0; i < value->size; i++)
-	    {
-		XLIB_PROLOGUE (dmxScreen);
-		values[i] = XInternAtom (dmxScreen->beDisplay,
-					 NameForAtom (atoms[i]),
-					 FALSE);
-		XLIB_EPILOGUE (dmxScreen);
-	    }
+		values[i] = dmxBEAtom (dmxScreen, atoms[i]);
 	}
     }
     else
diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c
index 38e399e42..cecba6d3c 100644
--- a/hw/dmx/dmxwindow.c
+++ b/hw/dmx/dmxwindow.c
@@ -49,6 +49,7 @@
 #include "dmxscrinit.h"
 #include "dmxcursor.h"
 #include "dmxfont.h"
+#include "dmxatom.h"
 #ifdef RENDER
 #include "dmxpict.h"
 #endif
@@ -1242,13 +1243,8 @@ dmxTranslateWindowProperty (WindowPtr     pWindow,
     case 'A': {
 	Atom *src = (Atom *) data;
 	Atom *dst = (Atom *) output;
-	char *name;
 
-	name = NameForAtom (*src);
-	if (name)
-	    *dst = XInternAtom (dmxScreen->beDisplay, name, FALSE);
-	else
-	    *dst = 0;
+	*dst = dmxBEAtom (dmxScreen, *src);
     } break;
     case 'p':
     case 'P': {
@@ -1525,12 +1521,8 @@ dmxBESetWindowProperty (WindowPtr   pWindow,
     XLIB_PROLOGUE (dmxScreen);
     XChangeProperty (dmxScreen->beDisplay,
 		     pWinPriv->window,
-		     XInternAtom (dmxScreen->beDisplay,
-				  NameForAtom (pProp->propertyName),
-				  FALSE),
-		     XInternAtom (dmxScreen->beDisplay,
-				  NameForAtom (pProp->type),
-				  FALSE),
+		     dmxBEAtom (dmxScreen, pProp->propertyName),
+		     dmxBEAtom (dmxScreen, pProp->type),
 		     pProp->format,
 		     PropModeReplace,
 		     data,