i3 - improved tiling WM

Always explicitly set border widths on manage

Patch status: merged

Patch by Tony Crisci

Long description:

When a window becomes managed, explicitly set the current border width
to the default instead of relying on the default value of -1 to apply
the correct value.

Now that there are two different kinds of default borders, a border
width value of -1 is ambiguous. This can lead to different border widths
effectively being applied when the container changes from tiling to
floating, which is surprising behavior.

This commit extends behavior introduced in this commit to normal
borders:

7afe9cc78b4d22dfd5a0c5866382a0e001ea38b6

Explicitly set current border width when BS_PIXEL

fixes #1304

To apply this patch, use:
curl http://cr.i3wm.org/patch/624/raw.patch | git am

b/src/manage.c

31 
@@ -455,11 +455,8 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
32 
         floating_enable(nc, automatic_border);
33 
     }
34
35 
-    if (nc->border_style == BS_PIXEL) {
36 
-        /* if the border style is BS_PIXEL, explicitly set the border width of
37 
-         * the new container */
38 
-        nc->current_border_width = (want_floating ? config.default_floating_border_width : config.default_border_width);
39 
-    }
40 
+    /* explicitly set the border width to the default */
41 
+    nc->current_border_width = (want_floating ? config.default_floating_border_width : config.default_border_width);
42
43 
     /* to avoid getting an UnmapNotify event due to reparenting, we temporarily
44 
      * declare no interest in any state change event of this window */

b/testcases/t/228-border-widths.t

49 
@@ -47,10 +47,12 @@ my $wscontent = get_ws($tmp);
50
51 
 my @tiled = @{$wscontent->{nodes}};
52 
 ok(@tiled == 1, 'one tiled container opened');
53 
+is($tiled[0]->{current_border_width}, 5, 'tiled current border width set to 5');
54 
 is($tilewindow->rect->width, $tiled[0]->{rect}->{width} - 2*5, 'tiled border width 5');
55
56 
 my @floating = @{$wscontent->{floating_nodes}};
57 
 ok(@floating == 1, 'one floating container opened');
58 
+is($floating[0]->{nodes}[0]->{current_border_width}, 10, 'floating current border width set to 10');
59 
 is($floatwindow->rect->width, $floating[0]->{rect}->{width} - 2*10, 'floating border width 10');
60
61 
 exit_gracefully($pid);
62 
@@ -80,12 +82,49 @@ $wscontent = get_ws($tmp);
63
64 
 @tiled = @{$wscontent->{nodes}};
65 
 ok(@tiled == 1, 'one tiled container opened');
66 
+is($tiled[0]->{current_border_width}, 3, 'tiled current border width set to 3');
67 
 is($tilewindow->rect->width, $tiled[0]->{rect}->{width} - 2*3, 'tiled border width 3');
68
69 
 @floating = @{$wscontent->{floating_nodes}};
70 
 ok(@floating == 1, 'one floating container opened');
71 
+is($floating[0]->{nodes}[0]->{current_border_width}, 7, 'floating current border width set to 7');
72 
 is($floatwindow->rect->width, $floating[0]->{rect}->{width} - 2*7, 'floating border width 7');
73
74 
 exit_gracefully($pid);
75
76 
+#####################################################################
77 
+# 3: make sure normal border widths work as well
78 
+#####################################################################
79 
+
80 
+$config = <<EOT;
81 
+# i3 config file (v4)
82 
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
83 
+
84 
+new_float normal 6
85 
+new_window normal 4
86 
+EOT
87 
+
88 
+$pid = launch_with_config($config);
89 
+
90 
+$tmp = fresh_workspace;
91 
+
92 
+ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
93 
+
94 
+$tilewindow = open_window;
95 
+$floatwindow = open_floating_window;
96 
+
97 
+$wscontent = get_ws($tmp);
98 
+
99 
+@tiled = @{$wscontent->{nodes}};
100 
+ok(@tiled == 1, 'one tiled container opened');
101 
+is($tiled[0]->{current_border_width}, 4, 'tiled current border width set to 4');
102 
+is($tilewindow->rect->width, $tiled[0]->{rect}->{width} - 2*4, 'tiled border width 4');
103 
+
104 
+@floating = @{$wscontent->{floating_nodes}};
105 
+ok(@floating == 1, 'one floating container opened');
106 
+is($floating[0]->{nodes}[0]->{current_border_width}, 6, 'floating current border width set to 6');
107 
+is($floatwindow->rect->width, $floating[0]->{rect}->{width} - 2*6, 'floating border width 6');
108 
+
109 
+exit_gracefully($pid);
110 
+
111 
 done_testing;