1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
From b4f7142509e3af51504a1e72163d544d305f0fa8 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 29 Jun 2013 18:27:33 +0000
Subject: Bugfix: fix focus handling in 'floating disable' on non-visible windows (Thanks necoro)
fixes #1027
---
diff --git a/src/floating.c b/src/floating.c
index 49a4122..ea93747 100644
--- a/src/floating.c
+++ b/src/floating.c
@@ -315,6 +315,8 @@ void floating_disable(Con *con, bool automatic) {
return;
}
+ const bool set_focus = (con == focused);
+
Con *ws = con_get_workspace(con);
/* 1: detach from parent container */
@@ -344,8 +346,9 @@ void floating_disable(Con *con, bool automatic) {
con_attach(con, con->parent, false);
con_fix_percent(con->parent);
- // TODO: don’t influence focus handling when Con was not focused before.
- con_focus(con);
+
+ if (set_focus)
+ con_focus(con);
}
/*
diff --git a/testcases/t/208-regress-floating-criteria.t b/testcases/t/208-regress-floating-criteria.t
new file mode 100644
index 0000000..09a29fd
--- a/dev/null
+++ b/testcases/t/208-regress-floating-criteria.t
@@ -0,0 +1,68 @@
+#!perl
+# vim:ts=4:sw=4:expandtab
+#
+# Please read the following documents before working on tests:
+# • http://build.i3wm.org/docs/testsuite.html
+# (or docs/testsuite)
+#
+# • http://build.i3wm.org/docs/lib-i3test.html
+# (alternatively: perldoc ./testcases/lib/i3test.pm)
+#
+# • http://build.i3wm.org/docs/ipc.html
+# (or docs/ipc)
+#
+# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
+# (unless you are already familiar with Perl)
+#
+# Regression test for focus handling when using floating enable/disable with
+# criteria for windows on non-visible workspaces.
+# Ticket: #1027
+# Bug still in: 4.5.1-90-g6582da9
+use i3test i3_autostart => 0;
+use X11::XCB qw(PROP_MODE_REPLACE);
+
+my $config = <<'EOT';
+# i3 config file (v4)
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+
+assign [class="^special$"] → mail
+for_window [class="^special$"] floating enable, floating disable
+EOT
+
+my $pid = launch_with_config($config);
+
+# TODO: move this to X11::XCB::Window
+sub set_wm_class {
+ my ($id, $class, $instance) = @_;
+
+ # Add a _NET_WM_STRUT_PARTIAL hint
+ my $atomname = $x->atom(name => 'WM_CLASS');
+ my $atomtype = $x->atom(name => 'STRING');
+
+ $x->change_property(
+ PROP_MODE_REPLACE,
+ $id,
+ $atomname->id,
+ $atomtype->id,
+ 8,
+ length($class) + length($instance) + 2,
+ "$instance\x00$class\x00"
+ );
+}
+
+my $window = open_window(
+ name => 'Borderless window',
+ before_map => sub { set_wm_class($_->id, 'special', 'special') },
+ dont_map => 1,
+);
+$window->map;
+
+sync_with_i3;
+
+cmd '[class="^special$"] focus';
+
+does_i3_live;
+
+exit_gracefully($pid);
+
+done_testing;
--
cgit v0.9.0.3
|
