Squashed commit of the following: (#853)
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>
This commit is contained in:
Hal Gentz
Osspial
parent
94f998af0a
commit
d5391686ae
28 changed files with 3303 additions and 2147 deletions
460
src/platform_impl/macos/window_delegate.rs
Normal file
460
src/platform_impl/macos/window_delegate.rs
Normal file
|
|
@ -0,0 +1,460 @@
|
|||
use std::{f64, os::raw::c_void, sync::{Arc, Weak}};
|
||||
|
||||
use cocoa::{
|
||||
appkit::{self, NSView, NSWindow}, base::{id, nil},
|
||||
foundation::NSAutoreleasePool,
|
||||
};
|
||||
use objc::{runtime::{Class, Object, Sel, BOOL, YES, NO}, declare::ClassDecl};
|
||||
|
||||
use {dpi::LogicalSize, event::{Event, WindowEvent}, window::WindowId};
|
||||
use platform_impl::platform::{
|
||||
app_state::AppState, util::{self, IdRef},
|
||||
window::{get_window_id, UnownedWindow},
|
||||
};
|
||||
|
||||
pub struct WindowDelegateState {
|
||||
nswindow: IdRef, // never changes
|
||||
nsview: IdRef, // never changes
|
||||
|
||||
window: Weak<UnownedWindow>,
|
||||
|
||||
// TODO: It's possible for delegate methods to be called asynchronously,
|
||||
// causing data races / `RefCell` panics.
|
||||
|
||||
// This is set when WindowBuilder::with_fullscreen was set,
|
||||
// see comments of `window_did_fail_to_enter_fullscreen`
|
||||
initial_fullscreen: bool,
|
||||
|
||||
// During `windowDidResize`, we use this to only send Moved if the position changed.
|
||||
previous_position: Option<(f64, f64)>,
|
||||
|
||||
// Used to prevent redundant events.
|
||||
previous_dpi_factor: f64,
|
||||
}
|
||||
|
||||
impl WindowDelegateState {
|
||||
pub fn new(
|
||||
window: &Arc<UnownedWindow>,
|
||||
initial_fullscreen: bool,
|
||||
) -> Self {
|
||||
let dpi_factor = window.get_hidpi_factor();
|
||||
|
||||
let mut delegate_state = WindowDelegateState {
|
||||
nswindow: window.nswindow.clone(),
|
||||
nsview: window.nsview.clone(),
|
||||
window: Arc::downgrade(&window),
|
||||
initial_fullscreen,
|
||||
previous_position: None,
|
||||
previous_dpi_factor: dpi_factor,
|
||||
};
|
||||
|
||||
if dpi_factor != 1.0 {
|
||||
delegate_state.emit_event(WindowEvent::HiDpiFactorChanged(dpi_factor));
|
||||
delegate_state.emit_resize_event();
|
||||
}
|
||||
|
||||
delegate_state
|
||||
}
|
||||
|
||||
fn with_window<F, T>(&mut self, callback: F) -> Option<T>
|
||||
where F: FnOnce(&UnownedWindow) -> T
|
||||
{
|
||||
self.window
|
||||
.upgrade()
|
||||
.map(|ref window| callback(window))
|
||||
}
|
||||
|
||||
pub fn emit_event(&mut self, event: WindowEvent) {
|
||||
let event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(*self.nswindow)),
|
||||
event,
|
||||
};
|
||||
AppState::queue_event(event);
|
||||
}
|
||||
|
||||
pub fn emit_resize_event(&mut self) {
|
||||
let rect = unsafe { NSView::frame(*self.nsview) };
|
||||
let size = LogicalSize::new(rect.size.width as f64, rect.size.height as f64);
|
||||
let event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(*self.nswindow)),
|
||||
event: WindowEvent::Resized(size),
|
||||
};
|
||||
AppState::send_event_immediately(event);
|
||||
}
|
||||
|
||||
fn emit_move_event(&mut self) {
|
||||
let rect = unsafe { NSWindow::frame(*self.nswindow) };
|
||||
let x = rect.origin.x as f64;
|
||||
let y = util::bottom_left_to_top_left(rect);
|
||||
let moved = self.previous_position != Some((x, y));
|
||||
if moved {
|
||||
self.previous_position = Some((x, y));
|
||||
self.emit_event(WindowEvent::Moved((x, y).into()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_delegate(window: &Arc<UnownedWindow>, initial_fullscreen: bool) -> IdRef {
|
||||
let state = WindowDelegateState::new(window, initial_fullscreen);
|
||||
unsafe {
|
||||
// This is free'd in `dealloc`
|
||||
let state_ptr = Box::into_raw(Box::new(state)) as *mut c_void;
|
||||
let delegate: id = msg_send![WINDOW_DELEGATE_CLASS.0, alloc];
|
||||
IdRef::new(msg_send![delegate, initWithWinit:state_ptr])
|
||||
}
|
||||
}
|
||||
|
||||
struct WindowDelegateClass(*const Class);
|
||||
unsafe impl Send for WindowDelegateClass {}
|
||||
unsafe impl Sync for WindowDelegateClass {}
|
||||
|
||||
lazy_static! {
|
||||
static ref WINDOW_DELEGATE_CLASS: WindowDelegateClass = unsafe {
|
||||
let superclass = class!(NSResponder);
|
||||
let mut decl = ClassDecl::new("WinitWindowDelegate", superclass).unwrap();
|
||||
|
||||
decl.add_method(
|
||||
sel!(dealloc),
|
||||
dealloc as extern fn(&Object, Sel),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(initWithWinit:),
|
||||
init_with_winit as extern fn(&Object, Sel, *mut c_void) -> id,
|
||||
);
|
||||
|
||||
decl.add_method(
|
||||
sel!(windowShouldClose:),
|
||||
window_should_close as extern fn(&Object, Sel, id) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(windowWillClose:),
|
||||
window_will_close as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(windowDidResize:),
|
||||
window_did_resize as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(windowDidMove:),
|
||||
window_did_move as extern fn(&Object, Sel, id));
|
||||
decl.add_method(
|
||||
sel!(windowDidChangeScreen:),
|
||||
window_did_change_screen as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(windowDidChangeBackingProperties:),
|
||||
window_did_change_backing_properties as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(windowDidBecomeKey:),
|
||||
window_did_become_key as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(windowDidResignKey:),
|
||||
window_did_resign_key as extern fn(&Object, Sel, id),
|
||||
);
|
||||
|
||||
decl.add_method(
|
||||
sel!(draggingEntered:),
|
||||
dragging_entered as extern fn(&Object, Sel, id) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(prepareForDragOperation:),
|
||||
prepare_for_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(performDragOperation:),
|
||||
perform_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(concludeDragOperation:),
|
||||
conclude_drag_operation as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(draggingExited:),
|
||||
dragging_exited as extern fn(&Object, Sel, id),
|
||||
);
|
||||
|
||||
decl.add_method(
|
||||
sel!(windowDidEnterFullScreen:),
|
||||
window_did_enter_fullscreen as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(windowWillEnterFullScreen:),
|
||||
window_will_enter_fullscreen as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(windowDidExitFullScreen:),
|
||||
window_did_exit_fullscreen as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(windowDidFailToEnterFullScreen:),
|
||||
window_did_fail_to_enter_fullscreen as extern fn(&Object, Sel, id),
|
||||
);
|
||||
|
||||
decl.add_ivar::<*mut c_void>("winitState");
|
||||
WindowDelegateClass(decl.register())
|
||||
};
|
||||
}
|
||||
|
||||
// This function is definitely unsafe, but labeling that would increase
|
||||
// boilerplate and wouldn't really clarify anything...
|
||||
fn with_state<F: FnOnce(&mut WindowDelegateState) -> T, T>(this: &Object, callback: F) {
|
||||
let state_ptr = unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
&mut *(state_ptr as *mut WindowDelegateState)
|
||||
};
|
||||
callback(state_ptr);
|
||||
}
|
||||
|
||||
extern fn dealloc(this: &Object, _sel: Sel) {
|
||||
with_state(this, |state| unsafe {
|
||||
Box::from_raw(state as *mut WindowDelegateState);
|
||||
});
|
||||
}
|
||||
|
||||
extern fn init_with_winit(this: &Object, _sel: Sel, state: *mut c_void) -> id {
|
||||
unsafe {
|
||||
let this: id = msg_send![this, init];
|
||||
if this != nil {
|
||||
(*this).set_ivar("winitState", state);
|
||||
with_state(&*this, |state| {
|
||||
let () = msg_send![*state.nswindow, setDelegate:this];
|
||||
});
|
||||
}
|
||||
this
|
||||
}
|
||||
}
|
||||
|
||||
extern fn window_should_close(this: &Object, _: Sel, _: id) -> BOOL {
|
||||
trace!("Triggered `windowShouldClose:`");
|
||||
with_state(this, |state| state.emit_event(WindowEvent::CloseRequested));
|
||||
trace!("Completed `windowShouldClose:`");
|
||||
NO
|
||||
}
|
||||
|
||||
extern fn window_will_close(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowWillClose:`");
|
||||
with_state(this, |state| unsafe {
|
||||
// `setDelegate:` retains the previous value and then autoreleases it
|
||||
let pool = NSAutoreleasePool::new(nil);
|
||||
// Since El Capitan, we need to be careful that delegate methods can't
|
||||
// be called after the window closes.
|
||||
let () = msg_send![*state.nswindow, setDelegate:nil];
|
||||
pool.drain();
|
||||
state.emit_event(WindowEvent::Destroyed);
|
||||
});
|
||||
trace!("Completed `windowWillClose:`");
|
||||
}
|
||||
|
||||
extern fn window_did_resize(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowDidResize:`");
|
||||
with_state(this, |state| {
|
||||
state.emit_resize_event();
|
||||
state.emit_move_event();
|
||||
});
|
||||
trace!("Completed `windowDidResize:`");
|
||||
}
|
||||
|
||||
// This won't be triggered if the move was part of a resize.
|
||||
extern fn window_did_move(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowDidMove:`");
|
||||
with_state(this, |state| {
|
||||
state.emit_move_event();
|
||||
});
|
||||
trace!("Completed `windowDidMove:`");
|
||||
}
|
||||
|
||||
extern fn window_did_change_screen(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowDidChangeScreen:`");
|
||||
with_state(this, |state| {
|
||||
let dpi_factor = unsafe {
|
||||
NSWindow::backingScaleFactor(*state.nswindow)
|
||||
} as f64;
|
||||
if state.previous_dpi_factor != dpi_factor {
|
||||
state.previous_dpi_factor = dpi_factor;
|
||||
state.emit_event(WindowEvent::HiDpiFactorChanged(dpi_factor));
|
||||
state.emit_resize_event();
|
||||
}
|
||||
});
|
||||
trace!("Completed `windowDidChangeScreen:`");
|
||||
}
|
||||
|
||||
// This will always be called before `window_did_change_screen`.
|
||||
extern fn window_did_change_backing_properties(this: &Object, _:Sel, _:id) {
|
||||
trace!("Triggered `windowDidChangeBackingProperties:`");
|
||||
with_state(this, |state| {
|
||||
let dpi_factor = unsafe {
|
||||
NSWindow::backingScaleFactor(*state.nswindow)
|
||||
} as f64;
|
||||
if state.previous_dpi_factor != dpi_factor {
|
||||
state.previous_dpi_factor = dpi_factor;
|
||||
state.emit_event(WindowEvent::HiDpiFactorChanged(dpi_factor));
|
||||
state.emit_resize_event();
|
||||
}
|
||||
});
|
||||
trace!("Completed `windowDidChangeBackingProperties:`");
|
||||
}
|
||||
|
||||
extern fn window_did_become_key(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowDidBecomeKey:`");
|
||||
with_state(this, |state| {
|
||||
// TODO: center the cursor if the window had mouse grab when it
|
||||
// lost focus
|
||||
state.emit_event(WindowEvent::Focused(true));
|
||||
});
|
||||
trace!("Completed `windowDidBecomeKey:`");
|
||||
}
|
||||
|
||||
extern fn window_did_resign_key(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowDidResignKey:`");
|
||||
with_state(this, |state| {
|
||||
state.emit_event(WindowEvent::Focused(false));
|
||||
});
|
||||
trace!("Completed `windowDidResignKey:`");
|
||||
}
|
||||
|
||||
/// Invoked when the dragged image enters destination bounds or frame
|
||||
extern fn dragging_entered(this: &Object, _: Sel, sender: id) -> BOOL {
|
||||
trace!("Triggered `draggingEntered:`");
|
||||
|
||||
use cocoa::appkit::NSPasteboard;
|
||||
use cocoa::foundation::NSFastEnumeration;
|
||||
use std::path::PathBuf;
|
||||
|
||||
let pb: id = unsafe { msg_send![sender, draggingPasteboard] };
|
||||
let filenames = unsafe { NSPasteboard::propertyListForType(pb, appkit::NSFilenamesPboardType) };
|
||||
|
||||
for file in unsafe { filenames.iter() } {
|
||||
use cocoa::foundation::NSString;
|
||||
use std::ffi::CStr;
|
||||
|
||||
unsafe {
|
||||
let f = NSString::UTF8String(file);
|
||||
let path = CStr::from_ptr(f).to_string_lossy().into_owned();
|
||||
|
||||
with_state(this, |state| {
|
||||
state.emit_event(WindowEvent::HoveredFile(PathBuf::from(path)));
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
trace!("Completed `draggingEntered:`");
|
||||
YES
|
||||
}
|
||||
|
||||
/// Invoked when the image is released
|
||||
extern fn prepare_for_drag_operation(_: &Object, _: Sel, _: id) -> BOOL {
|
||||
trace!("Triggered `prepareForDragOperation:`");
|
||||
trace!("Completed `prepareForDragOperation:`");
|
||||
YES
|
||||
}
|
||||
|
||||
/// Invoked after the released image has been removed from the screen
|
||||
extern fn perform_drag_operation(this: &Object, _: Sel, sender: id) -> BOOL {
|
||||
trace!("Triggered `performDragOperation:`");
|
||||
|
||||
use cocoa::appkit::NSPasteboard;
|
||||
use cocoa::foundation::NSFastEnumeration;
|
||||
use std::path::PathBuf;
|
||||
|
||||
let pb: id = unsafe { msg_send![sender, draggingPasteboard] };
|
||||
let filenames = unsafe { NSPasteboard::propertyListForType(pb, appkit::NSFilenamesPboardType) };
|
||||
|
||||
for file in unsafe { filenames.iter() } {
|
||||
use cocoa::foundation::NSString;
|
||||
use std::ffi::CStr;
|
||||
|
||||
unsafe {
|
||||
let f = NSString::UTF8String(file);
|
||||
let path = CStr::from_ptr(f).to_string_lossy().into_owned();
|
||||
|
||||
with_state(this, |state| {
|
||||
state.emit_event(WindowEvent::DroppedFile(PathBuf::from(path)));
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
trace!("Completed `performDragOperation:`");
|
||||
YES
|
||||
}
|
||||
|
||||
/// Invoked when the dragging operation is complete
|
||||
extern fn conclude_drag_operation(_: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `concludeDragOperation:`");
|
||||
trace!("Completed `concludeDragOperation:`");
|
||||
}
|
||||
|
||||
/// Invoked when the dragging operation is cancelled
|
||||
extern fn dragging_exited(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `draggingExited:`");
|
||||
with_state(this, |state| state.emit_event(WindowEvent::HoveredFileCancelled));
|
||||
trace!("Completed `draggingExited:`");
|
||||
}
|
||||
|
||||
/// Invoked when before enter fullscreen
|
||||
extern fn window_will_enter_fullscreen(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowWillEnterFullscreen:`");
|
||||
with_state(this, |state| state.with_window(|window| {
|
||||
trace!("Locked shared state in `window_will_enter_fullscreen`");
|
||||
window.shared_state.lock().unwrap().maximized = window.is_zoomed();
|
||||
trace!("Unlocked shared state in `window_will_enter_fullscreen`");
|
||||
}));
|
||||
trace!("Completed `windowWillEnterFullscreen:`");
|
||||
}
|
||||
|
||||
/// Invoked when entered fullscreen
|
||||
extern fn window_did_enter_fullscreen(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowDidEnterFullscreen:`");
|
||||
with_state(this, |state| {
|
||||
state.with_window(|window| {
|
||||
let monitor = window.get_current_monitor();
|
||||
trace!("Locked shared state in `window_did_enter_fullscreen`");
|
||||
window.shared_state.lock().unwrap().fullscreen = Some(monitor);
|
||||
trace!("Unlocked shared state in `window_will_enter_fullscreen`");
|
||||
});
|
||||
state.initial_fullscreen = false;
|
||||
});
|
||||
trace!("Completed `windowDidEnterFullscreen:`");
|
||||
}
|
||||
|
||||
/// Invoked when exited fullscreen
|
||||
extern fn window_did_exit_fullscreen(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowDidExitFullscreen:`");
|
||||
with_state(this, |state| state.with_window(|window| {
|
||||
window.restore_state_from_fullscreen();
|
||||
}));
|
||||
trace!("Completed `windowDidExitFullscreen:`");
|
||||
}
|
||||
|
||||
/// Invoked when fail to enter fullscreen
|
||||
///
|
||||
/// When this window launch from a fullscreen app (e.g. launch from VS Code
|
||||
/// terminal), it creates a new virtual destkop and a transition animation.
|
||||
/// This animation takes one second and cannot be disable without
|
||||
/// elevated privileges. In this animation time, all toggleFullscreen events
|
||||
/// will be failed. In this implementation, we will try again by using
|
||||
/// performSelector:withObject:afterDelay: until window_did_enter_fullscreen.
|
||||
/// It should be fine as we only do this at initialzation (i.e with_fullscreen
|
||||
/// was set).
|
||||
///
|
||||
/// From Apple doc:
|
||||
/// In some cases, the transition to enter full-screen mode can fail,
|
||||
/// due to being in the midst of handling some other animation or user gesture.
|
||||
/// This method indicates that there was an error, and you should clean up any
|
||||
/// work you may have done to prepare to enter full-screen mode.
|
||||
extern fn window_did_fail_to_enter_fullscreen(this: &Object, _: Sel, _: id) {
|
||||
trace!("Triggered `windowDidFailToEnterFullscreen:`");
|
||||
with_state(this, |state| {
|
||||
if state.initial_fullscreen {
|
||||
let _: () = unsafe { msg_send![*state.nswindow,
|
||||
performSelector:sel!(toggleFullScreen:)
|
||||
withObject:nil
|
||||
afterDelay: 0.5
|
||||
] };
|
||||
} else {
|
||||
state.with_window(|window| window.restore_state_from_fullscreen());
|
||||
}
|
||||
});
|
||||
trace!("Completed `windowDidFailToEnterFullscreen:`");
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue