diff options
| author | hohndel <hohndel> | 1999-04-07 16:59:27 +0000 |
|---|---|---|
| committer | hohndel <hohndel> | 1999-04-07 16:59:27 +0000 |
| commit | 8b1c9e84cf1ce699dc009e36cdb9b3ccc086fa2d (patch) | |
| tree | dc08a9406871209c01aa81febf25cad1b9f3c94c | |
| parent | 7b18307246fd9a1d702876abdb69ef87bb69b6ad (diff) | |
fix a XINERAMA bug in dix
| -rw-r--r-- | programs/Xserver/dix/events.c | 13 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 5 |
2 files changed, 14 insertions, 4 deletions
diff --git a/programs/Xserver/dix/events.c b/programs/Xserver/dix/events.c index d370c1fad..35996c6d3 100644 --- a/programs/Xserver/dix/events.c +++ b/programs/Xserver/dix/events.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.16tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.17 1999/03/14 03:21:33 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -3992,7 +3992,10 @@ ProcUngrabKey(client) if (result == TRUE) anyTrue = result; } - return (anyTrue); + if (anyTrue) + return(Success); + else + return(BadAlloc); }else { #endif if (!DeletePassiveGrabFromList(&tempGrab)) @@ -4273,6 +4276,7 @@ ProcUngrabButton(client) tempGrab.detail.pMask = NULL; #ifdef PANORAMIX + anyTrue = FALSE; if ( !noPanoramiXExtension ){ PANORAMIXFIND_ID(pPanoramiXWin, stuff->grabWindow); FOR_NSCREENS_OR_ONCE(pPanoramiXWin, i) { @@ -4284,7 +4288,10 @@ ProcUngrabButton(client) if (result == TRUE) anyTrue = result; } - return (anyTrue); + if (anyTrue) + return (Success); + else + return (BadAlloc); }else { #endif if (!DeletePassiveGrabFromList(&tempGrab)) diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index dd104e043..7441a08ac 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,3 +1,6 @@ +XFree86 3.9Pi (11 April 1999) +2695. Fix a XINERAMA bug in dix/events.c (Dirk Hohndel). + XFree86 3.9Ph (5 April 1999) 2694. Add code to XF86Setup for mode adjustment (like xvidtune), addition, and removal (#2646, Joe Moss). @@ -7720,4 +7723,4 @@ XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.721 1999/04/04 08:46:07 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.722 1999/04/05 07:12:50 dawes Exp $ |