Fixing hotkey drops in Linux#367
Merged
CryZe merged 10 commits intoLiveSplit:masterfrom Dec 13, 2020
mcdoll:master
Merged
Conversation
…vating the same key works
…nd ungrab_all; this fixes the reactivating the same key issue
…this breaks the API since now (de-)activative returns Result<()>; we also have a private enum that reduces the amount of boilerplate code
CryZe
requested changes
Oct 30, 2020
Collaborator
CryZe
left a comment
There was a problem hiding this comment.
There's also some formatting problems, try to run cargo fmt.
Contributor
|
I've tested this patch on my machine like I should have done ages ago, and it seems to be working. @CryZe this should be good to merge provided there's nothing else wrong with this. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR addresses issue #302 .
hotkey_system.rs was rewritten so that the activation and deactivation of the hotkey system registers and unregisters the grabbing of the keys. Moreover, I added an (private) enum Hotkey that makes it possible to reduce the large amount of copy&paste code.
In the livesplit-hotkey crate, the linux module was slightly modified: the old functions register and unregister were replaced by
grab_all and ungrab_all. Also the window number is now calculated in grab_all and ungrab_all, which simplifies the Hook methods slightly.
I think that we should get rid of the set_split(keycode), set_skip, etc methods and instead make enum Hotkey public and use set_hotkey(hotkey,keycode) instead.