[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/ns/refactor e0a9042 4/7: Fix macOS live resize drawing
From: |
Alan Third |
Subject: |
scratch/ns/refactor e0a9042 4/7: Fix macOS live resize drawing |
Date: |
Sun, 4 Jul 2021 06:46:48 -0400 (EDT) |
branch: scratch/ns/refactor
commit e0a9042827f1e3180576ced051c15e8c74b6595a
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>
Fix macOS live resize drawing
* src/nsterm.m ([EmacsView layout]):
([EmacsView layoutSublayersOfLayer:]): Rename layout to
layoutSublayersOfLayer.
---
src/nsterm.m | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index 2e351cd..cc1ddd5 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8060,24 +8060,33 @@ not_in_argv (NSString *arg)
redisplay before drawing.
This used to be done in viewWillDraw, but with the custom layer
- that method is not called. */
-- (void)layout
-{
- [super layout];
-
- /* If there is IO going on when redisplay is run here Emacs
- crashes. I think it's because this code will always be run
- within the run loop and for whatever reason processing input
- is dangerous. This technique was stolen wholesale from
- nsmenu.m and seems to work. */
- bool owfi = waiting_for_input;
- waiting_for_input = 0;
- block_input ();
+ that method is not called. We cannot call redisplay directly from
+ [NSView layout], because it may trigger another round of layout by
+ changing the frame size and recursive layout calls are banned. It
+ appears to be safe to call redisplay here. */
+- (void)layoutSublayersOfLayer:(CALayer *)layer
+{
+ if (!redisplaying_p && FRAME_GARBAGED_P (emacsframe))
+ {
+ /* If there is IO going on when redisplay is run here Emacs
+ crashes. I think it's because this code will always be run
+ within the run loop and for whatever reason processing input
+ is dangerous. This technique was stolen wholesale from
+ nsmenu.m and seems to work.
- redisplay ();
+ FIXME: I can't provoke a crash using layoutSublayersOfLayer,
+ however I can't understand why it would be different from
+ viewWillDraw. I'll leave this commented out for now, but if
+ nobody reports a crash it can be removed. */
+ // bool owfi = waiting_for_input;
+ // waiting_for_input = 0;
+ // block_input ();
- unblock_input ();
- waiting_for_input = owfi;
+ redisplay ();
+
+ // unblock_input ();
+ // waiting_for_input = owfi;
+ }
}
#endif
- branch scratch/ns/refactor created (now 85f5967), Alan Third, 2021/07/04
- scratch/ns/refactor e0a9042 4/7: Fix macOS live resize drawing,
Alan Third <=
- scratch/ns/refactor f3384ad 6/7: Move parent frame setting code into EmacsWindow, Alan Third, 2021/07/04
- scratch/ns/refactor 6738730 2/7: Tidy up NS port OS window handling, Alan Third, 2021/07/04
- scratch/ns/refactor 4e9fbab 1/7: Simplify macOS drawing code, Alan Third, 2021/07/04
- scratch/ns/refactor 3e86370 3/7: Change NS port resize detection, Alan Third, 2021/07/04
- scratch/ns/refactor 88edd9e 5/7: Move NS port toolbar handling to the window, Alan Third, 2021/07/04
- scratch/ns/refactor 85f5967 7/7: Fix some macOS problems, Alan Third, 2021/07/04