lib/i3test.pm: Don’t sleep(0.25), but wait until the window was mapped

This makes it faster and less racey
This commit is contained in:
Michael Stapelberg 2011-09-22 20:30:24 +01:00
parent daebe28b09
commit 83560c85d8
1 changed files with 25 additions and 1 deletions

View File

@ -7,6 +7,7 @@ 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 List::MoreUtils qw(lastval); use List::MoreUtils qw(lastval);
use Time::HiRes qw(sleep); use Time::HiRes qw(sleep);
@ -57,6 +58,7 @@ sub open_standard_window {
class => WINDOW_CLASS_INPUT_OUTPUT, class => WINDOW_CLASS_INPUT_OUTPUT,
rect => X11::XCB::Rect->new(x => 0, y => 0, width => 30, height => 30 ), rect => X11::XCB::Rect->new(x => 0, y => 0, width => 30, height => 30 ),
background_color => $color, background_color => $color,
event_mask => [ 'structure_notify' ],
); );
if (defined($floating) && $floating) { if (defined($floating) && $floating) {
@ -68,7 +70,29 @@ sub open_standard_window {
$window->name('Window ' . counter_window()); $window->name('Window ' . counter_window());
$window->map; $window->map;
sleep(0.25); # wait for the mapped event with a timeout of 0.25s
my $cv = AE::cv;
my $prep = EV::prepare sub {
$x->flush;
};
my $check = EV::check sub {
while (defined(my $event = $x->poll_for_event)) {
if ($event->{response_type} == MAP_NOTIFY) {
$cv->send(0)
}
}
};
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 0.25s
my $timeout = AE::timer 0.5, 0, sub { say STDERR "timeout"; $cv->send(1) };
my $result = $cv->recv;
return $window; return $window;
} }