Merge pull request #2469 from Airblader/feature-2465

Use Xft.dpi for DPI if available.

diff --git a/testcases/t/158-wm_take_focus.t b/testcases/t/158-wm_take_focus.t
index b8dae3b1b1d0b6e84f19bd6b4bc9ea170860e0e1..5d481924af245729b80f8830131d9ee655ac4ca8 100644 (file)
--- a/testcases/t/158-wm_take_focus.t
+++ b/testcases/t/158-wm_take_focus.t
@@ -56,7 +56,8 @@ subtest 'Window without WM_TAKE_FOCUS', sub {
 
     ok(!recv_take_focus($window), 'did not receive ClientMessage');
 
-    my $con = shift get_ws_content($ws);
+    my ($nodes) = get_ws_content($ws);
+    my $con = shift @$nodes;
     ok($con->{focused}, 'con is focused');
 
     done_testing;
@@ -91,7 +92,8 @@ subtest 'Window with WM_TAKE_FOCUS and without InputHint', sub {
 
     ok(!recv_take_focus($window), 'did not receive ClientMessage');
 
-    my $con = shift get_ws_content($ws);
+    my ($nodes) = get_ws_content($ws);
+    my $con = shift @$nodes;
     ok($con->{focused}, 'con is focused');
 
     done_testing;
@@ -111,7 +113,8 @@ subtest 'Window with WM_TAKE_FOCUS and unspecified InputHint', sub {
 
     ok(!recv_take_focus($window), 'did not receive ClientMessage');
 
-    my $con = shift get_ws_content($ws);
+    my ($nodes) = get_ws_content($ws);
+    my $con = shift @$nodes;
     ok($con->{focused}, 'con is focused');
 
     done_testing;

diff --git a/travis/travis-base.Dockerfile b/travis/travis-base.Dockerfile
index 0861b26adb69a77f62a79a246bcbfc35d8a71ab1..85fa27523172b4c3de34518787345f1498b88a84 100644 (file)
--- a/travis/travis-base.Dockerfile
+++ b/travis/travis-base.Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update && \
     dpkg-dev devscripts git equivs \
     clang clang-format-3.5 \
     lintian \
-    libanyevent-perl libanyevent-i3-perl libextutils-pkgconfig-perl xcb-proto cpanminus xvfb xserver-xephyr xauth libinline-perl libinline-c-perl libxml-simple-perl libmouse-perl libmousex-nativetraits-perl libextutils-depends-perl perl-modules libtest-deep-perl libtest-exception-perl libxml-parser-perl libtest-simple-perl libtest-fatal-perl libdata-dump-perl libtest-differences-perl libxml-tokeparser-perl libipc-run-perl libxcb-xtest0-dev libx11-xcb-perl libanyevent-i3-perl && \
+    libanyevent-perl libanyevent-i3-perl libextutils-pkgconfig-perl xcb-proto cpanminus xvfb xserver-xephyr xauth libinline-perl libinline-c-perl libxml-simple-perl libmouse-perl libmousex-nativetraits-perl libextutils-depends-perl perl libtest-deep-perl libtest-exception-perl libxml-parser-perl libtest-simple-perl libtest-fatal-perl libdata-dump-perl libtest-differences-perl libxml-tokeparser-perl libipc-run-perl libxcb-xtest0-dev libx11-xcb-perl libanyevent-i3-perl && \
     rm -rf /var/lib/apt/lists/*
 
 # Install i3 build dependencies.