Don't rely on x11 when with_x11 is disabled #1500
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
Etaash-mathamsetty
force-pushed
the
pure-wayland-keybinds
branch
2 times, most recently
from
74330f1 to
85035c9
Compare
Etaash-mathamsetty
changed the title
|
This has a conflict that needs to be resolved |
|
That whole active GPU stuff in src/gpu.cpp got fixed with #1499, so it is safe to remove as there is no need for it anymore. This would resolve the conflict. |
I am aware |
Etaash-mathamsetty
force-pushed
the
pure-wayland-keybinds
branch
from
3b98624 to
44240ba
Compare
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.
Fixes (partially): #1497
Part 1... will expand in the future to switch everything to xkb_keysym_t, seems like that's what we are forced to do