don't pollute rootWindow::_NET_SUPPORTED

Currently we add every name we internalize at startup.
Stop at END_OF_NET_SUPPORTED from now on.

2 files changed, 20 insertions, 15 deletions

diff --git a/src/mcompatoms_p.h b/src/mcompatoms_p.h
index 07b3803..1685aef 100644
--- a/src/mcompatoms_p.h
+++ b/src/mcompatoms_p.h
@@ -42,6 +42,7 @@ public:
     };
 
     enum Atoms {
+        // The following atoms are added to the _NET_SUPPORTED list.
         // window manager
         WM_PROTOCOLS,
         WM_DELETE_WINDOW,
@@ -96,13 +97,6 @@ public:
         _MEEGOTOUCH_DESKTOP_VIEW,
         _MEEGOTOUCH_CANNOT_MINIMIZE,
 
-        /* RROutput properties */
-        RROUTPUT_CTYPE,
-        RROUTPUT_PANEL,
-        RROUTPUT_ALPHA_MODE,
-        RROUTPUT_GRAPHICS_ALPHA,
-        RROUTPUT_VIDEO_ALPHA,
-
 #ifdef WINDOW_DEBUG
         _M_WM_INFO,
         _M_WM_WINDOW_ZVALUE,
@@ -112,6 +106,16 @@ public:
         _M_WM_WINDOW_DIRECT_INVISIBLE,
 #endif
 
+        // The rest of the atoms are not added to _NET_SUPPORTED.
+        END_OF_NET_SUPPORTED,
+
+        // RROutput properties
+        RROUTPUT_CTYPE = END_OF_NET_SUPPORTED,
+        RROUTPUT_PANEL,
+        RROUTPUT_ALPHA_MODE,
+        RROUTPUT_GRAPHICS_ALPHA,
+        RROUTPUT_VIDEO_ALPHA,
+
         ATOMS_TOTAL
     };
     static MCompAtoms *instance();
diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp
index 79525b3..c35fb06 100644
--- a/src/mcompositemanager.cpp
+++ b/src/mcompositemanager.cpp
@@ -159,13 +159,6 @@ MCompAtoms::MCompAtoms()
         "_MEEGOTOUCH_DESKTOP_VIEW",
         "_MEEGOTOUCH_CANNOT_MINIMIZE",
 
-        /* RROutput properties */
-        RR_PROPERTY_CONNECTOR_TYPE,
-        "Panel",
-        "AlphaMode",
-        "GraphicsAlpha",
-        "VideoAlpha",
-
 #ifdef WINDOW_DEBUG
         // custom properties for CITA
         "_M_WM_INFO",
@@ -175,6 +168,14 @@ MCompAtoms::MCompAtoms()
         "_M_WM_WINDOW_DIRECT_VISIBLE",
         "_M_WM_WINDOW_DIRECT_INVISIBLE",
 #endif
+
+        // Add atoms you don't want to be in rootWindow::_NET_SUPPORTED below.
+        // RROutput properties
+        RR_PROPERTY_CONNECTOR_TYPE,
+        "Panel",
+        "AlphaMode",
+        "GraphicsAlpha",
+        "VideoAlpha",
     };
 
     Q_ASSERT((sizeof(atom_names) / sizeof(atom_names[0])) == ATOMS_TOTAL);
@@ -186,7 +187,7 @@ MCompAtoms::MCompAtoms()
 
     XChangeProperty(dpy, QX11Info::appRootWindow(), atoms[_NET_SUPPORTED],
                     XA_ATOM, 32, PropModeReplace, (unsigned char *)atoms,
-                    ATOMS_TOTAL);
+                    END_OF_NET_SUPPORTED);
 }
 
 MCompAtoms::Type MCompAtoms::windowType(Window w)