From: Alan Third <alan@idiocy.org>
To: Aaron Jensen <aaronjensen@gmail.com>
Cc: 46155@debbugs.gnu.org, andreyk.mad@gmail.com
Subject: bug#46155: [PATCH v2] Fix flicker when resizing NS frame programmatically (bug#46155)
Date: Thu, 11 Feb 2021 22:16:48 +0000 [thread overview]
Message-ID: <YCWs0IL+lwF4toPH@breton.holly.idiocy.org> (raw)
In-Reply-To: <CAHyO48y_JUauhnfnX6EQcfYEpi-5X=Wn_cFEYPRCibE3fPRQqw@mail.gmail.com>
; Incidentally fixes bug#21326.
* src/nsterm.m ([EmacsView viewWillDraw]): New function.
([EmacsView viewDidResize:]): We now have to mark the frame for
display on resize.
([EmacsView initFrameFromEmacs:]): Retain frame contents on resize.
([EmacsView updateLayer]): Don't update the layer is the frame is
still garbaged.
---
src/nsterm.m | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/src/nsterm.m b/src/nsterm.m
index 1b2328628e..ab898184f5 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7339,6 +7339,8 @@ - (void)viewDidResize:(NSNotification *)notification
[surface release];
surface = nil;
+
+ [self setNeedsDisplay:YES];
}
#endif
@@ -7510,6 +7512,16 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
[self initWithFrame: r];
[self setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+#ifdef NS_DRAW_TO_BUFFER
+ /* These settings mean AppKit will retain the contents of the frame
+ on resize. Unfortunately it also means the frame will not be
+ automatically marked for display, but we can do that ourselves in
+ viewDidResize. */
+ [self setLayerContentsRedrawPolicy:
+ NSViewLayerContentsRedrawOnSetNeedsDisplay];
+ [self setLayerContentsPlacement:NSViewLayerContentsPlacementTopLeft];
+#endif
+
FRAME_NS_VIEW (f) = self;
emacsframe = f;
#ifdef NS_IMPL_COCOA
@@ -8452,6 +8464,34 @@ - (void)copyRect:(NSRect)srcRect to:(NSRect)dstRect
}
+#ifdef NS_IMPL_COCOA
+/* If the frame has been garbaged but the toolkit wants to draw, for
+ example when resizing the frame, we end up with a blank screen.
+ Sometimes this results in an unpleasant flicker, so try to
+ redisplay before drawing. */
+- (void)viewWillDraw
+{
+ if (FRAME_GARBAGED_P (emacsframe)
+ && !redisplaying_p)
+ {
+ /* 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 ();
+
+ redisplay ();
+
+ unblock_input ();
+ waiting_for_input = owfi;
+ }
+}
+#endif
+
+
#ifdef NS_DRAW_TO_BUFFER
- (BOOL)wantsUpdateLayer
{
@@ -8469,6 +8509,13 @@ - (void)updateLayer
{
NSTRACE ("[EmacsView updateLayer]");
+ /* We run redisplay on frames that are garbaged but marked for
+ display before updateLayer is called, so if the frame is still
+ garbaged that means the last redisplay must have refused to
+ update the frame. */
+ if (FRAME_GARBAGED_P (emacsframe))
+ return;
+
/* This can fail to update the screen if the same surface is
provided twice in a row, even if its contents have changed.
There's a private method, -[CALayer setContentsChanged], that we
--
2.29.2
--
Alan Third
next prev parent reply other threads:[~2021-02-11 22:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 15:48 bug#46155: 28.0.50; Regression: buffer contents flicker on macOS frames when Aaron Jensen
2021-01-28 16:39 ` Alan Third
2021-01-31 20:28 ` Alan Third
2021-01-31 22:05 ` Aaron Jensen
2021-02-08 15:25 ` Aaron Jensen
2021-02-08 21:45 ` Aaron Jensen
2021-02-09 7:58 ` martin rudalics
2021-02-09 9:55 ` Andrii Kolomoiets
2021-02-09 10:49 ` martin rudalics
2021-02-09 11:04 ` martin rudalics
2021-02-09 11:30 ` Andrii Kolomoiets
2021-02-09 17:31 ` martin rudalics
2021-02-09 11:05 ` Alan Third
2021-02-09 14:44 ` Alan Third
2021-02-09 16:29 ` Andrii Kolomoiets
2021-02-09 20:08 ` Alan Third
2021-02-10 1:11 ` Aaron Jensen
2021-02-11 22:16 ` Alan Third [this message]
2021-02-12 4:06 ` bug#46155: [PATCH v2] Fix flicker when resizing NS frame programmatically (bug#46155) Aaron Jensen
2021-02-13 22:44 ` Alan Third
2021-02-13 22:45 ` Aaron Jensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YCWs0IL+lwF4toPH@breton.holly.idiocy.org \
--to=alan@idiocy.org \
--cc=46155@debbugs.gnu.org \
--cc=aaronjensen@gmail.com \
--cc=andreyk.mad@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.