From 326681cd9c807e5be2fc9fd8e13d3026b7ec39a8 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 14 Dec 2015 15:59:15 +0200 Subject: [PATCH] Name atoms according to ICCCM Private atoms should be prefixed with an underscore and a vendor identifier. --- source/control.c | 8 ++++---- source/main.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/control.c b/source/control.c index ca4f6e7..f0c3357 100644 --- 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 6e92cae..061d7b7 100644 --- 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)); -- 2.43.0