dec05eba/12to11
1
0
Fork 0
forked from 12to11/12to11
Code Pull requests Activity

Fix more instances of flicker in subsurfaces

Browse source 
* frame_clock.c (StartFrame): If the end frame timer is being
used to, return True and reset end_frame_called.
* subcompositor.c (SubcompositorLookupView): Fix coordinate
lookup inside subsurfaces.
* xdg_surface.c (NoteFrame): Rearrange frame callback logic.
This commit is contained in:
hujianwei 2022-10-23 07:35:18 +00:00
parent f83f80abd8
commit 76e40a1a74
3 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frame_clock.c
View file

@ -367,7 +367,23 @@ StartFrame (FrameClock *clock, Bool urgent, Bool predict)
return False; return False;
if (clock->in_frame) if (clock->in_frame)
return False; {
if (clock->end_frame_timer
/* If the end of the frame is still pending but EndFrame has
been called, then treat the frame as if it has just been
started. */
&& clock->end_frame_called)
{
/* In addition, require another EndFrame for the frame to
end. */
clock->end_frame_called = False;
return True;
}
/* Otherwise it genuinely is invalid to call StartFrame here, so
return False. */
return False;
}
if (clock->need_configure) if (clock->need_configure)
{ {

4
subcompositor.c
View file

@ -3063,8 +3063,8 @@ SubcompositorLookupView (Subcompositor *subcompositor, int x, int y,
/* Now see if the input region contains the given /* Now see if the input region contains the given
coordinates. If it does, return the view. */ coordinates. If it does, return the view. */
if (pixman_region32_contains_point (&list->view->input, x, y, if (pixman_region32_contains_point (&list->view->input, temp_x,
&box)) temp_y, &box))
{ {
*view_x = list->view->abs_x - subcompositor->min_x; *view_x = list->view->abs_x - subcompositor->min_x;
*view_y = list->view->abs_y - subcompositor->min_y; *view_y = list->view->abs_y - subcompositor->min_y;

32
xdg_surface.c
View file

@ -1235,9 +1235,11 @@ NoteFrame (FrameMode mode, uint64_t id, void *data)
/* Record this frame counter as the pending frame. */ /* Record this frame counter as the pending frame. */
role->pending_frame = id; role->pending_frame = id;
if (!(role->state & StateFrameStarted) if (!(role->state & StateFrameStarted))
&& XLFrameClockStartFrame (role->clock, False)) {
role->state |= StateFrameStarted; if (XLFrameClockStartFrame (role->clock, False))
role->state |= StateFrameStarted;
}
/* Also run role "commit inside frame" hook. */ /* Also run role "commit inside frame" hook. */
if (role->impl && role->impl->funcs.commit_inside_frame) if (role->impl && role->impl->funcs.commit_inside_frame)
@ -1265,26 +1267,16 @@ NoteFrame (FrameMode mode, uint64_t id, void *data)
/* End the frame. */ /* End the frame. */
XLFrameClockEndFrame (role->clock); XLFrameClockEndFrame (role->clock);
/* Clear the frame completed flag. */ /* No frame was started clock-side for this frame. That
role->state &= ~StateFrameStarted; means programs waiting for frame callbacks will not get
any, so the frame callbacks must be run by hand. */
/* Clients which commit when a configure event that has not if (!(role->state & StateFrameStarted)
yet been acked still expect frame callbacks to be called;
however, frame callbacks are not provided by the frame
clock while it is frozen.
If that happens, just run the frame callback
immediately. */
if (XLFrameClockIsFrozen (role->clock)
/* If the window is not mapped, then the native frame
clock will not draw frames. Some clients do commit
before the initial configure event and wait for the
frame callback to be called after or before
ack_configure, leading to the mapping commit never
being performed. */
|| !IsRoleMapped (role)) || !IsRoleMapped (role))
RunFrameCallbacksConditionally (role); RunFrameCallbacksConditionally (role);
/* Clear the frame completed flag. */
role->state &= ~StateFrameStarted;
if (mode == ModePresented if (mode == ModePresented
&& renderer_flags & SupportsDirectPresent) && renderer_flags & SupportsDirectPresent)
{ {