Name atoms according to ICCCM

Private atoms should be prefixed with an underscore and a vendor
identifier.

diff --git a/source/control.c b/source/control.c
index ca4f6e7a67a62b70f0ff87de1817ba3b1b88b820..f0c3357fc8018fb74ba33f4445597b6fa57f3a5a 100644 (file)
--- a/source/control.c
+++ b/source/control.c
@@ -31,8 +31,8 @@ GeometryCorrection *get_corrections(Display *display)
        char *name_ptr;
 
        root = DefaultRootWindow(display);
-       monitors_atom = XInternAtom(display, "GEOMETRY_CORRECTION_MONITORS", False);
-       correction_atom = XInternAtom(display, "GEOMETRY_CORRECTION", False);
+       monitors_atom = XInternAtom(display, "_MSP_GEOMETRY_CORRECTION_MONITORS", False);
+       correction_atom = XInternAtom(display, "_MSP_GEOMETRY_CORRECTION", False);
 
        XGetWindowProperty(display, root, monitors_atom, 0, 64, False, XA_STRING,
                &prop_type, &prop_format, &names_length, &overflow, (unsigned char **)&names);
@@ -115,8 +115,8 @@ void set_corrections(Display *display, GeometryCorrection *corrections)
        }
 
        root = DefaultRootWindow(display);
-       monitors_atom = XInternAtom(display, "GEOMETRY_CORRECTION_MONITORS", False);
-       correction_atom = XInternAtom(display, "GEOMETRY_CORRECTION", False);
+       monitors_atom = XInternAtom(display, "_MSP_GEOMETRY_CORRECTION_MONITORS", False);
+       correction_atom = XInternAtom(display, "_MSP_GEOMETRY_CORRECTION", False);
        XChangeProperty(display, root, monitors_atom, XA_STRING, 8, PropModeReplace, (unsigned char *)names, total_len+ncorrections-1);
        XChangeProperty(display, root, correction_atom, XA_INTEGER, 16, PropModeReplace, (unsigned char *)values, ncorrections*4);
 

diff --git a/source/main.c b/source/main.c
index 6e92cae153ebc5c3d8d6c439432fe71df4bb33fb..061d7b73e9c4a214165e4102ea0b677e62807a38 100644 (file)
--- a/source/main.c
+++ b/source/main.c
@@ -968,8 +968,8 @@ int initialize_compositor(Compositor *compositor)
        compositor->glXReleaseTexImageEXT = (PFNGLXRELEASETEXIMAGEEXTPROC)glXGetProcAddress((unsigned char *)"glXReleaseTexImageEXT");
 
        compositor->root_pmap_atom = XInternAtom(compositor->display, "_XROOTPMAP_ID", False);
-       compositor->correction_atom = XInternAtom(compositor->display, "GEOMETRY_CORRECTION", False);
-       compositor->monitors_atom = XInternAtom(compositor->display, "GEOMETRY_CORRECTION_MONITORS", False);
+       compositor->correction_atom = XInternAtom(compositor->display, "_MSP_GEOMETRY_CORRECTION", False);
+       compositor->monitors_atom = XInternAtom(compositor->display, "_MSP_GEOMETRY_CORRECTION_MONITORS", False);
 
        compositor->nscreens = ScreenCount(compositor->display);
        compositor->screens = (CompositedScreen *)malloc(compositor->nscreens*sizeof(CompositedScreen));