testcases: drop EV dependency

This commit is contained in:
Maik Fischer 2011-11-22 02:34:26 +01:00 committed by Michael Stapelberg
parent 8d83697cc2
commit 372b98d08e
2 changed files with 7 additions and 11 deletions

View File

@ -10,8 +10,7 @@ WriteMakefile(
'AnyEvent' => 0, 'AnyEvent' => 0,
'AnyEvent::I3' => '0.09', 'AnyEvent::I3' => '0.09',
'X11::XCB' => '0.03', 'X11::XCB' => '0.03',
'EV' => 0, 'Inline' => 0,
'Inline' => 0,
}, },
PM => {}, # do not install any files from this directory PM => {}, # do not install any files from this directory
clean => { clean => {

View File

@ -8,7 +8,6 @@ use X11::XCB::Rect;
use X11::XCB::Window; use X11::XCB::Window;
use X11::XCB qw(:all); use X11::XCB qw(:all);
use AnyEvent::I3; use AnyEvent::I3;
use EV;
use List::Util qw(first); use List::Util qw(first);
use Time::HiRes qw(sleep); use Time::HiRes qw(sleep);
use Cwd qw(abs_path); use Cwd qw(abs_path);
@ -94,11 +93,12 @@ sub wait_for_event {
my $cv = AE::cv; my $cv = AE::cv;
my $prep = EV::prepare sub { $x->flush;
$x->flush;
};
my $check = EV::check sub { # unfortunately, there is no constant for this
my $ae_read = 0;
my $guard = AE::io $x->get_file_descriptor, $ae_read, sub {
while (defined(my $event = $x->poll_for_event)) { while (defined(my $event = $x->poll_for_event)) {
if ($cb->($event)) { if ($cb->($event)) {
$cv->send(1); $cv->send(1);
@ -107,15 +107,12 @@ sub wait_for_event {
} }
}; };
my $watcher = EV::io $x->get_file_descriptor, EV::READ, sub {
# do nothing, we only need this watcher so that EV picks up the events
};
# Trigger timeout after $timeout seconds (can be fractional) # Trigger timeout after $timeout seconds (can be fractional)
my $t = AE::timer $timeout, 0, sub { warn "timeout ($timeout secs)"; $cv->send(0) }; my $t = AE::timer $timeout, 0, sub { warn "timeout ($timeout secs)"; $cv->send(0) };
my $result = $cv->recv; my $result = $cv->recv;
undef $t; undef $t;
undef $guard;
return $result; return $result;
} }