Backport changes from master to eventloop-2.0 #833
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
* add handler for horizontal wheel input * add changlelog message re now handling horiz scroll on windows
…dowing#755) * Fix incorrect keycodes when using a non-US keyboard layout. This commit fixes the issue described in rust-windowing#752, and uses the advised method to fix it. * Style fixes Co-Authored-By: Toqozz <[email protected]> * Refactoring of macOS `virtualkeycode` fix (rust-windowing#752) * Applies requested changes as per pull request discussion (rust-windowing#755).
XNextEvent will block for input while holding the global Xlib mutex. This will cause a deadlock in even the most trivial multi-threaded application because OpenGL functions will need to hold the Xlib mutex too. Add EventsLoop::poll_one_event and EventsLoop::wait_for_input to provide thread-safe functions to poll and wait events from the X11 event queue using unix select(2) and XCheckIfEvent. This is a somewhat ugly workaround to an ugly problem. Fixes rust-windowing#779
* When building ModifiersState, ignore AltGr on Windows * Add CHANGELOG entry * Also filter out Control when pressing AltGr
* Use `XRRGetScreenResourcesCurrent` when avail. Signed-off-by: Hal Gentz <[email protected]> * Changelog Signed-off-by: Hal Gentz <[email protected]>
* Update winit to 0.19.0 * Update date for 0.19
…ng#819) * On Windows, fix CursorMoved(0, 0) getting sent on focus * Add changelog entry
Signed-off-by: Hal Gentz <[email protected]>
* Fix build on FreeBSD
error[E0432]: unresolved import `libc::__errno_location`
--> src/platform/linux/x11/mod.rs:22:85
|
22 | use libc::{select, fd_set, FD_SET, FD_ZERO, FD_ISSET, EINTR, EINVAL, ENOMEM, EBADF, __errno_location};
| ^^^^^^^^^^^^^^^^ no `__errno_location` in the root
__errno_location is called __error on FreeBSD and __errno on Open- and NetBSD.
Signed-off-by: Tobias Kortkamp <[email protected]>
* Import __error / __errno on *BSD as __errno_location
Signed-off-by: Tobias Kortkamp <[email protected]>
* Add changelog entry
Signed-off-by: Tobias Kortkamp <[email protected]>
…#810) * fix command key event left and right reverse on macOS rust-windowing#808 * update changelog
* Add additional numpad key mappings Since some platforms have already used the existing `Add`, `Subtract` and `Divide` codes to map numpad keys, the X11 and Wayland platform has been updated to achieve parity between platforms. On macOS only the `Subtract` numpad key had to be added. Since the numpad key is different from the normal keys, an alternative option would be to add new `NumpadAdd`, `NumpadSubtract` and `NumpadDivide` actions, however I think in this case it should be fine to map them to the same virtual key code. * Add Numpad PageUp/Down, Home and End on Wayland
Osspial
approved these changes
Apr 7, 2019
|
Alright, I'll just push these commits to |
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.
This backports the changes that occured to master into the eventloop-2.0 branch to avoid the two branches from diverging too much.
Given eventloop-2.0 is basically unrebasable, I cherry-picked the changes from master into it. Conflics were pretty trivial to fix once I have removed leftover files in eventloop-2.0 (see the first commit of this PR).