Some small cursor code cleanups #940
Merged
Conversation
This file contains 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 struct x11rb::cursor::Handle contained a cursor_font resource. This resource was never freed, so basically leaked. It's "just a font" and it is unlikely to cause a problem, but I want to deal with it anyway. One option would be to add a Drop implementation, but that would make everything more complicated since the Drop implementation would need access to the X11 connection. So, this basically requires an API break. In this commit, I go with the other option: Instead of keeping the core font open all the time, it is now only opened when needed and then immediately closed again. Since this is dealing with a font leak already, I am also changing the code from using a plain "Font" to the "FontWrapper" struct that cleans up the font in its Drop implementation. Signed-off-by: Uli Schlachter <[email protected]>
This should not have any externally visible effect, but I change some manual resource management for a picture to use a PictureWrapper instead, which frees things up in its Drop implementation. Signed-off-by: Uli Schlachter <[email protected]>
eduardosm
approved these changes
Aug 17, 2024
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.
Two commits here. The later is just a small refactoring that does not really do anything, but might be nice anyway.
The first one fixes a resource leak where a font was not getting closed again. I think my fix actually simplifies the code a bit.
I tested this by hardcoding a "core" cursor and changing
simple_windowto use theboatcursor. No idea what I am looking at, but it's definitely not my default cursor. This also looks fine inxtrace, so this still seems to work.