dix: add dixAnyOtherGrabbed() and unexport GrabInProgress #1327
+24
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* the `GrabInProgress` field isn't used by any known drivers, thus no need to export it * the only in-tree consumer outside of it's source file is Xext/saver.c, which actually just wants to know whether any *other* client already grabbed the server - asking the OS layer isn't the right source (should ask dix/dispatch.c instead) Therefore adding a simple function for that check into dispatch.c (where grab/ungrab is actually controlled), so we can easily make this internal field static again. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
metux
requested review from
a team,
ONykyf,
algrid,
b-aaz,
callmetango,
cepelinas9000,
jonhermansen,
josephcrowell,
mikedld and
stefan11111
metux
added a commit
that referenced
this pull request
Nov 4, 2025
stefan11111
reviewed
Nov 4, 2025
| pPriv->installedMap = None; | ||
|
|
||
| if (GrabInProgress && GrabInProgress != pAttr->client->index) | ||
| if (dixAnyOtherGrabbed(pAttr->client)) |
Contributor
There was a problem hiding this comment.
I'm not familiar with this code, but did you intend to move to check to grabClient instead of GrabInProgress?
Contributor
Author
There was a problem hiding this comment.
Unless i haven't overlooked anything, these two variables updated at almost the same time.
metux
added a commit
that referenced
this pull request
Nov 6, 2025
metux
added a commit
that referenced
this pull request
Nov 6, 2025
metux
added a commit
that referenced
this pull request
Nov 6, 2025
metux
added a commit
that referenced
this pull request
Nov 6, 2025
metux
added a commit
that referenced
this pull request
Nov 7, 2025
metux
added a commit
that referenced
this pull request
Nov 7, 2025
metux
added a commit
that referenced
this pull request
Nov 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
GrabInProgressfield isn't used by any known drivers, thusno need to export it
which actually just wants to know whether any other client already
grabbed the server - asking the OS layer isn't the right source
(should ask dix/dispatch.c instead)
Therefore adding a simple function for that check into dispatch.c (where
grab/ungrab is actually controlled), so we can easily make this internal
field static again.
Signed-off-by: Enrico Weigelt, metux IT consult info@metux.net