Commit 0d9f71a6 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

winwidget.c: Rename alias; update feh.t while at it

parent 56dec873

src/winwidget.c

+7 −5
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) 
{

	int sx, sy, sw, sh, dx, dy, dw, dh;

	int calc_w, calc_h;

	int alias = 0; /* TODO should be called antialias */

	int antialias = 0;



	if (!winwid->full_screen && resize) {

		winwidget_resize(winwid, winwid->im_w, winwid->im_h);
@@ -527,19 +527,21 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) 
	   sx, sy, sw, sh, dx, dy, dw, dh, winwid->zoom));



	if ((winwid->zoom != 1.0) && !force_alias && !winwid->force_aliasing)

		alias = 1;

		antialias = 1;



	D(("winwidget_render(): winwid->im_angle = %f\n", winwid->im_angle));

	if (winwid->has_rotated)

		gib_imlib_render_image_part_on_drawable_at_size_with_rotation

		    (winwid->bg_pmap, winwid->im, sx, sy, sw, sh, dx, dy, dw, dh, winwid->im_angle, 1, 1, alias);

			(winwid->bg_pmap, winwid->im, sx, sy, sw, sh, dx, dy, dw, dh,

			winwid->im_angle, 1, 1, antialias);

	else

		gib_imlib_render_image_part_on_drawable_at_size(winwid->bg_pmap,

								winwid->im,

								sx, sy, sw,

								sh, dx, dy,

								dw, dh, 1,

								gib_imlib_image_has_alpha(winwid->im), alias);

								gib_imlib_image_has_alpha(winwid->im),

								antialias);



	if (opt.mode == MODE_NORMAL) {

		if (opt.caption_path)
@@ -550,7 +552,7 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) 
			feh_draw_actions(winwid);

		if (opt.info_cmd)

			feh_draw_info(winwid);

	} else if ((opt.mode == MODE_ZOOM) && !alias)

	} else if ((opt.mode == MODE_ZOOM) && !antialias)

		feh_draw_zoom(winwid);



	XSetWindowBackgroundPixmap(disp, winwid->win, winwid->bg_pmap);

test/feh.t

+2 −12
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
use strict;

use warnings;

use 5.010;

use Test::Command tests => 63;

use Test::Command tests => 60;



$ENV{HOME} = 'test';
@@ -39,17 +39,7 @@ my $re_loadable = qr{test/ok/...}; 
my $re_unloadable = qr{test/fail/...};

my $re_list_action = qr{test/ok/... 16x16 \(${feh_name}\)};



my $cmd = Test::Command->new(cmd => $feh);



# Insufficient Arguments -> Usage should return failure

$cmd->exit_is_num(1, 'missing arguments return 1');

$cmd->stdout_is_eq('', 'missing arguments print usage (!stdout)');

$cmd->stderr_is_eq(<<"EOF", 'missing arguments print usage (stderr)');

${feh_name} - No loadable images specified.

Use ${feh_name} --help for detailed usage information

EOF



$cmd = Test::Command->new(cmd => "$feh --version");

my $cmd = Test::Command->new(cmd => "$feh --version");



$cmd->exit_is_num(0);

$cmd->stdout_is_eq("${feh_name} version ${feh_version}\n"