| Age | Commit message (Collapse) | Author |
|---|
|
|
|
This fixes a bug where the image would not be loaded if the user setup a
keybinding which advances multiple slides at once. Then the preloading for the
previous/next slide in advance() would not catch that case and instead of an
image the text version (`@filename`) would be rendered on the slide.
|
|
- also remove unneeded memmove in load()
|
|
On Sat, Jun 04, 2016 at 05:28:31PM +0200, Markus Teich wrote:
> Hiltjo Posthuma wrote:
> > previously an image file would be opened but only ffread when advancing to
> > the slide, but when the slide was not used it gave an error:
> >
> > /usr/local/bin/2ff: failed to convert image/png
>
> Heyho Hiltjo,
>
> thanks for the patch. Unfortunately it does not work if the first slide contains
> an image (ffopen is only called in advance). I think it would be good to merge
> ffopen and ffread instead into a single function ffload. This makes the `LOADED`
> state clearer and also enforces that the fd is closed in the same function where
> it is opened. This ffload function should then be called in advance() replacing
> the ffread() calls if the image is not loaded yet and once in load() for the
> first slide if it is an image.
>
Ah yes, sorry for the oversight.
> If you want to take this new approach, go for it, otherwise I'll look into it
> myself.
>
I have attached a patch that does this, I hope you'll like it.
Also I'm not sure if we need the below code in advance(), I have removed it in
the patch:
if (slidecount > idx + 1 && slides[idx + 1].img)
ffread(slides[idx + 1].img);
if (0 < idx && slides[idx - 1].img)
ffread(slides[idx - 1].img);
That seems to preload the next and previous slide image right? A minor issue I
notice also is that images seem to flicker, it uses XPutImage directly to
xw.win. Maybe it can be replaced with a backbuffer then XCopyArea? What do you
think?
In advance() it should also not always be needed to rescale the image.
--
Kind regards,
Hiltjo
From 97bebdcab4003f9acdfdd4bdf424449299ffd61d Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Sat, 4 Jun 2016 21:34:25 +0200
Subject: [PATCH] merge ffread and ffopen into one function
|
|
previously an image file would be opened but only ffread when advancing to
the slide, but when the slide was not used it gave an error:
/usr/local/bin/2ff: failed to convert image/png
this changes it to load the image on-demand once and "cache" it.
|
|
|
|
|
|
On FreeBSD the lib and include directories are in /usr/local rather than /usr.
|
|
This is a small fix for arg.h where it's possible to perform an out-of-boundary
memory access in argv's internal string.
|
|
There was a segfault when sent was called without arguments. Now we use stdin
when there's no argument or - is used. Thanks to izabera for the report.
|
|
|
|
- errors are now fatal
- no need to clean up when dying
- no need for status return codes => ffread and ffprepare now return void
|
|
|
|
|
|
- "/ 257", because 255 * 257 = UINT16_MAX
- "/ 255", because that's the maximum possible RGB value
|
|
|
|
The child thread was created because execlp will not return if successful.
The eprintf was placed after the call to execlp to catch any error, but the
child continued to return a (closed) fds[0], resulting in a second slideshow
being run by the child.
This commit fixes the issue by killing the child.
|
|
Instead of requiring an executable, allow building arbitrary shell
pipelines to filter filetypes through.
|
|
|
|
|
|
|
|
|
|
|
|
Sent now uses farbfeld[0] as an intermediate format. A series of
filters is specified in config.h that matches file extensions to
filter programs. The programs will convert between formats such as
png to farbfeld. Internally in sent we do not need to worry on how
to parse png or any other format.
This also works with jpg and gif and others. The 2ff wrapper will
use imagemagick conversion tools. This is temporary as jpg2ff and
gif2ff will also be implemented.
To make this work, you will have to clone[0] and put png2ff and 2ff
in your PATH.
[0] http://git.2f30.org/farbfeld/
|
|
|
|
|
|
|
|
|
|
|
|
In load() we allocated slides before checking if we actually read
anything from the FILE fp and then continue with an allocated but
“empty” space wich would lead to errors.
|
|
|
|
If drw was NULL, memory was still allocated for cur.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
When the window background is left at WhitePixel (from initialization) and the
user has set a dark background color in config.h, the window shortly displays
the white default background when clearing after advancing to another slide.
This was very disturbing and is fixed now by setting the default window
background color to the bgcol chosen in config.h.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
If the window manager maps our window at the requested size, we may not get a
ConfigureNotify event. This happens e.g. under ratpoison.
The result is that xw.uw and xw.uh are never set, so text is too small and
pngscale() tries to divide by 0.
|
