From 30cec786e5fe791a2761cdf12a5d5e7fadae6c9e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 22 Jul 2025 14:53:29 +0200 Subject: [PATCH] randr: use dixGetAtomID() Use the new shortcut helper for cases where we need to check whether an atom exists and retrieve it's ID. Signed-off-by: Enrico Weigelt, metux IT consult --- randr/rrcrtc.c | 8 ++++---- randr/rrproperty.c | 2 +- randr/rrprovider.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 78c2baef8..dd93bd02f 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -24,6 +24,7 @@ #include +#include "dix/dix_priv.h" #include "randr/randrstr_priv.h" #include "randr/rrdispatch_priv.h" #include "os/bug_priv.h" @@ -453,7 +454,7 @@ rrGetPixmapSharingSyncProp(int numOutputs, RROutputPtr * outputs) /* Determine if the user wants prime syncing */ int o; const char *syncStr = PRIME_SYNC_PROP; - Atom syncProp = MakeAtom(syncStr, strlen(syncStr), FALSE); + Atom syncProp = dixGetAtomID(syncStr); if (syncProp == None) return TRUE; @@ -477,7 +478,7 @@ rrSetPixmapSharingSyncProp(char val, int numOutputs, RROutputPtr * outputs) { int o; const char *syncStr = PRIME_SYNC_PROP; - Atom syncProp = MakeAtom(syncStr, strlen(syncStr), FALSE); + Atom syncProp = dixGetAtomID(syncStr); if (syncProp == None) return; @@ -714,10 +715,9 @@ static Bool rrCheckEmulated(RROutputPtr output) { const char *emulStr = XRANDR_EMULATION_PROP; - Atom emulProp; RRPropertyValuePtr val; - emulProp = MakeAtom(emulStr, strlen(emulStr), FALSE); + Atom emulProp = dixGetAtomID(emulStr); if (emulProp == None) return FALSE; diff --git a/randr/rrproperty.c b/randr/rrproperty.c index dd491e626..d8fdc7203 100644 --- a/randr/rrproperty.c +++ b/randr/rrproperty.c @@ -140,7 +140,7 @@ static void RRNoticePropertyChange(RROutputPtr output, Atom property, RRPropertyValuePtr value) { const char *non_desktop_str = RR_PROPERTY_NON_DESKTOP; - Atom non_desktop_prop = MakeAtom(non_desktop_str, strlen(non_desktop_str), FALSE); + Atom non_desktop_prop = dixGetAtomID(non_desktop_str); if (property == non_desktop_prop) { if (value->type == XA_INTEGER && value->format == 32 && value->size >= 1) { diff --git a/randr/rrprovider.c b/randr/rrprovider.c index cbd7d327d..0e2aaf895 100644 --- a/randr/rrprovider.c +++ b/randr/rrprovider.c @@ -275,7 +275,7 @@ RRInitPrimeSyncProps(ScreenPtr pScreen) rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); const char *syncStr = PRIME_SYNC_PROP; - Atom syncProp = MakeAtom(syncStr, strlen(syncStr), TRUE); + Atom syncProp = dixGetAtomID(syncStr); int defaultVal = TRUE; INT32 validVals[2] = {FALSE, TRUE}; @@ -306,7 +306,7 @@ RRFiniPrimeSyncProps(ScreenPtr pScreen) int i; const char *syncStr = PRIME_SYNC_PROP; - Atom syncProp = MakeAtom(syncStr, strlen(syncStr), FALSE); + Atom syncProp = dixGetAtomID(syncStr); if (syncProp == None) return;