procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make all NS drawing be done from drawRect

Browse source 
See bug#31904 and bug#32812.

* src/nsterm.m (ns_update_begin): Don't lock focus, only clip if there
is already a view focused.
(ns_update_end): Don't mess with view focusing any more.
(ns_focus): Only clip drawing if there is already a focused view,
otherwise mark area dirty for later drawing.  Renamed ns_clip_to_rect.
All callers changed.
(ns_unfocus): Don't unfocus the view any more.  Renamed
ns_reset_clipping. All callers changed.
(ns_clip_to_row): Update to match ns_clip_to_rect.
(ns_clear_frame):
(ns_clear_frame_area):
(ns_draw_fringe_bitmap):
(ns_draw_window_cursor):
(ns_draw_vertical_window_border):
(ns_draw_window_divider):
(ns_dumpglyphs_stretch):
(ns_draw_glyph_string): Only draw if ns_focus or ns_clip_to_row
return YES.
(ns_copy_bits): Remove superfluous calls to ns_(un)focus.
(ns_flush_display): New function.
This commit is contained in:
Alan Third 2018-09-28 20:23:07 +01:00
parent 41fa88b99b
commit 7946445962
1 changed files with 386 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

215
src/nsterm.m
View file

@ -276,12 +276,7 @@ - (NSColor *)colorUsingDefaultColorSpace
long context_menu_value = 0; long context_menu_value = 0;
/* display update */ /* display update */
static struct frame *ns_updating_frame;
static NSView *focus_view = NULL;
static int ns_window_num = 0; static int ns_window_num = 0;
#ifdef NS_IMPL_GNUSTEP
static NSRect uRect; // TODO: This is dead, remove it?
#endif
static BOOL gsaved = NO; static BOOL gsaved = NO;
static BOOL ns_fake_keydown = NO; static BOOL ns_fake_keydown = NO;
#ifdef NS_IMPL_COCOA #ifdef NS_IMPL_COCOA
@ -1039,12 +1034,13 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
external (RIF) call; whole frame, called before update_window_begin external (RIF) call; whole frame, called before update_window_begin
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
{ {
#ifdef NS_IMPL_COCOA
EmacsView *view = FRAME_NS_VIEW (f); EmacsView *view = FRAME_NS_VIEW (f);
NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_update_begin"); NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_update_begin");
ns_update_auto_hide_menu_bar (); ns_update_auto_hide_menu_bar ();
#ifdef NS_IMPL_COCOA
if ([view isFullscreen] && [view fsIsNative]) if ([view isFullscreen] && [view fsIsNative])
{ {
// Fix reappearing tool bar in fullscreen for Mac OS X 10.7 // Fix reappearing tool bar in fullscreen for Mac OS X 10.7
@ -1053,16 +1049,13 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
if (! tbar_visible != ! [toolbar isVisible]) if (! tbar_visible != ! [toolbar isVisible])
[toolbar setVisible: tbar_visible]; [toolbar setVisible: tbar_visible];
} }
#endif
ns_updating_frame = f;
[view lockFocus];
/* drawRect may have been called for say the minibuffer, and then clip path /* drawRect may have been called for say the minibuffer, and then clip path
is for the minibuffer. But the display engine may draw more because is for the minibuffer. But the display engine may draw more because
we have set the frame as garbaged. So reset clip path to the whole we have set the frame as garbaged. So reset clip path to the whole
view. */ view. */
#ifdef NS_IMPL_COCOA /* FIXME: I don't think we need to do this. */
if ([NSView focusView] == FRAME_NS_VIEW (f))
{ {
NSBezierPath *bp; NSBezierPath *bp;
NSRect r = [view frame]; NSRect r = [view frame];
@ -1080,10 +1073,6 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
} }
} }
#endif #endif
#ifdef NS_IMPL_GNUSTEP
uRect = NSMakeRect (0, 0, 0, 0);
#endif
} }
@ -1164,60 +1153,27 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
external (RIF) call; for whole frame, called after update_window_end external (RIF) call; for whole frame, called after update_window_end
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
{ {
EmacsView *view = FRAME_NS_VIEW (f);
NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_update_end"); NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_update_end");
/* if (f == MOUSE_HL_INFO (f)->mouse_face_mouse_frame) */ /* if (f == MOUSE_HL_INFO (f)->mouse_face_mouse_frame) */
MOUSE_HL_INFO (f)->mouse_face_defer = 0; MOUSE_HL_INFO (f)->mouse_face_defer = 0;
block_input ();
[view unlockFocus];
[[view window] flushWindow];
unblock_input ();
ns_updating_frame = NULL;
} }
static void
ns_focus (struct frame *f, NSRect *r, int n) static BOOL
ns_clip_to_rect (struct frame *f, NSRect *r, int n)
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Internal: Focus on given frame. During small local updates this is used to Clip the drawing area to rectangle r in frame f. If drawing is not
draw, however during large updates, ns_update_begin and ns_update_end are currently possible mark r as dirty and return NO, otherwise return
called to wrap the whole thing, in which case these calls are stubbed out. YES.
Except, on GNUstep, we accumulate the rectangle being drawn into, because
the back end won't do this automatically, and will just end up flushing
the entire window.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
{ {
NSTRACE_WHEN (NSTRACE_GROUP_FOCUS, "ns_focus"); NSTRACE_WHEN (NSTRACE_GROUP_FOCUS, "ns_clip_to_rect");
if (r != NULL) if (r)
{ {
NSTRACE_RECT ("r", *r); NSTRACE_RECT ("r", *r);
}
if (f != ns_updating_frame) if ([NSView focusView] == FRAME_NS_VIEW (f))
{
NSView *view = FRAME_NS_VIEW (f);
if (view != focus_view)
{
if (focus_view != NULL)
{
[focus_view unlockFocus];
[[focus_view window] flushWindow];
/*debug_lock--; */
}
if (view)
[view lockFocus];
focus_view = view;
/*if (view) debug_lock++; */
}
}
/* clipping */
if (r)
{ {
[[NSGraphicsContext currentContext] saveGraphicsState]; [[NSGraphicsContext currentContext] saveGraphicsState];
if (n == 2) if (n == 2)
@ -1225,38 +1181,38 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
else else
NSRectClip (*r); NSRectClip (*r);
gsaved = YES; gsaved = YES;
return YES;
} }
else
{
NSView *view = FRAME_NS_VIEW (f);
int i;
for (i = 0 ; i < n ; i++)
[view setNeedsDisplayInRect:r[i]];
}
}
return NO;
} }
static void static void
ns_unfocus (struct frame *f) ns_reset_clipping (struct frame *f)
/* -------------------------------------------------------------------------- /* Internal: Restore the previous graphics state, unsetting any
Internal: Remove focus on given frame clipping areas. */
-------------------------------------------------------------------------- */
{ {
NSTRACE_WHEN (NSTRACE_GROUP_FOCUS, "ns_unfocus"); NSTRACE_WHEN (NSTRACE_GROUP_FOCUS, "ns_reset_clipping");
if (gsaved) if (gsaved)
{ {
[[NSGraphicsContext currentContext] restoreGraphicsState]; [[NSGraphicsContext currentContext] restoreGraphicsState];
gsaved = NO; gsaved = NO;
} }
if (f != ns_updating_frame)
{
if (focus_view != NULL)
{
[focus_view unlockFocus];
[[focus_view window] flushWindow];
focus_view = NULL;
/*debug_lock--; */
}
}
} }
static void static BOOL
ns_clip_to_row (struct window *w, struct glyph_row *row, ns_clip_to_row (struct window *w, struct glyph_row *row,
enum glyph_row_area area, BOOL gc) enum glyph_row_area area, BOOL gc)
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
@ -1275,7 +1231,19 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
clip_rect.size.width = window_width; clip_rect.size.width = window_width;
clip_rect.size.height = row->visible_height; clip_rect.size.height = row->visible_height;
ns_focus (f, &clip_rect, 1); return ns_clip_to_rect (f, &clip_rect, 1);
}
static void
ns_flush_display (struct frame *f)
/* Force the frame to redisplay. If areas have previously been marked
dirty by setNeedsDisplayInRect (in ns_clip_to_rect), then this will call
draw_rect: which will "expose" those areas. */
{
block_input ();
[FRAME_NS_VIEW (f) displayIfNeeded];
unblock_input ();
} }
@ -2699,14 +2667,16 @@ so some key presses (TAB) are swallowed by the system. */
r = [view bounds]; r = [view bounds];
block_input (); block_input ();
ns_focus (f, &r, 1); if (ns_clip_to_rect (f, &r, 1))
{
[ns_lookup_indexed_color (NS_FACE_BACKGROUND [ns_lookup_indexed_color (NS_FACE_BACKGROUND
(FACE_FROM_ID (f, DEFAULT_FACE_ID)), f) set]; (FACE_FROM_ID (f, DEFAULT_FACE_ID)), f) set];
NSRectFill (r); NSRectFill (r);
ns_unfocus (f); ns_reset_clipping (f);
/* as of 2006/11 or so this is now needed */ /* as of 2006/11 or so this is now needed */
ns_redraw_scroll_bars (f); ns_redraw_scroll_bars (f);
}
unblock_input (); unblock_input ();
} }
@ -2727,13 +2697,14 @@ so some key presses (TAB) are swallowed by the system. */
NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_clear_frame_area"); NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_clear_frame_area");
r = NSIntersectionRect (r, [view frame]); r = NSIntersectionRect (r, [view frame]);
ns_focus (f, &r, 1); if (ns_clip_to_rect (f, &r, 1))
{
[ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), f) set]; [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), f) set];
NSRectFill (r); NSRectFill (r);
ns_unfocus (f); ns_reset_clipping (f);
return; }
} }
static void static void
@ -2745,11 +2716,11 @@ so some key presses (TAB) are swallowed by the system. */
{ {
hide_bell(); // Ensure the bell image isn't scrolled. hide_bell(); // Ensure the bell image isn't scrolled.
ns_focus (f, &dest, 1); /* FIXME: scrollRect:by: is deprecated in macOS 10.14. There is
no obvious replacement so we may have to come up with our own. */
[FRAME_NS_VIEW (f) scrollRect: src [FRAME_NS_VIEW (f) scrollRect: src
by: NSMakeSize (dest.origin.x - src.origin.x, by: NSMakeSize (dest.origin.x - src.origin.x,
dest.origin.y - src.origin.y)]; dest.origin.y - src.origin.y)];
ns_unfocus (f);
} }
} }
@ -2960,8 +2931,8 @@ so some key presses (TAB) are swallowed by the system. */
} }
/* Must clip because of partially visible lines. */ /* Must clip because of partially visible lines. */
ns_clip_to_row (w, row, ANY_AREA, YES); if (ns_clip_to_row (w, row, ANY_AREA, YES))
{
if (!p->overlay_p) if (!p->overlay_p)
{ {
int bx = p->bx, by = p->by, nx = p->nx, ny = p->ny; int bx = p->bx, by = p->by, nx = p->nx, ny = p->ny;
@ -3038,7 +3009,8 @@ so some key presses (TAB) are swallowed by the system. */
} }
#endif #endif
} }
ns_unfocus (f); ns_reset_clipping (f);
}
} }
@ -3121,9 +3093,8 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
r.size.width = w->phys_cursor_width; r.size.width = w->phys_cursor_width;
/* Prevent the cursor from being drawn outside the text area. */ /* Prevent the cursor from being drawn outside the text area. */
ns_clip_to_row (w, glyph_row, TEXT_AREA, NO); /* do ns_focus(f, &r, 1); if remove */ if (ns_clip_to_row (w, glyph_row, TEXT_AREA, NO))
{
face = FACE_FROM_ID_OR_NULL (f, phys_cursor_glyph->face_id); face = FACE_FROM_ID_OR_NULL (f, phys_cursor_glyph->face_id);
if (face && NS_FACE_BACKGROUND (face) if (face && NS_FACE_BACKGROUND (face)
== ns_index_color (FRAME_CURSOR_COLOR (f), f)) == ns_index_color (FRAME_CURSOR_COLOR (f), f))
@ -3139,7 +3110,7 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
atomic. Cleaner ways of doing this should be investigated. atomic. Cleaner ways of doing this should be investigated.
One way would be to set a global variable DRAWING_CURSOR One way would be to set a global variable DRAWING_CURSOR
when making the call to draw_phys..(), don't focus in that when making the call to draw_phys..(), don't focus in that
case, then move the ns_unfocus() here after that call. */ case, then move the ns_reset_clipping() here after that call. */
NSDisableScreenUpdates (); NSDisableScreenUpdates ();
#endif #endif
@ -3171,7 +3142,7 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
NSRectFill (s); NSRectFill (s);
break; break;
} }
ns_unfocus (f); ns_reset_clipping (f);
/* draw the character under the cursor */ /* draw the character under the cursor */
if (cursor_type != NO_CURSOR) if (cursor_type != NO_CURSOR)
@ -3180,7 +3151,7 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
#ifdef NS_IMPL_COCOA #ifdef NS_IMPL_COCOA
NSEnableScreenUpdates (); NSEnableScreenUpdates ();
#endif #endif
}
} }
@ -3198,12 +3169,14 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
face = FACE_FROM_ID_OR_NULL (f, VERTICAL_BORDER_FACE_ID); face = FACE_FROM_ID_OR_NULL (f, VERTICAL_BORDER_FACE_ID);
ns_focus (f, &r, 1); if (ns_clip_to_rect (f, &r, 1))
{
if (face) if (face)
[ns_lookup_indexed_color(face->foreground, f) set]; [ns_lookup_indexed_color(face->foreground, f) set];
NSRectFill(r); NSRectFill(r);
ns_unfocus (f); ns_reset_clipping (f);
}
} }
@ -3230,8 +3203,8 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
NSTRACE ("ns_draw_window_divider"); NSTRACE ("ns_draw_window_divider");
ns_focus (f, &divider, 1); if (ns_clip_to_rect (f, &divider, 1))
{
if ((y1 - y0 > x1 - x0) && (x1 - x0 >= 3)) if ((y1 - y0 > x1 - x0) && (x1 - x0 >= 3))
/* A vertical divider, at least three pixels wide: Draw first and /* A vertical divider, at least three pixels wide: Draw first and
last pixels differently. */ last pixels differently. */
@ -3262,7 +3235,8 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
NSRectFill(divider); NSRectFill(divider);
} }
ns_unfocus (f); ns_reset_clipping (f);
}
} }
static void static void
@ -3846,8 +3820,8 @@ Function modeled after x_draw_glyph_string_box ().
n = ns_get_glyph_string_clip_rect (s, r); n = ns_get_glyph_string_clip_rect (s, r);
*r = NSMakeRect (s->x, s->y, s->background_width, s->height); *r = NSMakeRect (s->x, s->y, s->background_width, s->height);
ns_focus (s->f, r, n); if (ns_clip_to_rect (s->f, r, n))
{
if (s->hl == DRAW_MOUSE_FACE) if (s->hl == DRAW_MOUSE_FACE)
{ {
face = FACE_FROM_ID_OR_NULL (s->f, face = FACE_FROM_ID_OR_NULL (s->f,
@ -3894,7 +3868,7 @@ Function modeled after x_draw_glyph_string_box ().
[bgCol set]; [bgCol set];
/* NOTE: under NS this is NOT used to draw cursors, but we must avoid /* NOTE: under NS this is NOT used to draw cursors, but we must avoid
overwriting cursor (usually when cursor on a tab) */ overwriting cursor (usually when cursor on a tab). */
if (s->hl == DRAW_CURSOR) if (s->hl == DRAW_CURSOR)
{ {
CGFloat x, width; CGFloat x, width;
@ -3922,7 +3896,8 @@ overwriting cursor (usually when cursor on a tab) */
ns_draw_text_decoration (s, face, fgCol, r[i].size.width, ns_draw_text_decoration (s, face, fgCol, r[i].size.width,
r[i].origin.x); r[i].origin.x);
} }
ns_unfocus (s->f); ns_reset_clipping (s->f);
}
s->background_filled_p = 1; s->background_filled_p = 1;
} }
} }
@ -4072,9 +4047,11 @@ overwriting cursor (usually when cursor on a tab) */
if (next->first_glyph->type != STRETCH_GLYPH) if (next->first_glyph->type != STRETCH_GLYPH)
{ {
n = ns_get_glyph_string_clip_rect (s->next, r); n = ns_get_glyph_string_clip_rect (s->next, r);
ns_focus (s->f, r, n); if (ns_clip_to_rect (s->f, r, n))
{
ns_maybe_dumpglyphs_background (s->next, 1); ns_maybe_dumpglyphs_background (s->next, 1);
ns_unfocus (s->f); ns_reset_clipping (s->f);
}
} }
else else
{ {
@ -4089,10 +4066,12 @@ overwriting cursor (usually when cursor on a tab) */
|| s->first_glyph->type == COMPOSITE_GLYPH)) || s->first_glyph->type == COMPOSITE_GLYPH))
{ {
n = ns_get_glyph_string_clip_rect (s, r); n = ns_get_glyph_string_clip_rect (s, r);
ns_focus (s->f, r, n); if (ns_clip_to_rect (s->f, r, n))
{
ns_maybe_dumpglyphs_background (s, 1); ns_maybe_dumpglyphs_background (s, 1);
ns_dumpglyphs_box_or_relief (s); ns_dumpglyphs_box_or_relief (s);
ns_unfocus (s->f); ns_reset_clipping (s->f);
}
box_drawn_p = 1; box_drawn_p = 1;
} }
@ -4101,9 +4080,11 @@ overwriting cursor (usually when cursor on a tab) */
case IMAGE_GLYPH: case IMAGE_GLYPH:
n = ns_get_glyph_string_clip_rect (s, r); n = ns_get_glyph_string_clip_rect (s, r);
ns_focus (s->f, r, n); if (ns_clip_to_rect (s->f, r, n))
{
ns_dumpglyphs_image (s, r[0]); ns_dumpglyphs_image (s, r[0]);
ns_unfocus (s->f); ns_reset_clipping (s->f);
}
break; break;
case STRETCH_GLYPH: case STRETCH_GLYPH:
@ -4113,8 +4094,8 @@ overwriting cursor (usually when cursor on a tab) */
case CHAR_GLYPH: case CHAR_GLYPH:
case COMPOSITE_GLYPH: case COMPOSITE_GLYPH:
n = ns_get_glyph_string_clip_rect (s, r); n = ns_get_glyph_string_clip_rect (s, r);
ns_focus (s->f, r, n); if (ns_clip_to_rect (s->f, r, n))
{
if (s->for_overlaps || (s->cmp_from > 0 if (s->for_overlaps || (s->cmp_from > 0
&& ! s->first_glyph->u.cmp.automatic)) && ! s->first_glyph->u.cmp.automatic))
s->background_filled_p = 1; s->background_filled_p = 1;
@ -4156,13 +4137,14 @@ overwriting cursor (usually when cursor on a tab) */
NS_FACE_FOREGROUND (s->face) = tmp; NS_FACE_FOREGROUND (s->face) = tmp;
} }
ns_unfocus (s->f); ns_reset_clipping (s->f);
}
break; break;
case GLYPHLESS_GLYPH: case GLYPHLESS_GLYPH:
n = ns_get_glyph_string_clip_rect (s, r); n = ns_get_glyph_string_clip_rect (s, r);
ns_focus (s->f, r, n); if (ns_clip_to_rect (s->f, r, n))
{
if (s->for_overlaps || (s->cmp_from > 0 if (s->for_overlaps || (s->cmp_from > 0
&& ! s->first_glyph->u.cmp.automatic)) && ! s->first_glyph->u.cmp.automatic))
s->background_filled_p = 1; s->background_filled_p = 1;
@ -4172,7 +4154,8 @@ overwriting cursor (usually when cursor on a tab) */
/* ... */ /* ... */
/* Not yet implemented. */ /* Not yet implemented. */
/* ... */ /* ... */
ns_unfocus (s->f); ns_reset_clipping (s->f);
}
break; break;
default: default:
@ -4183,9 +4166,11 @@ overwriting cursor (usually when cursor on a tab) */
if (!s->for_overlaps && !box_drawn_p && s->face->box != FACE_NO_BOX) if (!s->for_overlaps && !box_drawn_p && s->face->box != FACE_NO_BOX)
{ {
n = ns_get_glyph_string_clip_rect (s, r); n = ns_get_glyph_string_clip_rect (s, r);
ns_focus (s->f, r, n); if (ns_clip_to_rect (s->f, r, n))
{
ns_dumpglyphs_box_or_relief (s); ns_dumpglyphs_box_or_relief (s);
ns_unfocus (s->f); ns_reset_clipping (s->f);
}
} }
s->num_clips = 0; s->num_clips = 0;
@ -4991,7 +4976,7 @@ static Lisp_Object ns_string_to_lispmod (const char *s)
ns_after_update_window_line, ns_after_update_window_line,
ns_update_window_begin, ns_update_window_begin,
ns_update_window_end, ns_update_window_end,
0, /* flush_display */ ns_flush_display, /* flush_display */
x_clear_window_mouse_face, x_clear_window_mouse_face,
x_get_glyph_overhangs, x_get_glyph_overhangs,
x_fix_overlapping_area, x_fix_overlapping_area,