KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gap should be gap to next frame not gap from previous frame

Browse Source 
Matches usage in the GIF format and makes the concept of gapless
clearer.
This commit is contained in:
Kovid Goyal 2021-02-01 17:08:59 +05:30
parent bb5c5a8e4f
commit 212906cf7d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/graphics-protocol.rst
View File

@ -551,7 +551,7 @@ Key Value Default Description
``c`` Positive integer ``0`` The 1-based frame number of the frame whose image data serves as the base data ``c`` Positive integer ``0`` The 1-based frame number of the frame whose image data serves as the base data
when creating a new frame, by default the base data is black, fully transparent pixels when creating a new frame, by default the base data is black, fully transparent pixels
``r`` Positive integer ``0`` The 1-based frame number of the frame that is being edited. By default, a new frame is created ``r`` Positive integer ``0`` The 1-based frame number of the frame that is being edited. By default, a new frame is created
``z`` 32-bit integer ``0`` The gap (in milliseconds) of this frame from the previous one. A value of ``z`` 32-bit integer ``0`` The gap (in milliseconds) of this frame from the next one. A value of
zero is ignored. Negative values create a *gapless* frame. If not specified, zero is ignored. Negative values create a *gapless* frame. If not specified,
frames have a default gap of ``40ms``. The root frame defaults to zero gap. frames have a default gap of ``40ms``. The root frame defaults to zero gap.
@ -559,7 +559,7 @@ Key Value Default Description
----------------------------------------------------------- -----------------------------------------------------------
``s`` Positive integer ``0`` ``1`` - start animation, ``>1`` - stop animation ``s`` Positive integer ``0`` ``1`` - start animation, ``>1`` - stop animation
``r`` Positive integer ``0`` The 1-based frame number of the frame that is being affected ``r`` Positive integer ``0`` The 1-based frame number of the frame that is being affected
``z`` 32-bit integer ``0`` The gap (in milliseconds) of this frame from the previous one. A value of ``z`` 32-bit integer ``0`` The gap (in milliseconds) of this frame from the next one. A value of
zero is ignored. Negative values create a *gapless* frame. zero is ignored. Negative values create a *gapless* frame.
``c`` Positive integer ``0`` The 1-based frame number of the frame that should be made the current frame ``c`` Positive integer ``0`` The 1-based frame number of the frame that should be made the current frame

12
kitty/graphics.c
View File

@ -1031,19 +1031,21 @@ scan_active_animations(GraphicsManager *self, const monotonic_t now, monotonic_t
for (size_t i = self->image_count; i-- > 0;) { for (size_t i = self->image_count; i-- > 0;) {
Image *img = self->images + i; Image *img = self->images + i;
if (img->animation_enabled && img->extra_framecnt && img->is_drawn && img->animation_duration) { if (img->animation_enabled && img->extra_framecnt && img->is_drawn && img->animation_duration) {
Frame *f = current_frame(img);
if (f) {
self->has_images_needing_animation = true; self->has_images_needing_animation = true;
Frame *next_frame = img->current_frame_index + 1 < img->extra_framecnt ? img->extra_frames + img->current_frame_index + 1 : &img->root_frame; monotonic_t next_frame_at = img->current_frame_shown_at + ms_to_monotonic_t(f->gap);
monotonic_t next_frame_at = img->current_frame_shown_at + ms_to_monotonic_t(next_frame->gap);
if (now >= next_frame_at) { if (now >= next_frame_at) {
dirtied = true; dirtied = true;
do { do {
img->current_frame_index = (img->current_frame_index + 1) % (img->extra_framecnt + 1); img->current_frame_index = (img->current_frame_index + 1) % (img->extra_framecnt + 1);
} while(!current_frame(img)->gap); } while(!current_frame(img)->gap);
update_current_frame(self, img, NULL); update_current_frame(self, img, NULL);
next_frame = img->current_frame_index + 1 < img->extra_framecnt ? img->extra_frames + img->current_frame_index + 1 : &img->root_frame; f = current_frame(img);
next_frame_at = img->current_frame_shown_at + ms_to_monotonic_t(f->gap);
}
if (next_frame_at > now && next_frame_at - now < *minimum_gap) *minimum_gap = next_frame_at - now;
} }
next_frame_at = img->current_frame_shown_at + ms_to_monotonic_t(next_frame->gap);
if (next_frame_at - now < *minimum_gap) *minimum_gap = next_frame_at - now;
} }
} }
return dirtied; return dirtied;