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
|
|
@ -1,66 +1,74 @@
|
|||
// This is a pretty close port of the implementation in GLFW:
|
||||
// https://github.com/glfw/glfw/blob/7ef34eb06de54dd9186d3d21a401b2ef819b59e7/src/cocoa_window.m
|
||||
use std::{
|
||||
boxed::Box, collections::VecDeque, os::raw::*, slice, str,
|
||||
sync::{Arc, Mutex, Weak},
|
||||
};
|
||||
|
||||
use std::{slice, str};
|
||||
use std::boxed::Box;
|
||||
use std::collections::VecDeque;
|
||||
use std::os::raw::*;
|
||||
use std::sync::{Arc, Mutex, Weak};
|
||||
use cocoa::{
|
||||
appkit::{NSApp, NSEvent, NSEventModifierFlags, NSEventPhase, NSView, NSWindow},
|
||||
base::{id, nil}, foundation::{NSPoint, NSRect, NSSize, NSString, NSUInteger},
|
||||
};
|
||||
use objc::{declare::ClassDecl, runtime::{BOOL, Class, NO, Object, Protocol, Sel, YES}};
|
||||
|
||||
use cocoa::base::{id, nil};
|
||||
use cocoa::appkit::{NSEvent, NSView, NSWindow};
|
||||
use cocoa::foundation::{NSPoint, NSRect, NSSize, NSString, NSUInteger};
|
||||
use objc::declare::ClassDecl;
|
||||
use objc::runtime::{Class, Object, Protocol, Sel, BOOL, YES};
|
||||
use {
|
||||
event::{
|
||||
DeviceEvent, ElementState, Event, KeyboardInput, MouseButton,
|
||||
MouseScrollDelta, TouchPhase, VirtualKeyCode, WindowEvent,
|
||||
},
|
||||
window::WindowId,
|
||||
};
|
||||
use platform_impl::platform::{
|
||||
app_state::AppState, DEVICE_ID,
|
||||
event::{check_function_keys, event_mods, modifier_event, char_to_keycode, get_scancode, scancode_to_keycode},
|
||||
util::{self, IdRef}, ffi::*, window::get_window_id,
|
||||
};
|
||||
|
||||
use {ElementState, Event, KeyboardInput, MouseButton, WindowEvent, WindowId};
|
||||
use platform_impl::platform::event_loop::{DEVICE_ID, event_mods, Shared, to_virtual_key_code, check_additional_virtual_key_codes, get_scancode};
|
||||
use platform_impl::platform::util;
|
||||
use platform_impl::platform::ffi::*;
|
||||
use platform_impl::platform::window::{get_window_id, IdRef};
|
||||
use event;
|
||||
#[derive(Default)]
|
||||
struct Modifiers {
|
||||
shift_pressed: bool,
|
||||
ctrl_pressed: bool,
|
||||
win_pressed: bool,
|
||||
alt_pressed: bool,
|
||||
}
|
||||
|
||||
struct ViewState {
|
||||
window: id,
|
||||
shared: Weak<Shared>,
|
||||
cursor: Arc<Mutex<util::Cursor>>,
|
||||
nswindow: id,
|
||||
pub cursor: Arc<Mutex<util::Cursor>>,
|
||||
ime_spot: Option<(f64, f64)>,
|
||||
raw_characters: Option<String>,
|
||||
is_key_down: bool,
|
||||
modifiers: Modifiers,
|
||||
}
|
||||
|
||||
pub fn new_view(window: id, shared: Weak<Shared>) -> (IdRef, Weak<Mutex<util::Cursor>>) {
|
||||
pub fn new_view(nswindow: id) -> (IdRef, Weak<Mutex<util::Cursor>>) {
|
||||
let cursor = Default::default();
|
||||
let cursor_access = Arc::downgrade(&cursor);
|
||||
let state = ViewState {
|
||||
window,
|
||||
shared,
|
||||
nswindow,
|
||||
cursor,
|
||||
ime_spot: None,
|
||||
raw_characters: None,
|
||||
is_key_down: false,
|
||||
modifiers: Default::default(),
|
||||
};
|
||||
unsafe {
|
||||
// This is free'd in `dealloc`
|
||||
let state_ptr = Box::into_raw(Box::new(state)) as *mut c_void;
|
||||
let view: id = msg_send![VIEW_CLASS.0, alloc];
|
||||
(IdRef::new(msg_send![view, initWithWinit:state_ptr]), cursor_access)
|
||||
let nsview: id = msg_send![VIEW_CLASS.0, alloc];
|
||||
(IdRef::new(msg_send![nsview, initWithWinit:state_ptr]), cursor_access)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_ime_spot(view: id, input_context: id, x: f64, y: f64) {
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *(*view).get_mut_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
let content_rect = NSWindow::contentRectForFrameRect_(
|
||||
state.window,
|
||||
NSWindow::frame(state.window),
|
||||
);
|
||||
let base_x = content_rect.origin.x as f64;
|
||||
let base_y = (content_rect.origin.y + content_rect.size.height) as f64;
|
||||
state.ime_spot = Some((base_x + x, base_y - y));
|
||||
let _: () = msg_send![input_context, invalidateCharacterCoordinates];
|
||||
}
|
||||
pub unsafe fn set_ime_spot(nsview: id, input_context: id, x: f64, y: f64) {
|
||||
let state_ptr: *mut c_void = *(*nsview).get_mut_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
let content_rect = NSWindow::contentRectForFrameRect_(
|
||||
state.nswindow,
|
||||
NSWindow::frame(state.nswindow),
|
||||
);
|
||||
let base_x = content_rect.origin.x as f64;
|
||||
let base_y = (content_rect.origin.y + content_rect.size.height) as f64;
|
||||
state.ime_spot = Some((base_x + x, base_y - y));
|
||||
let _: () = msg_send![input_context, invalidateCharacterCoordinates];
|
||||
}
|
||||
|
||||
struct ViewClass(*const Class);
|
||||
|
|
@ -71,38 +79,61 @@ lazy_static! {
|
|||
static ref VIEW_CLASS: ViewClass = unsafe {
|
||||
let superclass = class!(NSView);
|
||||
let mut decl = ClassDecl::new("WinitView", superclass).unwrap();
|
||||
decl.add_method(sel!(dealloc), dealloc as extern fn(&Object, Sel));
|
||||
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!(viewDidMoveToWindow),
|
||||
view_did_move_to_window as extern fn(&Object, Sel),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(drawRect:),
|
||||
draw_rect as extern fn(&Object, Sel, NSRect),
|
||||
draw_rect as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(acceptsFirstResponder),
|
||||
accepts_first_responder as extern fn(&Object, Sel) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(touchBar),
|
||||
touch_bar as extern fn(&Object, Sel) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(resetCursorRects),
|
||||
reset_cursor_rects as extern fn(&Object, Sel),
|
||||
);
|
||||
decl.add_method(sel!(hasMarkedText), has_marked_text as extern fn(&Object, Sel) -> BOOL);
|
||||
decl.add_method(
|
||||
sel!(hasMarkedText),
|
||||
has_marked_text as extern fn(&Object, Sel) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(markedRange),
|
||||
marked_range as extern fn(&Object, Sel) -> NSRange,
|
||||
);
|
||||
decl.add_method(sel!(selectedRange), selected_range as extern fn(&Object, Sel) -> NSRange);
|
||||
decl.add_method(
|
||||
sel!(selectedRange),
|
||||
selected_range as extern fn(&Object, Sel) -> NSRange,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(setMarkedText:selectedRange:replacementRange:),
|
||||
set_marked_text as extern fn(&mut Object, Sel, id, NSRange, NSRange),
|
||||
);
|
||||
decl.add_method(sel!(unmarkText), unmark_text as extern fn(&Object, Sel));
|
||||
decl.add_method(
|
||||
sel!(unmarkText),
|
||||
unmark_text as extern fn(&Object, Sel),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(validAttributesForMarkedText),
|
||||
valid_attributes_for_marked_text as extern fn(&Object, Sel) -> id,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(attributedSubstringForProposedRange:actualRange:),
|
||||
attributed_substring_for_proposed_range
|
||||
as extern fn(&Object, Sel, NSRange, *mut c_void) -> id,
|
||||
attributed_substring_for_proposed_range as extern fn(&Object, Sel, NSRange, *mut c_void) -> id,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(insertText:replacementRange:),
|
||||
|
|
@ -114,28 +145,96 @@ lazy_static! {
|
|||
);
|
||||
decl.add_method(
|
||||
sel!(firstRectForCharacterRange:actualRange:),
|
||||
first_rect_for_character_range
|
||||
as extern fn(&Object, Sel, NSRange, *mut c_void) -> NSRect,
|
||||
first_rect_for_character_range as extern fn(&Object, Sel, NSRange, *mut c_void) -> NSRect,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(doCommandBySelector:),
|
||||
do_command_by_selector as extern fn(&Object, Sel, Sel),
|
||||
);
|
||||
decl.add_method(sel!(keyDown:), key_down as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(keyUp:), key_up as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(insertTab:), insert_tab as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(insertBackTab:), insert_back_tab as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(mouseDown:), mouse_down as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(mouseUp:), mouse_up as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(rightMouseDown:), right_mouse_down as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(rightMouseUp:), right_mouse_up as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(otherMouseDown:), other_mouse_down as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(otherMouseUp:), other_mouse_up as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(mouseMoved:), mouse_moved as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(mouseDragged:), mouse_dragged as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(rightMouseDragged:), right_mouse_dragged as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(otherMouseDragged:), other_mouse_dragged as extern fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(_wantsKeyDownForEvent:), wants_key_down_for_event as extern fn(&Object, Sel, id) -> BOOL);
|
||||
decl.add_method(
|
||||
sel!(keyDown:),
|
||||
key_down as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(keyUp:),
|
||||
key_up as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(flagsChanged:),
|
||||
flags_changed as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(insertTab:),
|
||||
insert_tab as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(insertBackTab:),
|
||||
insert_back_tab as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseDown:),
|
||||
mouse_down as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseUp:),
|
||||
mouse_up as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(rightMouseDown:),
|
||||
right_mouse_down as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(rightMouseUp:),
|
||||
right_mouse_up as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(otherMouseDown:),
|
||||
other_mouse_down as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(otherMouseUp:),
|
||||
other_mouse_up as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseMoved:),
|
||||
mouse_moved as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseDragged:),
|
||||
mouse_dragged as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(rightMouseDragged:),
|
||||
right_mouse_dragged as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(otherMouseDragged:),
|
||||
other_mouse_dragged as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseEntered:),
|
||||
mouse_entered as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseExited:),
|
||||
mouse_exited as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(scrollWheel:),
|
||||
scroll_wheel as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(pressureChangeWithEvent:),
|
||||
pressure_change_with_event as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(_wantsKeyDownForEvent:),
|
||||
wants_key_down_for_event as extern fn(&Object, Sel, id) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(cancelOperation:),
|
||||
cancel_operation as extern fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_ivar::<*mut c_void>("winitState");
|
||||
decl.add_ivar::<id>("markedText");
|
||||
let protocol = Protocol::get("NSTextInputClient").unwrap();
|
||||
|
|
@ -167,27 +266,43 @@ extern fn init_with_winit(this: &Object, _sel: Sel, state: *mut c_void) -> id {
|
|||
}
|
||||
}
|
||||
|
||||
extern fn draw_rect(this: &Object, _sel: Sel, rect: NSRect) {
|
||||
extern fn view_did_move_to_window(this: &Object, _sel: Sel) {
|
||||
trace!("Triggered `viewDidMoveToWindow`");
|
||||
unsafe {
|
||||
let rect: NSRect = msg_send![this, visibleRect];
|
||||
let _: () = msg_send![this,
|
||||
addTrackingRect:rect
|
||||
owner:this
|
||||
userData:nil
|
||||
assumeInside:NO
|
||||
];
|
||||
}
|
||||
trace!("Completed `viewDidMoveToWindow`");
|
||||
}
|
||||
|
||||
extern fn draw_rect(this: &Object, _sel: Sel, rect: id) {
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
if let Some(shared) = state.shared.upgrade() {
|
||||
let window_event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.window)),
|
||||
event: WindowEvent::Refresh,
|
||||
};
|
||||
shared.pending_events
|
||||
.lock()
|
||||
.unwrap()
|
||||
.push_back(window_event);
|
||||
}
|
||||
AppState::queue_redraw(WindowId(get_window_id(state.nswindow)));
|
||||
|
||||
let superclass = util::superclass(this);
|
||||
let () = msg_send![super(this, superclass), drawRect:rect];
|
||||
}
|
||||
}
|
||||
|
||||
extern fn accepts_first_responder(_this: &Object, _sel: Sel) -> BOOL {
|
||||
YES
|
||||
}
|
||||
|
||||
// This is necessary to prevent a beefy terminal error on MacBook Pros:
|
||||
// IMKInputSession [0x7fc573576ff0 presentFunctionRowItemTextInputViewWithEndpoint:completionHandler:] : [self textInputContext]=0x7fc573558e10 *NO* NSRemoteViewController to client, NSError=Error Domain=NSCocoaErrorDomain Code=4099 "The connection from pid 0 was invalidated from this process." UserInfo={NSDebugDescription=The connection from pid 0 was invalidated from this process.}, com.apple.inputmethod.EmojiFunctionRowItem
|
||||
// TODO: Add an API extension for using `NSTouchBar`
|
||||
extern fn touch_bar(_this: &Object, _sel: Sel) -> BOOL {
|
||||
NO
|
||||
}
|
||||
|
||||
extern fn reset_cursor_rects(this: &Object, _sel: Sel) {
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
|
|
@ -202,19 +317,22 @@ extern fn reset_cursor_rects(this: &Object, _sel: Sel) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
extern fn has_marked_text(this: &Object, _sel: Sel) -> BOOL {
|
||||
//println!("hasMarkedText");
|
||||
unsafe {
|
||||
trace!("Triggered `hasMarkedText`");
|
||||
let marked_text: id = *this.get_ivar("markedText");
|
||||
trace!("Completed `hasMarkedText`");
|
||||
(marked_text.length() > 0) as i8
|
||||
}
|
||||
}
|
||||
|
||||
extern fn marked_range(this: &Object, _sel: Sel) -> NSRange {
|
||||
//println!("markedRange");
|
||||
unsafe {
|
||||
trace!("Triggered `markedRange`");
|
||||
let marked_text: id = *this.get_ivar("markedText");
|
||||
let length = marked_text.length();
|
||||
trace!("Completed `markedRange`");
|
||||
if length > 0 {
|
||||
NSRange::new(0, length - 1)
|
||||
} else {
|
||||
|
|
@ -224,7 +342,8 @@ extern fn marked_range(this: &Object, _sel: Sel) -> NSRange {
|
|||
}
|
||||
|
||||
extern fn selected_range(_this: &Object, _sel: Sel) -> NSRange {
|
||||
//println!("selectedRange");
|
||||
trace!("Triggered `selectedRange`");
|
||||
trace!("Completed `selectedRange`");
|
||||
util::EMPTY_RANGE
|
||||
}
|
||||
|
||||
|
|
@ -235,7 +354,7 @@ extern fn set_marked_text(
|
|||
_selected_range: NSRange,
|
||||
_replacement_range: NSRange,
|
||||
) {
|
||||
//println!("setMarkedText");
|
||||
trace!("Triggered `setMarkedText`");
|
||||
unsafe {
|
||||
let marked_text_ref: &mut id = this.get_mut_ivar("markedText");
|
||||
let _: () = msg_send![(*marked_text_ref), release];
|
||||
|
|
@ -248,10 +367,11 @@ extern fn set_marked_text(
|
|||
};
|
||||
*marked_text_ref = marked_text;
|
||||
}
|
||||
trace!("Completed `setMarkedText`");
|
||||
}
|
||||
|
||||
extern fn unmark_text(this: &Object, _sel: Sel) {
|
||||
//println!("unmarkText");
|
||||
trace!("Triggered `unmarkText`");
|
||||
unsafe {
|
||||
let marked_text: id = *this.get_ivar("markedText");
|
||||
let mutable_string = marked_text.mutableString();
|
||||
|
|
@ -259,10 +379,12 @@ extern fn unmark_text(this: &Object, _sel: Sel) {
|
|||
let input_context: id = msg_send![this, inputContext];
|
||||
let _: () = msg_send![input_context, discardMarkedText];
|
||||
}
|
||||
trace!("Completed `unmarkText`");
|
||||
}
|
||||
|
||||
extern fn valid_attributes_for_marked_text(_this: &Object, _sel: Sel) -> id {
|
||||
//println!("validAttributesForMarkedText");
|
||||
trace!("Triggered `validAttributesForMarkedText`");
|
||||
trace!("Completed `validAttributesForMarkedText`");
|
||||
unsafe { msg_send![class!(NSArray), array] }
|
||||
}
|
||||
|
||||
|
|
@ -272,12 +394,14 @@ extern fn attributed_substring_for_proposed_range(
|
|||
_range: NSRange,
|
||||
_actual_range: *mut c_void, // *mut NSRange
|
||||
) -> id {
|
||||
//println!("attributedSubstringForProposedRange");
|
||||
trace!("Triggered `attributedSubstringForProposedRange`");
|
||||
trace!("Completed `attributedSubstringForProposedRange`");
|
||||
nil
|
||||
}
|
||||
|
||||
extern fn character_index_for_point(_this: &Object, _sel: Sel, _point: NSPoint) -> NSUInteger {
|
||||
//println!("characterIndexForPoint");
|
||||
trace!("Triggered `characterIndexForPoint`");
|
||||
trace!("Completed `characterIndexForPoint`");
|
||||
0
|
||||
}
|
||||
|
||||
|
|
@ -287,20 +411,20 @@ extern fn first_rect_for_character_range(
|
|||
_range: NSRange,
|
||||
_actual_range: *mut c_void, // *mut NSRange
|
||||
) -> NSRect {
|
||||
//println!("firstRectForCharacterRange");
|
||||
unsafe {
|
||||
trace!("Triggered `firstRectForCharacterRange`");
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
let (x, y) = state.ime_spot.unwrap_or_else(|| {
|
||||
let content_rect = NSWindow::contentRectForFrameRect_(
|
||||
state.window,
|
||||
NSWindow::frame(state.window),
|
||||
state.nswindow,
|
||||
NSWindow::frame(state.nswindow),
|
||||
);
|
||||
let x = content_rect.origin.x;
|
||||
let y = util::bottom_left_to_top_left(content_rect);
|
||||
(x, y)
|
||||
});
|
||||
|
||||
trace!("Completed `firstRectForCharacterRange`");
|
||||
NSRect::new(
|
||||
NSPoint::new(x as _, y as _),
|
||||
NSSize::new(0.0, 0.0),
|
||||
|
|
@ -309,7 +433,7 @@ extern fn first_rect_for_character_range(
|
|||
}
|
||||
|
||||
extern fn insert_text(this: &Object, _sel: Sel, string: id, _replacement_range: NSRange) {
|
||||
//println!("insertText");
|
||||
trace!("Triggered `insertText`");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
|
@ -331,46 +455,36 @@ extern fn insert_text(this: &Object, _sel: Sel, string: id, _replacement_range:
|
|||
state.is_key_down = true;
|
||||
|
||||
// We don't need this now, but it's here if that changes.
|
||||
//let event: id = msg_send![class!(NSApp), currentEvent];
|
||||
//let event: id = msg_send![NSApp(), currentEvent];
|
||||
|
||||
let mut events = VecDeque::with_capacity(characters.len());
|
||||
for character in string.chars() {
|
||||
events.push_back(Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.window)),
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::ReceivedCharacter(character),
|
||||
});
|
||||
}
|
||||
|
||||
if let Some(shared) = state.shared.upgrade() {
|
||||
shared.pending_events
|
||||
.lock()
|
||||
.unwrap()
|
||||
.append(&mut events);
|
||||
}
|
||||
AppState::queue_events(events);
|
||||
}
|
||||
trace!("Completed `insertText`");
|
||||
}
|
||||
|
||||
extern fn do_command_by_selector(this: &Object, _sel: Sel, command: Sel) {
|
||||
//println!("doCommandBySelector");
|
||||
trace!("Triggered `doCommandBySelector`");
|
||||
// Basically, we're sent this message whenever a keyboard event that doesn't generate a "human readable" character
|
||||
// happens, i.e. newlines, tabs, and Ctrl+C.
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let shared = if let Some(shared) = state.shared.upgrade() {
|
||||
shared
|
||||
} else {
|
||||
return;
|
||||
};
|
||||
|
||||
let mut events = VecDeque::with_capacity(1);
|
||||
if command == sel!(insertNewline:) {
|
||||
// The `else` condition would emit the same character, but I'm keeping this here both...
|
||||
// 1) as a reminder for how `doCommandBySelector` works
|
||||
// 2) to make our use of carriage return explicit
|
||||
events.push_back(Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.window)),
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::ReceivedCharacter('\r'),
|
||||
});
|
||||
} else {
|
||||
|
|
@ -378,18 +492,16 @@ extern fn do_command_by_selector(this: &Object, _sel: Sel, command: Sel) {
|
|||
if let Some(raw_characters) = raw_characters {
|
||||
for character in raw_characters.chars() {
|
||||
events.push_back(Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.window)),
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::ReceivedCharacter(character),
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
shared.pending_events
|
||||
.lock()
|
||||
.unwrap()
|
||||
.append(&mut events);
|
||||
AppState::queue_events(events);
|
||||
}
|
||||
trace!("Completed `doCommandBySelector`");
|
||||
}
|
||||
|
||||
fn get_characters(event: id, ignore_modifiers: bool) -> String {
|
||||
|
|
@ -407,15 +519,14 @@ fn get_characters(event: id, ignore_modifiers: bool) -> String {
|
|||
);
|
||||
|
||||
let string = str::from_utf8_unchecked(slice);
|
||||
|
||||
string.to_owned()
|
||||
}
|
||||
}
|
||||
|
||||
// Retrieves a layout-independent keycode given an event.
|
||||
fn retrieve_keycode(event: id) -> Option<event::VirtualKeyCode> {
|
||||
fn retrieve_keycode(event: id) -> Option<VirtualKeyCode> {
|
||||
#[inline]
|
||||
fn get_code(ev: id, raw: bool) -> Option<event::VirtualKeyCode> {
|
||||
fn get_code(ev: id, raw: bool) -> Option<VirtualKeyCode> {
|
||||
let characters = get_characters(ev, raw);
|
||||
characters.chars().next().map_or(None, |c| char_to_keycode(c))
|
||||
}
|
||||
|
|
@ -443,17 +554,18 @@ fn retrieve_keycode(event: id) -> Option<event::VirtualKeyCode> {
|
|||
}
|
||||
|
||||
extern fn key_down(this: &Object, _sel: Sel, event: id) {
|
||||
//println!("keyDown");
|
||||
trace!("Triggered `keyDown`");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
let window_id = WindowId(get_window_id(state.window));
|
||||
let window_id = WindowId(get_window_id(state.nswindow));
|
||||
let characters = get_characters(event, false);
|
||||
|
||||
state.raw_characters = Some(characters.clone());
|
||||
|
||||
let scancode = get_scancode(event) as u32;
|
||||
let virtual_keycode = retrieve_keycode(event);
|
||||
|
||||
let is_repeat = msg_send![event, isARepeat];
|
||||
|
||||
let window_event = Event::WindowEvent {
|
||||
|
|
@ -469,36 +581,35 @@ extern fn key_down(this: &Object, _sel: Sel, event: id) {
|
|||
},
|
||||
};
|
||||
|
||||
if let Some(shared) = state.shared.upgrade() {
|
||||
shared.pending_events
|
||||
.lock()
|
||||
.unwrap()
|
||||
.push_back(window_event);
|
||||
let pass_along = {
|
||||
AppState::queue_event(window_event);
|
||||
// Emit `ReceivedCharacter` for key repeats
|
||||
if is_repeat && state.is_key_down{
|
||||
if is_repeat && state.is_key_down {
|
||||
for character in characters.chars() {
|
||||
let window_event = Event::WindowEvent {
|
||||
AppState::queue_event(Event::WindowEvent {
|
||||
window_id,
|
||||
event: WindowEvent::ReceivedCharacter(character),
|
||||
};
|
||||
shared.pending_events
|
||||
.lock()
|
||||
.unwrap()
|
||||
.push_back(window_event);
|
||||
});
|
||||
}
|
||||
false
|
||||
} else {
|
||||
// Some keys (and only *some*, with no known reason) don't trigger `insertText`, while others do...
|
||||
// So, we don't give repeats the opportunity to trigger that, since otherwise our hack will cause some
|
||||
// keys to generate twice as many characters.
|
||||
let array: id = msg_send![class!(NSArray), arrayWithObject:event];
|
||||
let (): _ = msg_send![this, interpretKeyEvents:array];
|
||||
true
|
||||
}
|
||||
};
|
||||
|
||||
if pass_along {
|
||||
// Some keys (and only *some*, with no known reason) don't trigger `insertText`, while others do...
|
||||
// So, we don't give repeats the opportunity to trigger that, since otherwise our hack will cause some
|
||||
// keys to generate twice as many characters.
|
||||
let array: id = msg_send![class!(NSArray), arrayWithObject:event];
|
||||
let _: () = msg_send![this, interpretKeyEvents:array];
|
||||
}
|
||||
}
|
||||
trace!("Completed `keyDown`");
|
||||
}
|
||||
|
||||
extern fn key_up(this: &Object, _sel: Sel, event: id) {
|
||||
//println!("keyUp");
|
||||
trace!("Triggered `keyUp`");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
|
@ -509,7 +620,7 @@ extern fn key_up(this: &Object, _sel: Sel, event: id) {
|
|||
let virtual_keycode = retrieve_keycode(event);
|
||||
|
||||
let window_event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.window)),
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::KeyboardInput {
|
||||
device_id: DEVICE_ID,
|
||||
input: KeyboardInput {
|
||||
|
|
@ -521,13 +632,63 @@ extern fn key_up(this: &Object, _sel: Sel, event: id) {
|
|||
},
|
||||
};
|
||||
|
||||
if let Some(shared) = state.shared.upgrade() {
|
||||
shared.pending_events
|
||||
.lock()
|
||||
.unwrap()
|
||||
.push_back(window_event);
|
||||
AppState::queue_event(window_event);
|
||||
}
|
||||
trace!("Completed `keyUp`");
|
||||
}
|
||||
|
||||
extern fn flags_changed(this: &Object, _sel: Sel, event: id) {
|
||||
trace!("Triggered `flagsChanged`");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let mut events = VecDeque::with_capacity(4);
|
||||
|
||||
if let Some(window_event) = modifier_event(
|
||||
event,
|
||||
NSEventModifierFlags::NSShiftKeyMask,
|
||||
state.modifiers.shift_pressed,
|
||||
) {
|
||||
state.modifiers.shift_pressed = !state.modifiers.shift_pressed;
|
||||
events.push_back(window_event);
|
||||
}
|
||||
|
||||
if let Some(window_event) = modifier_event(
|
||||
event,
|
||||
NSEventModifierFlags::NSControlKeyMask,
|
||||
state.modifiers.ctrl_pressed,
|
||||
) {
|
||||
state.modifiers.ctrl_pressed = !state.modifiers.ctrl_pressed;
|
||||
events.push_back(window_event);
|
||||
}
|
||||
|
||||
if let Some(window_event) = modifier_event(
|
||||
event,
|
||||
NSEventModifierFlags::NSCommandKeyMask,
|
||||
state.modifiers.win_pressed,
|
||||
) {
|
||||
state.modifiers.win_pressed = !state.modifiers.win_pressed;
|
||||
events.push_back(window_event);
|
||||
}
|
||||
|
||||
if let Some(window_event) = modifier_event(
|
||||
event,
|
||||
NSEventModifierFlags::NSAlternateKeyMask,
|
||||
state.modifiers.alt_pressed,
|
||||
) {
|
||||
state.modifiers.alt_pressed = !state.modifiers.alt_pressed;
|
||||
events.push_back(window_event);
|
||||
}
|
||||
|
||||
for event in events {
|
||||
AppState::queue_event(Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event,
|
||||
});
|
||||
}
|
||||
}
|
||||
trace!("Completed `flagsChanged`");
|
||||
}
|
||||
|
||||
extern fn insert_tab(this: &Object, _sel: Sel, _sender: id) {
|
||||
|
|
@ -552,13 +713,45 @@ extern fn insert_back_tab(this: &Object, _sel: Sel, _sender: id) {
|
|||
}
|
||||
}
|
||||
|
||||
// Allows us to receive Cmd-. (the shortcut for closing a dialog)
|
||||
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=300620#c6
|
||||
extern fn cancel_operation(this: &Object, _sel: Sel, _sender: id) {
|
||||
trace!("Triggered `cancelOperation`");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let scancode = 0x2f;
|
||||
let virtual_keycode = scancode_to_keycode(scancode);
|
||||
debug_assert_eq!(virtual_keycode, Some(VirtualKeyCode::Period));
|
||||
|
||||
let event: id = msg_send![NSApp(), currentEvent];
|
||||
|
||||
let window_event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::KeyboardInput {
|
||||
device_id: DEVICE_ID,
|
||||
input: KeyboardInput {
|
||||
state: ElementState::Pressed,
|
||||
scancode: scancode as _,
|
||||
virtual_keycode,
|
||||
modifiers: event_mods(event),
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
AppState::queue_event(window_event);
|
||||
}
|
||||
trace!("Completed `cancelOperation`");
|
||||
}
|
||||
|
||||
fn mouse_click(this: &Object, event: id, button: MouseButton, button_state: ElementState) {
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let window_event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.window)),
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::MouseInput {
|
||||
device_id: DEVICE_ID,
|
||||
state: button_state,
|
||||
|
|
@ -567,12 +760,7 @@ fn mouse_click(this: &Object, event: id, button: MouseButton, button_state: Elem
|
|||
},
|
||||
};
|
||||
|
||||
if let Some(shared) = state.shared.upgrade() {
|
||||
shared.pending_events
|
||||
.lock()
|
||||
.unwrap()
|
||||
.push_back(window_event);
|
||||
}
|
||||
AppState::queue_event(window_event);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -624,7 +812,7 @@ fn mouse_motion(this: &Object, event: id) {
|
|||
let y = view_rect.size.height as f64 - view_point.y as f64;
|
||||
|
||||
let window_event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.window)),
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::CursorMoved {
|
||||
device_id: DEVICE_ID,
|
||||
position: (x, y).into(),
|
||||
|
|
@ -632,12 +820,7 @@ fn mouse_motion(this: &Object, event: id) {
|
|||
},
|
||||
};
|
||||
|
||||
if let Some(shared) = state.shared.upgrade() {
|
||||
shared.pending_events
|
||||
.lock()
|
||||
.unwrap()
|
||||
.push_back(window_event);
|
||||
}
|
||||
AppState::queue_event(window_event);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -657,7 +840,125 @@ extern fn other_mouse_dragged(this: &Object, _sel: Sel, event: id) {
|
|||
mouse_motion(this, event);
|
||||
}
|
||||
|
||||
extern fn mouse_entered(this: &Object, _sel: Sel, event: id) {
|
||||
trace!("Triggered `mouseEntered`");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let enter_event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::CursorEntered { device_id: DEVICE_ID },
|
||||
};
|
||||
|
||||
let move_event = {
|
||||
let window_point = event.locationInWindow();
|
||||
let view_point: NSPoint = msg_send![this,
|
||||
convertPoint:window_point
|
||||
fromView:nil // convert from window coordinates
|
||||
];
|
||||
let view_rect: NSRect = msg_send![this, frame];
|
||||
let x = view_point.x as f64;
|
||||
let y = (view_rect.size.height - view_point.y) as f64;
|
||||
Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::CursorMoved {
|
||||
device_id: DEVICE_ID,
|
||||
position: (x, y).into(),
|
||||
modifiers: event_mods(event),
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
AppState::queue_event(enter_event);
|
||||
AppState::queue_event(move_event);
|
||||
}
|
||||
trace!("Completed `mouseEntered`");
|
||||
}
|
||||
|
||||
extern fn mouse_exited(this: &Object, _sel: Sel, _event: id) {
|
||||
trace!("Triggered `mouseExited`");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let window_event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::CursorLeft { device_id: DEVICE_ID },
|
||||
};
|
||||
|
||||
AppState::queue_event(window_event);
|
||||
}
|
||||
trace!("Completed `mouseExited`");
|
||||
}
|
||||
|
||||
extern fn scroll_wheel(this: &Object, _sel: Sel, event: id) {
|
||||
trace!("Triggered `scrollWheel`");
|
||||
unsafe {
|
||||
let delta = {
|
||||
let (x, y) = (event.scrollingDeltaX(), event.scrollingDeltaY());
|
||||
if event.hasPreciseScrollingDeltas() == YES {
|
||||
MouseScrollDelta::PixelDelta((x as f64, y as f64).into())
|
||||
} else {
|
||||
MouseScrollDelta::LineDelta(x as f32, y as f32)
|
||||
}
|
||||
};
|
||||
let phase = match event.phase() {
|
||||
NSEventPhase::NSEventPhaseMayBegin | NSEventPhase::NSEventPhaseBegan => TouchPhase::Started,
|
||||
NSEventPhase::NSEventPhaseEnded => TouchPhase::Ended,
|
||||
_ => TouchPhase::Moved,
|
||||
};
|
||||
|
||||
let device_event = Event::DeviceEvent {
|
||||
device_id: DEVICE_ID,
|
||||
event: DeviceEvent::MouseWheel { delta },
|
||||
};
|
||||
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let window_event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::MouseWheel {
|
||||
device_id: DEVICE_ID,
|
||||
delta,
|
||||
phase,
|
||||
modifiers: event_mods(event),
|
||||
},
|
||||
};
|
||||
|
||||
AppState::queue_event(device_event);
|
||||
AppState::queue_event(window_event);
|
||||
}
|
||||
trace!("Completed `scrollWheel`");
|
||||
}
|
||||
|
||||
extern fn pressure_change_with_event(this: &Object, _sel: Sel, event: id) {
|
||||
trace!("Triggered `pressureChangeWithEvent`");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let pressure = event.pressure();
|
||||
let stage = event.stage();
|
||||
|
||||
let window_event = Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.nswindow)),
|
||||
event: WindowEvent::TouchpadPressure {
|
||||
device_id: DEVICE_ID,
|
||||
pressure,
|
||||
stage,
|
||||
},
|
||||
};
|
||||
|
||||
AppState::queue_event(window_event);
|
||||
}
|
||||
trace!("Completed `pressureChangeWithEvent`");
|
||||
}
|
||||
|
||||
// Allows us to receive Ctrl-Tab and Ctrl-Esc.
|
||||
// Note that this *doesn't* help with any missing Cmd inputs.
|
||||
// https://github.com/chromium/chromium/blob/a86a8a6bcfa438fa3ac2eba6f02b3ad1f8e0756f/ui/views/cocoa/bridged_content_view.mm#L816
|
||||
extern fn wants_key_down_for_event(_this: &Object, _se: Sel, _event: id) -> BOOL {
|
||||
extern fn wants_key_down_for_event(_this: &Object, _sel: Sel, _event: id) -> BOOL {
|
||||
YES
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue