diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-18 09:28:50 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-18 09:28:50 +0200 |
commit | b7034724abb859db36a3fa4312e4827141114f45 (patch) | |
tree | 5e4406bd491e61be781de5b2075dabd76ba9514b /nx-X11/programs/Xserver/hw/nxagent/Atoms.h | |
parent | b67b910a6adf3287fad10cc97cf9484b0057b0bd (diff) | |
parent | 31057d00b8cdbe97837f508c3cb0f2c521a30266 (diff) | |
download | nx-libs-b7034724abb859db36a3fa4312e4827141114f45.tar.gz nx-libs-b7034724abb859db36a3fa4312e4827141114f45.tar.bz2 nx-libs-b7034724abb859db36a3fa4312e4827141114f45.zip |
Merge branch 'uli42-pr/many_clipboard_fixes' into 3.6.x
Attributes GH PR #1018: https://github.com/ArcticaProject/nx-libs/pull/1018
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Atoms.h')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Atoms.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h index 9006b2253..a9f730d76 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h @@ -30,7 +30,7 @@ #include "../../include/window.h" #include "screenint.h" -#define NXAGENT_NUMBER_OF_ATOMS 18 +#define NXAGENT_NUMBER_OF_ATOMS 24 extern Atom nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS]; @@ -71,12 +71,24 @@ void nxagentWMDetect(void); XlibAtom nxagentMakeAtom(char *, unsigned, Bool); /* - * Converts local atoms in remote atoms and viceversa. + * Converts local atoms to remote atoms and viceversa. */ Atom nxagentRemoteToLocalAtom(XlibAtom); XlibAtom nxagentLocalToRemoteAtom(Atom); -#endif +/* + * return the string belonging to an atom. String MUST NOT + * be freed by the caller! + */ +const char *nxagentRemoteAtomToString(XlibAtom remote); + +/* + * supply two macros that also validate the output. + */ +#define NameForLocalAtom(_atom) validateString(NameForAtom(_atom)) +#define NameForRemoteAtom(_xlibatom) validateString(nxagentRemoteAtomToString(_xlibatom)) + +#endif /* XlibAtom */ #endif /* __Atoms_H__ */ |