From fc0525f9d3df27985a07539be2868ee301c0053b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 14 Nov 2025 16:20:09 +0100 Subject: [PATCH] xquartz: drop support for internal server reset Not needed anymore. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xquartz/applewm.c | 8 +------- hw/xquartz/darwin.c | 2 -- hw/xquartz/xpr/xprFrame.c | 8 +------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c index 70023038b..bf671e200 100644 --- a/hw/xquartz/applewm.c +++ b/hw/xquartz/applewm.c @@ -60,13 +60,7 @@ #define DEFINE_ATOM_HELPER(func, atom_name) \ static Atom func(void) { \ - static x_server_generation_t generation; \ - static Atom atom; \ - if (generation != serverGeneration) { \ - generation = serverGeneration; \ - atom = dixAddAtom(atom_name); \ - } \ - return atom; \ + return dixAddAtom(atom_name); \ } DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN") diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 28458041b..28c588e06 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -674,7 +674,6 @@ OsVendorFatalError(const char *f, va_list args) void OsVendorInit(void) { - if (serverGeneration == 1) { char *lf; char *home = getenv("HOME"); assert(home); @@ -693,7 +692,6 @@ OsVendorInit(void) free(lf); DarwinPrintBanner(); - } } /* diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c index c2f33a2ff..fb672a9e0 100644 --- a/hw/xquartz/xpr/xprFrame.c +++ b/hw/xquartz/xpr/xprFrame.c @@ -49,13 +49,7 @@ #define DEFINE_ATOM_HELPER(func, atom_name) \ static Atom func(void) { \ - static x_server_generation_t generation; \ - static Atom atom; \ - if (generation != serverGeneration) { \ - generation = serverGeneration; \ - atom = dixAddAtom(atom_name); \ - } \ - return atom; \ + return dixAddAtom(atom_name); \ } DEFINE_ATOM_HELPER(xa_native_window_id, "_NATIVE_WINDOW_ID")