aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2017-02-04 16:25:13 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:14 +0100
commitbf1b3c6cfa5317c1ccc0befeb09541ddb5143fbe (patch)
tree234d0317f8635568038fa480861214cf60fd4509
parent8c1a21b4568f50a1fbbe014ee744d7130754d2ed (diff)
downloadnx-libs-bf1b3c6cfa5317c1ccc0befeb09541ddb5143fbe.tar.gz
nx-libs-bf1b3c6cfa5317c1ccc0befeb09541ddb5143fbe.tar.bz2
nx-libs-bf1b3c6cfa5317c1ccc0befeb09541ddb5143fbe.zip
dix: remove staggeringly broken vendor workarounds
Backported from X.org: From f93d10ce9bb4a6de83b561f44fb7b046def16234 Mon Sep 17 00:00:00 2001 From: Daniel Stone <daniel@fooishbar.org> Date: Mon, 6 Nov 2006 18:33:45 +0200 Subject: dix: remove staggeringly broken vendor workarounds Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-rw-r--r--nx-X11/programs/Xserver/dix/events.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c
index 166d2e85e..abbde67d5 100644
--- a/nx-X11/programs/Xserver/dix/events.c
+++ b/nx-X11/programs/Xserver/dix/events.c
@@ -2986,12 +2986,7 @@ EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask ma
if (wClient (pWin) == client)
{
check = pWin->eventMask;
-#ifdef SGIMISC
- pWin->eventMask =
- (mask & ~SGIMiscSpecialDestroyMask) | (pWin->eventMask & SGIMiscSpecialDestroyMask);
-#else
pWin->eventMask = mask;
-#endif
}
else
{
@@ -3000,9 +2995,6 @@ EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask ma
if (SameClient(others, client))
{
check = others->mask;
-#ifdef SGIMISC
- mask = (mask & ~SGIMiscSpecialDestroyMask) | (others->mask & SGIMiscSpecialDestroyMask);
-#endif
if (mask == 0)
{
FreeResource(others->resource, RT_NONE);