summaryrefslogtreecommitdiff
path: root/Xext/xace.h
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2008-02-15 19:53:45 -0500
committerEamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil>2008-02-20 15:59:40 -0500
commitf343265a289724c81017f089c024a7618267c4e3 (patch)
tree2cf79ba31a1375d68237c77b813d79e9d72c665b /Xext/xace.h
parent7c2f0a8befb310707ea923dbcdfde84521e52c88 (diff)
XACE: Make the default window background state configurable per-window.
To recap: the original XC-SECURITY extension disallowed background "None" if the window was untrusted. XACE 1.0 preserved this check as a hook function. XACE pre-2.0 removed the hook and first abolished background "None entirely, then restored it as a global on/off switch in response to Bug #13683. Now it's back to being per-window, via a flag instead of a hook function.
Diffstat (limited to 'Xext/xace.h')
-rw-r--r--Xext/xace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Xext/xace.h b/Xext/xace.h
index 2016ca322..1f07d9fd2 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "property.h"
/* Default window background */
-#define XaceBackgroundNoneState None
+#define XaceBackgroundNoneState(w) ((w)->forcedBG ? BackgroundPixel : None)
/* security hooks */
/* Constants used to identify the available security hooks
@@ -100,7 +100,7 @@ extern void XaceCensorImage(
#else /* XACE */
/* Default window background */
-#define XaceBackgroundNoneState None
+#define XaceBackgroundNoneState(w) None
/* Define calls away when XACE is not being built. */