diff options
| author | Alan Third | 2020-03-04 20:51:40 +0000 |
|---|---|---|
| committer | Alan Third | 2020-03-04 20:53:57 +0000 |
| commit | d1bbd32dba392f2fb4548d892354e78ff8df4451 (patch) | |
| tree | 8b235cfa319ffff0016f0e37a5032383603ec348 | |
| parent | cf45e8022ee182529668c0d50d27b4e168331e97 (diff) | |
| download | emacs-d1bbd32dba392f2fb4548d892354e78ff8df4451.tar.gz emacs-d1bbd32dba392f2fb4548d892354e78ff8df4451.zip | |
Fix more NS_DRAW_TO_BUFFER #ifdefs (bug#39883)
* src/nsterm.m (ns_update_end): Make sure the frame is updated after
drawing.
(ns_focus):
(ns_unfocus): Should be checking on NS_DRAW_TO_BUFFER rather than if
it's Cocoa or GNUstep.
| -rw-r--r-- | src/nsterm.m | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 8e256149220..851a5617d7b 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -1141,6 +1141,7 @@ ns_update_end (struct frame *f) | |||
| 1141 | 1141 | ||
| 1142 | #ifdef NS_DRAW_TO_BUFFER | 1142 | #ifdef NS_DRAW_TO_BUFFER |
| 1143 | [NSGraphicsContext setCurrentContext:nil]; | 1143 | [NSGraphicsContext setCurrentContext:nil]; |
| 1144 | [view setNeedsDisplay:YES]; | ||
| 1144 | #else | 1145 | #else |
| 1145 | block_input (); | 1146 | block_input (); |
| 1146 | 1147 | ||
| @@ -1194,12 +1195,6 @@ ns_focus (struct frame *f, NSRect *r, int n) | |||
| 1194 | /* clipping */ | 1195 | /* clipping */ |
| 1195 | if (r) | 1196 | if (r) |
| 1196 | { | 1197 | { |
| 1197 | #ifdef NS_IMPL_COCOA | ||
| 1198 | int i; | ||
| 1199 | for (i = 0 ; i < n ; i++) | ||
| 1200 | [view setNeedsDisplayInRect:r[i]]; | ||
| 1201 | #endif | ||
| 1202 | |||
| 1203 | [[NSGraphicsContext currentContext] saveGraphicsState]; | 1198 | [[NSGraphicsContext currentContext] saveGraphicsState]; |
| 1204 | if (n == 2) | 1199 | if (n == 2) |
| 1205 | NSRectClipList (r, 2); | 1200 | NSRectClipList (r, 2); |
| @@ -1224,7 +1219,9 @@ ns_unfocus (struct frame *f) | |||
| 1224 | gsaved = NO; | 1219 | gsaved = NO; |
| 1225 | } | 1220 | } |
| 1226 | 1221 | ||
| 1227 | #ifdef NS_IMPL_GNUSTEP | 1222 | #ifdef NS_DRAW_TO_BUFFER |
| 1223 | [FRAME_NS_VIEW (f) setNeedsDisplay:YES]; | ||
| 1224 | #else | ||
| 1228 | if (f != ns_updating_frame) | 1225 | if (f != ns_updating_frame) |
| 1229 | { | 1226 | { |
| 1230 | if (focus_view != NULL) | 1227 | if (focus_view != NULL) |