Skip to content

Commit 91c2bc3

Browse files
committed
[PR #1441] xquartz: drop support for internal server reset
PR: #1441
1 parent 542d5b0 commit 91c2bc3

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

hw/xquartz/applewm.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,7 @@
6060

6161
#define DEFINE_ATOM_HELPER(func, atom_name) \
6262
static Atom func(void) { \
63-
static x_server_generation_t generation; \
64-
static Atom atom; \
65-
if (generation != serverGeneration) { \
66-
generation = serverGeneration; \
67-
atom = dixAddAtom(atom_name); \
68-
} \
69-
return atom; \
63+
return dixAddAtom(atom_name); \
7064
}
7165

7266
DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")

hw/xquartz/darwin.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,6 @@ OsVendorFatalError(const char *f, va_list args)
673673
void
674674
OsVendorInit(void)
675675
{
676-
if (serverGeneration == 1) {
677676
char *lf;
678677
char *home = getenv("HOME");
679678
assert(home);
@@ -692,7 +691,6 @@ OsVendorInit(void)
692691
free(lf);
693692

694693
DarwinPrintBanner();
695-
}
696694
}
697695

698696
/*

hw/xquartz/xpr/xprFrame.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,7 @@
4949

5050
#define DEFINE_ATOM_HELPER(func, atom_name) \
5151
static Atom func(void) { \
52-
static x_server_generation_t generation; \
53-
static Atom atom; \
54-
if (generation != serverGeneration) { \
55-
generation = serverGeneration; \
56-
atom = dixAddAtom(atom_name); \
57-
} \
58-
return atom; \
52+
return dixAddAtom(atom_name); \
5953
}
6054

6155
DEFINE_ATOM_HELPER(xa_native_window_id, "_NATIVE_WINDOW_ID")

0 commit comments

Comments
 (0)