commit fa95f204d3c10ceca70e794870657a0f33349761
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Sun Apr 28 00:14:01 2019 -0600
xrender
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit b62cee51c7b22f6f150bfe04f9b28f024e641323
Merge: 3f021ea7 a6551f46
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Thu Apr 25 18:13:43 2019 -0600
Merge branch 'macos-gentz' of github.com:ZeGentzy/winit into macos-gentz
commit 3f021ea7f7ac6bc2a697a5b6e4e6424e838a2139
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Thu Apr 25 18:04:02 2019 -0600
Get rid of warnings.
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit a6551f4607ea0bc26df8716dee8115371ef367db
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Thu Apr 25 07:40:56 2019 -0600
Fix example
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit cbfda6c57e9740b49d2b496bda43197f611cb48c
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Wed Apr 24 23:47:46 2019 -0600
Fixes
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit 86bc86f3d3add4a6125aa9b2eca79061c0dfcd91
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Wed Apr 24 23:39:19 2019 -0600
Backport 9a23ec3c37 (diff-1d95fe39cdbaa708c975380a16c314cb)
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit 742a688efe2f0eeacc2ffbf49b1157c4aaffccbd
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Wed Apr 24 23:09:14 2019 -0600
Backports 45a4281413 (diff-1d95fe39cdbaa708c975380a16c314cb)
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit 6c81f2a517d4e2d5ba2ff3eddca030bce972cb2a
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Wed Apr 24 23:05:57 2019 -0600
Francesca's macos changes
Also backports bfbcab3a01 (diff-1d95fe39cdbaa708c975380a16c314cb)
commit 7c2e1300c26a0634ad505ce72b90eb6dc2fdcac7
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Apr 24 20:58:26 2019 -0600
Squashed commit of the following:
commit 5f4aa9f01a719eef98c6d894801c20ee8f96d30f
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 21 17:14:14 2018 -0500
Protect against reentrancy (messily)
commit b75073a5b2a8d65ab8806a00ffee390752255c8c
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 21 15:15:27 2018 -0500
Send resize events immediately
commit 8e9fc01bd6b404f59488b130413f48e4e5f89b0d
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 21 16:07:43 2018 -0500
Don't use struct for window delegate
commit c6853b0c4a8fe357f463604bb879dc1be424860e
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 19 21:17:48 2018 -0500
Split up util
commit 262c46b148413130fa239099f1151c1f1bd5c13c
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 19 20:55:00 2018 -0500
Use dispatch crate
commit 63152c2f475794d1a36a5b3687c777664d7d5613
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 19 20:29:13 2018 -0500
RedrawRequested
commit 27e475c7c78b059fd9b5e8350cd26756eecdfc94
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 19 19:24:44 2018 -0500
User events
commit 157418d7dedace9c571e977d98ea92464c3188b2
Author: Francesca Plebani <franplebani@gmail.com>
Date: Tue Dec 18 22:38:05 2018 -0500
Moved out cursor loading
commit b4925641c973979a38743202b4269efe09ac43b4
Author: Francesca Plebani <franplebani@gmail.com>
Date: Tue Dec 18 21:32:12 2018 -0500
Fixed a bunch of threading issues
commit 4aef63dfb78dfaf38c83cb0e88d4ea9d8d0578a6
Author: Francesca Plebani <franplebani@gmail.com>
Date: Mon Dec 17 13:54:59 2018 -0500
Wait works
commit 72ed426c695df5dc410902263bd74188059b8ddd
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 14 20:49:10 2018 -0500
Fixed drag and dropg
commit 658209f4a20acd536218f41a01fb8cbbebc705e0
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 14 20:42:42 2018 -0500
Made mutexes finer for less deadlock risk
commit 8e6b9866084690da900c4d058e412cab8ebb30c4
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 14 16:45:06 2018 -0500
Dump (encapsulate) everything into AppState
commit d2dc83df15939d89301e2cff0ffa2d98c48b406f
Author: Francesca Plebani <franplebani@gmail.com>
Date: Thu Dec 13 17:36:47 2018 -0500
All window events work!
commit 7c7fcc98872b3c35bd7767b5c6235a74bc105e06
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 12 17:11:09 2018 -0500
Very rough usage of CFRunLoop
commit 3c7a52ff4df683b5b7e1751e4051ec445a818774
Author: Francesca Plebani <franplebani@gmail.com>
Date: Tue Dec 11 15:45:23 2018 -0500
Fixed deadlocks
commit b74c7fe1bcd173e9b0c0e004956c257e805bc2a2
Author: Francesca Plebani <franplebani@gmail.com>
Date: Mon Dec 10 18:59:46 2018 -0500
Fix keyDown deadlock
commit 3798f9c1a4bef2a3d1552f846b26efc31b1bbb6c
Author: Francesca Plebani <franplebani@gmail.com>
Date: Mon Dec 10 18:44:40 2018 -0500
It builds!
commit 8c8620214357714c5cd0b3beefda6704512e3f64
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 7 21:09:55 2018 -0500
Horribly broken so far
commit 8269ed2a9270e5ec5b14f80fd21d1e0e6f51be29
Author: Osspial <osspial@gmail.com>
Date: Mon Nov 19 23:51:20 2018 -0500
Fix crash with runner refcell not getting dropped
commit 54ce6a21a0722e408ae49c74f5008005fc1e4cbf
Author: Osspial <osspial@gmail.com>
Date: Sun Nov 18 19:12:45 2018 -0500
Fix buffered events not getting dispatched
commit 2c18b804df66f49f93cfe722a679d6c5e01d8cb1
Author: Osspial <osspial@gmail.com>
Date: Sun Nov 18 18:51:24 2018 -0500
Fix thread executor not executing closure when called from non-loop thread
commit 5a3a5e2293cec3e566c4aac344ae7eaa343608b5
Author: Osspial <osspial@gmail.com>
Date: Thu Nov 15 22:43:59 2018 -0500
Fix some deadlocks that could occur when changing window state
commit 2a3cefd8c5df1c06127b05651cbdf5e3d9e3a6d3
Author: Osspial <osspial@gmail.com>
Date: Thu Nov 15 16:45:17 2018 -0500
Document and implement Debug for EventLoopWindowTarget
commit fa46825a289ca0587dc97f9c00dea5516fb4925a
Author: Osspial <osspial@gmail.com>
Date: Thu Nov 15 16:40:48 2018 -0500
Replace &EventLoop in callback with &EventLoopWindowTarget
commit 9f36a7a68e1dc379cf9091213dae2c3586d3e473
Author: Osspial <osspial@gmail.com>
Date: Wed Nov 14 21:28:38 2018 -0500
Fix freeze when setting decorations
commit d9c3daca9b459e02ef614568fe803a723965fe8d
Author: Osspial <osspial@gmail.com>
Date: Fri Nov 9 20:41:15 2018 -0500
Fix 1.24.1 build
commit 5289d22372046bac403a279c3641737c0cfc46d2
Author: Osspial <osspial@gmail.com>
Date: Fri Nov 9 00:00:27 2018 -0500
Remove serde implementations from ControlFlow
commit 92ac3d6ac7915923c22c380cc3a74c5f3830708e
Author: Osspial <osspial@gmail.com>
Date: Thu Nov 8 23:46:41 2018 -0500
Remove crossbeam dependency and make drop events work again
commit 8299eb2f03773a34079c61fc8adb51405aafc467
Author: Osspial <osspial@gmail.com>
Date: Thu Sep 13 22:39:40 2018 -0400
Fix crash when running in release mode
commit bb6ab1bb6e9595e90f1915fdde7e23904f2ba594
Author: Osspial <osspial@gmail.com>
Date: Sun Sep 9 14:28:16 2018 -0400
Fix unreachable panic after setting ControlFlow to Poll during some RedrawRequested events.
commit 5068ff4ee152bfe93c9190235f02d001202feb88
Author: Osspial <osspial@gmail.com>
Date: Sun Sep 9 14:14:28 2018 -0400
Improve clarity/fix typos in docs
commit 8ed575ff4a4f0961bb2e784bda1ae109c6bd37b7
Author: Osspial <osspial@gmail.com>
Date: Sun Sep 9 00:19:53 2018 -0400
Update send test and errors that broke some examples/APIs
commit bf7bfa82ebb5d6ae110ce0492c124ef462945f85
Author: Osspial <osspial@gmail.com>
Date: Wed Sep 5 22:36:05 2018 -0400
Fix resize lag when waiting in some situations
commit 70722cc4c322e3e599b3a03bce5058a5d433970b
Author: Osspial <osspial@gmail.com>
Date: Wed Sep 5 19:58:52 2018 -1100
When SendEvent is called during event closure, buffer events
commit 53370924b25da15ddd172173150b228065324864
Author: Osspial <osspial@gmail.com>
Date: Sun Aug 26 21:55:51 2018 -0400
Improve WaitUntil timer precision
commit a654400e730400c2e3584be2f47153043b5b7efe
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 21:06:19 2018 -0400
Add CHANGELOG entry
commit deb7d379b7c04e61d6d50ff655eccac0ad692e44
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 20:19:56 2018 -0400
Rename MonitorId to MonitorHandle
commit 8d8d9b7cd1386c99c40023d86e17d10c3fd6652f
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 20:16:52 2018 -0400
Change instances of "events_loop" to "event_loop"
commit 0f344087630ae252c9c8f453864e684a1a5405b1
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 20:13:53 2018 -0400
Improve docs for run and run_return
commit fba41f7a7ed8585cbb658b6d0b2f34f75482cb3d
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 19:09:53 2018 -0400
Small changes to examples
commit 42e8a0d2cf77af79da082fff7cd29cc8f52d99df
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 19:09:19 2018 -0400
Improve documentation
commit 4377680a44ea86dad52954f90bc7d8ad7ed0b4bf
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 23:01:36 2018 -0400
Re-organize into module structure
commit f20fac99f6ac57c51603a92d792fd4f665feb7f6
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 22:07:39 2018 -0400
Add platform::desktop module with EventLoopExt::run_return
commit dad24d086aaaff60e557efc4f41d1ae7e3c71738
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 18:03:41 2018 -0400
Rename os to platform, add Ext trait postfixes
commit 7df59c60a06008226f6455619e7242ed0156ed8d
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 17:59:36 2018 -0400
Rename platform to platform_impl
commit 99c0f84a9fc771c9c96099232de3716ddf27ca80
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 17:55:27 2018 -0400
Add request_redraw
commit a0fef1a5fad9b5d5da59fff191c7d9c398ea9e01
Author: Osspial <osspial@gmail.com>
Date: Mon Aug 20 01:47:11 2018 -0400
Fully invert windows control flow so win32 calls into winit's callback
commit 2c607ff87f8fbcad8aa9dc3783b3298c014dd177
Author: Osspial <osspial@gmail.com>
Date: Sun Aug 19 13:44:22 2018 -0400
Add ability to send custom user events
commit a0b2bb36953f018ff782cef8fc86c6db9343095d
Author: Osspial <osspial@gmail.com>
Date: Fri Aug 17 17:49:46 2018 -0400
Add StartCause::Init support, timer example
commit 02f922f003f56215b92b8feeb9148ad2dd181fc2
Author: Osspial <osspial@gmail.com>
Date: Fri Aug 17 17:31:04 2018 -0400
Implement new ControlFlow and associated events
commit 8b8a7675ec67e15a0f8f69db0bdeb79bee0ac20d
Author: Osspial <osspial@gmail.com>
Date: Fri Jul 13 01:48:26 2018 -0400
Replace windows Mutex with parking_lot Mutex
commit 9feada206f6b9fb1e9da118be6b77dfc217ace8d
Author: Osspial <osspial@gmail.com>
Date: Fri Jul 13 01:39:53 2018 -0400
Update run_forever to hijack thread
commit 2e83bac99cc264cd2723cb182feea84a0a15e08d
Author: Osspial <osspial@gmail.com>
Date: Thu Jul 12 23:43:58 2018 -0400
Remove second thread from win32 backend
commit 64b8a9c6a50362d10c074077a1e37b057f3e3c81
Author: Osspial <osspial@gmail.com>
Date: Thu Jul 12 22:13:07 2018 -0400
Rename WindowEvent::Refresh to WindowEvent::Redraw
commit 529c08555fd0b709a23d486211d28fbd0980fc94
Author: Osspial <osspial@gmail.com>
Date: Thu Jul 12 22:04:38 2018 -0400
Rename EventsLoop and associated types to EventLoop
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
Co-authored-by: Hal Gentz <zegentzy@protonmail.com>
commit cfb929ba0a9e787f8bb1a6dae4e05e4c7776bc97
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Thu Apr 25 07:40:56 2019 -0600
Fix example
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit 68d3317ff58381d55f5f9bd3db0860d66544fe12
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Wed Apr 24 23:47:46 2019 -0600
Fixes
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit 02d1aae4db27df054b703aa935ca118f31e17123
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Wed Apr 24 23:39:19 2019 -0600
Backport 9a23ec3c37 (diff-1d95fe39cdbaa708c975380a16c314cb)
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit dd9de5a6d444a9ab17afe470f4cf2a57e3ed76ae
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Wed Apr 24 23:09:14 2019 -0600
Backports 45a4281413 (diff-1d95fe39cdbaa708c975380a16c314cb)
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit 533e2adc1d1e417742475786635848b1620e476c
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Wed Apr 24 23:05:57 2019 -0600
Francesca's macos changes
Also backports bfbcab3a01 (diff-1d95fe39cdbaa708c975380a16c314cb)
commit 73b52221080bd3a881ae3a58c2dbb19bc8d954c6
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Wed Apr 24 20:58:26 2019 -0600
Squashed commit of the following:
commit 5f4aa9f01a719eef98c6d894801c20ee8f96d30f
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 21 17:14:14 2018 -0500
Protect against reentrancy (messily)
commit b75073a5b2a8d65ab8806a00ffee390752255c8c
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 21 15:15:27 2018 -0500
Send resize events immediately
commit 8e9fc01bd6b404f59488b130413f48e4e5f89b0d
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 21 16:07:43 2018 -0500
Don't use struct for window delegate
commit c6853b0c4a8fe357f463604bb879dc1be424860e
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 19 21:17:48 2018 -0500
Split up util
commit 262c46b148413130fa239099f1151c1f1bd5c13c
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 19 20:55:00 2018 -0500
Use dispatch crate
commit 63152c2f475794d1a36a5b3687c777664d7d5613
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 19 20:29:13 2018 -0500
RedrawRequested
commit 27e475c7c78b059fd9b5e8350cd26756eecdfc94
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 19 19:24:44 2018 -0500
User events
commit 157418d7dedace9c571e977d98ea92464c3188b2
Author: Francesca Plebani <franplebani@gmail.com>
Date: Tue Dec 18 22:38:05 2018 -0500
Moved out cursor loading
commit b4925641c973979a38743202b4269efe09ac43b4
Author: Francesca Plebani <franplebani@gmail.com>
Date: Tue Dec 18 21:32:12 2018 -0500
Fixed a bunch of threading issues
commit 4aef63dfb78dfaf38c83cb0e88d4ea9d8d0578a6
Author: Francesca Plebani <franplebani@gmail.com>
Date: Mon Dec 17 13:54:59 2018 -0500
Wait works
commit 72ed426c695df5dc410902263bd74188059b8ddd
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 14 20:49:10 2018 -0500
Fixed drag and dropg
commit 658209f4a20acd536218f41a01fb8cbbebc705e0
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 14 20:42:42 2018 -0500
Made mutexes finer for less deadlock risk
commit 8e6b9866084690da900c4d058e412cab8ebb30c4
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 14 16:45:06 2018 -0500
Dump (encapsulate) everything into AppState
commit d2dc83df15939d89301e2cff0ffa2d98c48b406f
Author: Francesca Plebani <franplebani@gmail.com>
Date: Thu Dec 13 17:36:47 2018 -0500
All window events work!
commit 7c7fcc98872b3c35bd7767b5c6235a74bc105e06
Author: Francesca Plebani <franplebani@gmail.com>
Date: Wed Dec 12 17:11:09 2018 -0500
Very rough usage of CFRunLoop
commit 3c7a52ff4df683b5b7e1751e4051ec445a818774
Author: Francesca Plebani <franplebani@gmail.com>
Date: Tue Dec 11 15:45:23 2018 -0500
Fixed deadlocks
commit b74c7fe1bcd173e9b0c0e004956c257e805bc2a2
Author: Francesca Plebani <franplebani@gmail.com>
Date: Mon Dec 10 18:59:46 2018 -0500
Fix keyDown deadlock
commit 3798f9c1a4bef2a3d1552f846b26efc31b1bbb6c
Author: Francesca Plebani <franplebani@gmail.com>
Date: Mon Dec 10 18:44:40 2018 -0500
It builds!
commit 8c8620214357714c5cd0b3beefda6704512e3f64
Author: Francesca Plebani <franplebani@gmail.com>
Date: Fri Dec 7 21:09:55 2018 -0500
Horribly broken so far
commit 8269ed2a9270e5ec5b14f80fd21d1e0e6f51be29
Author: Osspial <osspial@gmail.com>
Date: Mon Nov 19 23:51:20 2018 -0500
Fix crash with runner refcell not getting dropped
commit 54ce6a21a0722e408ae49c74f5008005fc1e4cbf
Author: Osspial <osspial@gmail.com>
Date: Sun Nov 18 19:12:45 2018 -0500
Fix buffered events not getting dispatched
commit 2c18b804df66f49f93cfe722a679d6c5e01d8cb1
Author: Osspial <osspial@gmail.com>
Date: Sun Nov 18 18:51:24 2018 -0500
Fix thread executor not executing closure when called from non-loop thread
commit 5a3a5e2293cec3e566c4aac344ae7eaa343608b5
Author: Osspial <osspial@gmail.com>
Date: Thu Nov 15 22:43:59 2018 -0500
Fix some deadlocks that could occur when changing window state
commit 2a3cefd8c5df1c06127b05651cbdf5e3d9e3a6d3
Author: Osspial <osspial@gmail.com>
Date: Thu Nov 15 16:45:17 2018 -0500
Document and implement Debug for EventLoopWindowTarget
commit fa46825a289ca0587dc97f9c00dea5516fb4925a
Author: Osspial <osspial@gmail.com>
Date: Thu Nov 15 16:40:48 2018 -0500
Replace &EventLoop in callback with &EventLoopWindowTarget
commit 9f36a7a68e1dc379cf9091213dae2c3586d3e473
Author: Osspial <osspial@gmail.com>
Date: Wed Nov 14 21:28:38 2018 -0500
Fix freeze when setting decorations
commit d9c3daca9b459e02ef614568fe803a723965fe8d
Author: Osspial <osspial@gmail.com>
Date: Fri Nov 9 20:41:15 2018 -0500
Fix 1.24.1 build
commit 5289d22372046bac403a279c3641737c0cfc46d2
Author: Osspial <osspial@gmail.com>
Date: Fri Nov 9 00:00:27 2018 -0500
Remove serde implementations from ControlFlow
commit 92ac3d6ac7915923c22c380cc3a74c5f3830708e
Author: Osspial <osspial@gmail.com>
Date: Thu Nov 8 23:46:41 2018 -0500
Remove crossbeam dependency and make drop events work again
commit 8299eb2f03773a34079c61fc8adb51405aafc467
Author: Osspial <osspial@gmail.com>
Date: Thu Sep 13 22:39:40 2018 -0400
Fix crash when running in release mode
commit bb6ab1bb6e9595e90f1915fdde7e23904f2ba594
Author: Osspial <osspial@gmail.com>
Date: Sun Sep 9 14:28:16 2018 -0400
Fix unreachable panic after setting ControlFlow to Poll during some RedrawRequested events.
commit 5068ff4ee152bfe93c9190235f02d001202feb88
Author: Osspial <osspial@gmail.com>
Date: Sun Sep 9 14:14:28 2018 -0400
Improve clarity/fix typos in docs
commit 8ed575ff4a4f0961bb2e784bda1ae109c6bd37b7
Author: Osspial <osspial@gmail.com>
Date: Sun Sep 9 00:19:53 2018 -0400
Update send test and errors that broke some examples/APIs
commit bf7bfa82ebb5d6ae110ce0492c124ef462945f85
Author: Osspial <osspial@gmail.com>
Date: Wed Sep 5 22:36:05 2018 -0400
Fix resize lag when waiting in some situations
commit 70722cc4c322e3e599b3a03bce5058a5d433970b
Author: Osspial <osspial@gmail.com>
Date: Wed Sep 5 19:58:52 2018 -1100
When SendEvent is called during event closure, buffer events
commit 53370924b25da15ddd172173150b228065324864
Author: Osspial <osspial@gmail.com>
Date: Sun Aug 26 21:55:51 2018 -0400
Improve WaitUntil timer precision
commit a654400e730400c2e3584be2f47153043b5b7efe
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 21:06:19 2018 -0400
Add CHANGELOG entry
commit deb7d379b7c04e61d6d50ff655eccac0ad692e44
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 20:19:56 2018 -0400
Rename MonitorId to MonitorHandle
commit 8d8d9b7cd1386c99c40023d86e17d10c3fd6652f
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 20:16:52 2018 -0400
Change instances of "events_loop" to "event_loop"
commit 0f344087630ae252c9c8f453864e684a1a5405b1
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 20:13:53 2018 -0400
Improve docs for run and run_return
commit fba41f7a7ed8585cbb658b6d0b2f34f75482cb3d
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 19:09:53 2018 -0400
Small changes to examples
commit 42e8a0d2cf77af79da082fff7cd29cc8f52d99df
Author: Osspial <osspial@gmail.com>
Date: Thu Aug 23 19:09:19 2018 -0400
Improve documentation
commit 4377680a44ea86dad52954f90bc7d8ad7ed0b4bf
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 23:01:36 2018 -0400
Re-organize into module structure
commit f20fac99f6ac57c51603a92d792fd4f665feb7f6
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 22:07:39 2018 -0400
Add platform::desktop module with EventLoopExt::run_return
commit dad24d086aaaff60e557efc4f41d1ae7e3c71738
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 18:03:41 2018 -0400
Rename os to platform, add Ext trait postfixes
commit 7df59c60a06008226f6455619e7242ed0156ed8d
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 17:59:36 2018 -0400
Rename platform to platform_impl
commit 99c0f84a9fc771c9c96099232de3716ddf27ca80
Author: Osspial <osspial@gmail.com>
Date: Wed Aug 22 17:55:27 2018 -0400
Add request_redraw
commit a0fef1a5fad9b5d5da59fff191c7d9c398ea9e01
Author: Osspial <osspial@gmail.com>
Date: Mon Aug 20 01:47:11 2018 -0400
Fully invert windows control flow so win32 calls into winit's callback
commit 2c607ff87f8fbcad8aa9dc3783b3298c014dd177
Author: Osspial <osspial@gmail.com>
Date: Sun Aug 19 13:44:22 2018 -0400
Add ability to send custom user events
commit a0b2bb36953f018ff782cef8fc86c6db9343095d
Author: Osspial <osspial@gmail.com>
Date: Fri Aug 17 17:49:46 2018 -0400
Add StartCause::Init support, timer example
commit 02f922f003f56215b92b8feeb9148ad2dd181fc2
Author: Osspial <osspial@gmail.com>
Date: Fri Aug 17 17:31:04 2018 -0400
Implement new ControlFlow and associated events
commit 8b8a7675ec67e15a0f8f69db0bdeb79bee0ac20d
Author: Osspial <osspial@gmail.com>
Date: Fri Jul 13 01:48:26 2018 -0400
Replace windows Mutex with parking_lot Mutex
commit 9feada206f6b9fb1e9da118be6b77dfc217ace8d
Author: Osspial <osspial@gmail.com>
Date: Fri Jul 13 01:39:53 2018 -0400
Update run_forever to hijack thread
commit 2e83bac99cc264cd2723cb182feea84a0a15e08d
Author: Osspial <osspial@gmail.com>
Date: Thu Jul 12 23:43:58 2018 -0400
Remove second thread from win32 backend
commit 64b8a9c6a50362d10c074077a1e37b057f3e3c81
Author: Osspial <osspial@gmail.com>
Date: Thu Jul 12 22:13:07 2018 -0400
Rename WindowEvent::Refresh to WindowEvent::Redraw
commit 529c08555fd0b709a23d486211d28fbd0980fc94
Author: Osspial <osspial@gmail.com>
Date: Thu Jul 12 22:04:38 2018 -0400
Rename EventsLoop and associated types to EventLoop
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit ab1dfaaaa53a3acd206bf494ac90e3fe130dc609
Author: Hal Gentz <zegentzy@protonmail.com>
Date: Tue Apr 23 21:52:17 2019 -0600
Minor
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
commit 7933209d603e0794adb806d9cf53507f1c2f1d3c
Author: Victor Berger <victor.berger@m4x.org>
Date: Thu Apr 18 09:10:41 2019 +0200
wayland/x11: Make ControlFlow::Exit sticky
commit 8355a7513e299ffba21062c8518bcf4bdb735ba9
Author: Victor Berger <victor.berger@m4x.org>
Date: Tue Apr 16 12:21:33 2019 +0200
x11: Implement run_return using calloop
commit f64edb60cc85fcd98a1cec955ba9980f617fdd73
Author: Victor Berger <victor.berger@m4x.org>
Date: Tue Apr 16 10:42:04 2019 +0200
x11: port to evl2 with stubs
commit be372898ddc60e47887c9a152c10ff498445f8cf
Author: Victor Berger <victor.berger@m4x.org>
Date: Mon Apr 15 17:35:59 2019 +0200
Fix compilation on Linux.
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
Co-authored-by: Francesca Plebani <franplebani@gmail.com>
273 lines
9.8 KiB
Rust
273 lines
9.8 KiB
Rust
use std::os::raw::c_ushort;
|
|
|
|
use cocoa::{appkit::{NSEvent, NSEventModifierFlags}, base::id};
|
|
|
|
use event::{
|
|
ElementState, KeyboardInput,
|
|
ModifiersState, VirtualKeyCode, WindowEvent,
|
|
};
|
|
use platform_impl::platform::DEVICE_ID;
|
|
|
|
pub fn char_to_keycode(c: char) -> Option<VirtualKeyCode> {
|
|
// We only translate keys that are affected by keyboard layout.
|
|
//
|
|
// Note that since keys are translated in a somewhat "dumb" way (reading character)
|
|
// there is a concern that some combination, i.e. Cmd+char, causes the wrong
|
|
// letter to be received, and so we receive the wrong key.
|
|
//
|
|
// Implementation reference: https://github.com/WebKit/webkit/blob/82bae82cf0f329dbe21059ef0986c4e92fea4ba6/Source/WebCore/platform/cocoa/KeyEventCocoa.mm#L626
|
|
Some(match c {
|
|
'a' | 'A' => VirtualKeyCode::A,
|
|
'b' | 'B' => VirtualKeyCode::B,
|
|
'c' | 'C' => VirtualKeyCode::C,
|
|
'd' | 'D' => VirtualKeyCode::D,
|
|
'e' | 'E' => VirtualKeyCode::E,
|
|
'f' | 'F' => VirtualKeyCode::F,
|
|
'g' | 'G' => VirtualKeyCode::G,
|
|
'h' | 'H' => VirtualKeyCode::H,
|
|
'i' | 'I' => VirtualKeyCode::I,
|
|
'j' | 'J' => VirtualKeyCode::J,
|
|
'k' | 'K' => VirtualKeyCode::K,
|
|
'l' | 'L' => VirtualKeyCode::L,
|
|
'm' | 'M' => VirtualKeyCode::M,
|
|
'n' | 'N' => VirtualKeyCode::N,
|
|
'o' | 'O' => VirtualKeyCode::O,
|
|
'p' | 'P' => VirtualKeyCode::P,
|
|
'q' | 'Q' => VirtualKeyCode::Q,
|
|
'r' | 'R' => VirtualKeyCode::R,
|
|
's' | 'S' => VirtualKeyCode::S,
|
|
't' | 'T' => VirtualKeyCode::T,
|
|
'u' | 'U' => VirtualKeyCode::U,
|
|
'v' | 'V' => VirtualKeyCode::V,
|
|
'w' | 'W' => VirtualKeyCode::W,
|
|
'x' | 'X' => VirtualKeyCode::X,
|
|
'y' | 'Y' => VirtualKeyCode::Y,
|
|
'z' | 'Z' => VirtualKeyCode::Z,
|
|
'1' | '!' => VirtualKeyCode::Key1,
|
|
'2' | '@' => VirtualKeyCode::Key2,
|
|
'3' | '#' => VirtualKeyCode::Key3,
|
|
'4' | '$' => VirtualKeyCode::Key4,
|
|
'5' | '%' => VirtualKeyCode::Key5,
|
|
'6' | '^' => VirtualKeyCode::Key6,
|
|
'7' | '&' => VirtualKeyCode::Key7,
|
|
'8' | '*' => VirtualKeyCode::Key8,
|
|
'9' | '(' => VirtualKeyCode::Key9,
|
|
'0' | ')' => VirtualKeyCode::Key0,
|
|
'=' | '+' => VirtualKeyCode::Equals,
|
|
'-' | '_' => VirtualKeyCode::Minus,
|
|
']' | '}' => VirtualKeyCode::RBracket,
|
|
'[' | '{' => VirtualKeyCode::LBracket,
|
|
'\''| '"' => VirtualKeyCode::Apostrophe,
|
|
';' | ':' => VirtualKeyCode::Semicolon,
|
|
'\\'| '|' => VirtualKeyCode::Backslash,
|
|
',' | '<' => VirtualKeyCode::Comma,
|
|
'/' | '?' => VirtualKeyCode::Slash,
|
|
'.' | '>' => VirtualKeyCode::Period,
|
|
'`' | '~' => VirtualKeyCode::Grave,
|
|
_ => return None,
|
|
})
|
|
}
|
|
|
|
pub fn scancode_to_keycode(scancode: c_ushort) -> Option<VirtualKeyCode> {
|
|
Some(match scancode {
|
|
0x00 => VirtualKeyCode::A,
|
|
0x01 => VirtualKeyCode::S,
|
|
0x02 => VirtualKeyCode::D,
|
|
0x03 => VirtualKeyCode::F,
|
|
0x04 => VirtualKeyCode::H,
|
|
0x05 => VirtualKeyCode::G,
|
|
0x06 => VirtualKeyCode::Z,
|
|
0x07 => VirtualKeyCode::X,
|
|
0x08 => VirtualKeyCode::C,
|
|
0x09 => VirtualKeyCode::V,
|
|
//0x0a => World 1,
|
|
0x0b => VirtualKeyCode::B,
|
|
0x0c => VirtualKeyCode::Q,
|
|
0x0d => VirtualKeyCode::W,
|
|
0x0e => VirtualKeyCode::E,
|
|
0x0f => VirtualKeyCode::R,
|
|
0x10 => VirtualKeyCode::Y,
|
|
0x11 => VirtualKeyCode::T,
|
|
0x12 => VirtualKeyCode::Key1,
|
|
0x13 => VirtualKeyCode::Key2,
|
|
0x14 => VirtualKeyCode::Key3,
|
|
0x15 => VirtualKeyCode::Key4,
|
|
0x16 => VirtualKeyCode::Key6,
|
|
0x17 => VirtualKeyCode::Key5,
|
|
0x18 => VirtualKeyCode::Equals,
|
|
0x19 => VirtualKeyCode::Key9,
|
|
0x1a => VirtualKeyCode::Key7,
|
|
0x1b => VirtualKeyCode::Minus,
|
|
0x1c => VirtualKeyCode::Key8,
|
|
0x1d => VirtualKeyCode::Key0,
|
|
0x1e => VirtualKeyCode::RBracket,
|
|
0x1f => VirtualKeyCode::O,
|
|
0x20 => VirtualKeyCode::U,
|
|
0x21 => VirtualKeyCode::LBracket,
|
|
0x22 => VirtualKeyCode::I,
|
|
0x23 => VirtualKeyCode::P,
|
|
0x24 => VirtualKeyCode::Return,
|
|
0x25 => VirtualKeyCode::L,
|
|
0x26 => VirtualKeyCode::J,
|
|
0x27 => VirtualKeyCode::Apostrophe,
|
|
0x28 => VirtualKeyCode::K,
|
|
0x29 => VirtualKeyCode::Semicolon,
|
|
0x2a => VirtualKeyCode::Backslash,
|
|
0x2b => VirtualKeyCode::Comma,
|
|
0x2c => VirtualKeyCode::Slash,
|
|
0x2d => VirtualKeyCode::N,
|
|
0x2e => VirtualKeyCode::M,
|
|
0x2f => VirtualKeyCode::Period,
|
|
0x30 => VirtualKeyCode::Tab,
|
|
0x31 => VirtualKeyCode::Space,
|
|
0x32 => VirtualKeyCode::Grave,
|
|
0x33 => VirtualKeyCode::Back,
|
|
//0x34 => unkown,
|
|
0x35 => VirtualKeyCode::Escape,
|
|
0x36 => VirtualKeyCode::RWin,
|
|
0x37 => VirtualKeyCode::LWin,
|
|
0x38 => VirtualKeyCode::LShift,
|
|
//0x39 => Caps lock,
|
|
0x3a => VirtualKeyCode::LAlt,
|
|
0x3b => VirtualKeyCode::LControl,
|
|
0x3c => VirtualKeyCode::RShift,
|
|
0x3d => VirtualKeyCode::RAlt,
|
|
0x3e => VirtualKeyCode::RControl,
|
|
//0x3f => Fn key,
|
|
0x40 => VirtualKeyCode::F17,
|
|
0x41 => VirtualKeyCode::Decimal,
|
|
//0x42 -> unkown,
|
|
0x43 => VirtualKeyCode::Multiply,
|
|
//0x44 => unkown,
|
|
0x45 => VirtualKeyCode::Add,
|
|
//0x46 => unkown,
|
|
0x47 => VirtualKeyCode::Numlock,
|
|
//0x48 => KeypadClear,
|
|
0x49 => VirtualKeyCode::VolumeUp,
|
|
0x4a => VirtualKeyCode::VolumeDown,
|
|
0x4b => VirtualKeyCode::Divide,
|
|
0x4c => VirtualKeyCode::NumpadEnter,
|
|
//0x4d => unkown,
|
|
0x4e => VirtualKeyCode::Subtract,
|
|
0x4f => VirtualKeyCode::F18,
|
|
0x50 => VirtualKeyCode::F19,
|
|
0x51 => VirtualKeyCode::NumpadEquals,
|
|
0x52 => VirtualKeyCode::Numpad0,
|
|
0x53 => VirtualKeyCode::Numpad1,
|
|
0x54 => VirtualKeyCode::Numpad2,
|
|
0x55 => VirtualKeyCode::Numpad3,
|
|
0x56 => VirtualKeyCode::Numpad4,
|
|
0x57 => VirtualKeyCode::Numpad5,
|
|
0x58 => VirtualKeyCode::Numpad6,
|
|
0x59 => VirtualKeyCode::Numpad7,
|
|
0x5a => VirtualKeyCode::F20,
|
|
0x5b => VirtualKeyCode::Numpad8,
|
|
0x5c => VirtualKeyCode::Numpad9,
|
|
0x5d => VirtualKeyCode::Yen,
|
|
//0x5e => JIS Ro,
|
|
//0x5f => unkown,
|
|
0x60 => VirtualKeyCode::F5,
|
|
0x61 => VirtualKeyCode::F6,
|
|
0x62 => VirtualKeyCode::F7,
|
|
0x63 => VirtualKeyCode::F3,
|
|
0x64 => VirtualKeyCode::F8,
|
|
0x65 => VirtualKeyCode::F9,
|
|
//0x66 => JIS Eisuu (macOS),
|
|
0x67 => VirtualKeyCode::F11,
|
|
//0x68 => JIS Kanna (macOS),
|
|
0x69 => VirtualKeyCode::F13,
|
|
0x6a => VirtualKeyCode::F16,
|
|
0x6b => VirtualKeyCode::F14,
|
|
//0x6c => unkown,
|
|
0x6d => VirtualKeyCode::F10,
|
|
//0x6e => unkown,
|
|
0x6f => VirtualKeyCode::F12,
|
|
//0x70 => unkown,
|
|
0x71 => VirtualKeyCode::F15,
|
|
0x72 => VirtualKeyCode::Insert,
|
|
0x73 => VirtualKeyCode::Home,
|
|
0x74 => VirtualKeyCode::PageUp,
|
|
0x75 => VirtualKeyCode::Delete,
|
|
0x76 => VirtualKeyCode::F4,
|
|
0x77 => VirtualKeyCode::End,
|
|
0x78 => VirtualKeyCode::F2,
|
|
0x79 => VirtualKeyCode::PageDown,
|
|
0x7a => VirtualKeyCode::F1,
|
|
0x7b => VirtualKeyCode::Left,
|
|
0x7c => VirtualKeyCode::Right,
|
|
0x7d => VirtualKeyCode::Down,
|
|
0x7e => VirtualKeyCode::Up,
|
|
//0x7f => unkown,
|
|
|
|
0xa => VirtualKeyCode::Caret,
|
|
_ => return None,
|
|
})
|
|
}
|
|
|
|
// While F1-F20 have scancodes we can match on, we have to check against UTF-16
|
|
// constants for the rest.
|
|
// https://developer.apple.com/documentation/appkit/1535851-function-key_unicodes?preferredLanguage=occ
|
|
pub fn check_function_keys(string: &String) -> Option<VirtualKeyCode> {
|
|
if let Some(ch) = string.encode_utf16().next() {
|
|
return Some(match ch {
|
|
0xf718 => VirtualKeyCode::F21,
|
|
0xf719 => VirtualKeyCode::F22,
|
|
0xf71a => VirtualKeyCode::F23,
|
|
0xf71b => VirtualKeyCode::F24,
|
|
_ => return None,
|
|
})
|
|
}
|
|
|
|
None
|
|
}
|
|
|
|
pub fn event_mods(event: id) -> ModifiersState {
|
|
let flags = unsafe {
|
|
NSEvent::modifierFlags(event)
|
|
};
|
|
ModifiersState {
|
|
shift: flags.contains(NSEventModifierFlags::NSShiftKeyMask),
|
|
ctrl: flags.contains(NSEventModifierFlags::NSControlKeyMask),
|
|
alt: flags.contains(NSEventModifierFlags::NSAlternateKeyMask),
|
|
logo: flags.contains(NSEventModifierFlags::NSCommandKeyMask),
|
|
}
|
|
}
|
|
|
|
pub fn get_scancode(event: cocoa::base::id) -> c_ushort {
|
|
// In AppKit, `keyCode` refers to the position (scancode) of a key rather than its character,
|
|
// and there is no easy way to navtively retrieve the layout-dependent character.
|
|
// In winit, we use keycode to refer to the key's character, and so this function aligns
|
|
// AppKit's terminology with ours.
|
|
unsafe {
|
|
msg_send![event, keyCode]
|
|
}
|
|
}
|
|
|
|
pub unsafe fn modifier_event(
|
|
ns_event: id,
|
|
keymask: NSEventModifierFlags,
|
|
was_key_pressed: bool,
|
|
) -> Option<WindowEvent> {
|
|
if !was_key_pressed && NSEvent::modifierFlags(ns_event).contains(keymask)
|
|
|| was_key_pressed && !NSEvent::modifierFlags(ns_event).contains(keymask) {
|
|
let state = if was_key_pressed {
|
|
ElementState::Released
|
|
} else {
|
|
ElementState::Pressed
|
|
};
|
|
|
|
let scancode = get_scancode(ns_event);
|
|
let virtual_keycode = scancode_to_keycode(scancode);
|
|
Some(WindowEvent::KeyboardInput {
|
|
device_id: DEVICE_ID,
|
|
input: KeyboardInput {
|
|
state,
|
|
scancode: scancode as _,
|
|
virtual_keycode,
|
|
modifiers: event_mods(ns_event),
|
|
},
|
|
})
|
|
} else {
|
|
None
|
|
}
|
|
}
|