Merge branch 'master' into next

diff --git a/src/floating.c b/src/floating.c
index c69a51bd4ae248afa2bd3c1ef151ac7442109af6..7bbe93e44f32b01716e990be346b8875dbb19c69 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -19,6 +19,11 @@ extern xcb_connection_t *conn;
 void floating_enable(Con *con, bool automatic) {
     bool set_focus = (con == focused);
 
+    if (con->parent && con->parent->type == CT_DOCKAREA) {
+        LOG("Container is a dock window, not enabling floating mode.\n");
+        return;
+    }
+
     if (con_is_floating(con)) {
         LOG("Container is already in floating mode, not doing anything.\n");
         return;

diff --git a/testcases/t/66-assign.t b/testcases/t/66-assign.t
index a4a7bb0fe19ebed17144b2b86665bd064871a68c..776710e7604af4706478718a1cb5fecd43193c8b 100644 (file)
--- a/testcases/t/66-assign.t
+++ b/testcases/t/66-assign.t
@@ -182,4 +182,51 @@ exit_gracefully($process->pid);
 
 sleep 0.25;
 
+#####################################################################
+# regression test: dock clients with floating assignments should not crash
+# (instead, nothing should happen - dock clients can’t float)
+# ticket #501
+#####################################################################
+
+$config = <<EOT;
+# i3 config file (v4)
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+assign "special" → ~
+EOT
+
+$process = launch_with_config($config);
+
+$tmp = fresh_workspace;
+
+ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
+my @docked = get_dock_clients;
+is(@docked, 0, 'no dock clients yet');
+
+my $window = $x->root->create_child(
+    class => WINDOW_CLASS_INPUT_OUTPUT,
+    rect => [ 0, 0, 30, 30 ],
+    background_color => '#0000ff',
+    window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_DOCK'),
+);
+
+$window->_create;
+set_wm_class($window->id, 'special', 'special');
+$window->name('special window');
+$window->map;
+sleep 0.25;
+
+my $content = get_ws($tmp);
+ok(@{$content->{nodes}} == 0, 'no tiling cons');
+ok(@{$content->{floating_nodes}} == 0, 'one floating con');
+@docked = get_dock_clients;
+is(@docked, 1, 'no dock clients yet');
+
+$window->destroy;
+
+does_i3_live;
+
+exit_gracefully($process->pid);
+
+sleep 0.25;
+
 done_testing;