From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 7 Mar 2015 10:46:43 +0000 (+0100)
Subject: Revert "Handle WM_CHANGE_STATE requests for iconic state"
X-Git-Tag: 4.9.1~6^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d551618cf03695b765b4f6d7f30df8e01847b79f;p=i3%2Fi3

Revert "Handle WM_CHANGE_STATE requests for iconic state"

This reverts commit 136b3e345bfde637d3270eafaa2d8aa3555cc3d5.

fixes #1516
---

diff --git a/include/atoms.xmacro b/include/atoms.xmacro
index 1f28c014..59dab6ed 100644
--- a/include/atoms.xmacro
+++ b/include/atoms.xmacro
@@ -39,4 +39,3 @@ xmacro(I3_PID)
 xmacro(_NET_REQUEST_FRAME_EXTENTS)
 xmacro(_NET_FRAME_EXTENTS)
 xmacro(_MOTIF_WM_HINTS)
-xmacro(WM_CHANGE_STATE)
diff --git a/src/handlers.c b/src/handlers.c
index b0a27df5..529a4b58 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -804,21 +804,6 @@ static void handle_client_message(xcb_client_message_event_t *event) {
             XCB_ATOM_CARDINAL, 32, 4,
             &r);
         xcb_flush(conn);
-    } else if (event->type == A_WM_CHANGE_STATE) {
-        /* http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.4 */
-        Con *con = con_by_window_id(event->window);
-
-        if (con && event->data.data32[0] == 3) {
-            /* this request is so we can play some animiation showing the
-             * window physically moving to the tray before we close it (I
-             * think) */
-            DLOG("Client has requested iconic state. Closing this con. (con = %p)\n", con);
-            tree_close(con, DONT_KILL_WINDOW, false, false);
-            tree_render();
-        } else {
-            DLOG("Not handling WM_CHANGE_STATE request. (window = %d, state = %d)\n", event->window, event->data.data32[0]);
-        }
-
     } else if (event->type == A__NET_CURRENT_DESKTOP) {
         /* This request is used by pagers and bars to change the current
          * desktop likely as a result of some user action. We interpret this as
diff --git a/testcases/t/231-wm-change-state.t b/testcases/t/231-wm-change-state.t
deleted file mode 100644
index 92992b45..00000000
--- a/testcases/t/231-wm-change-state.t
+++ /dev/null
@@ -1,49 +0,0 @@
-#!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)
-#
-# Correctly handle WM_CHANGE_STATE requests for the iconic state
-# See http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.4
-# Ticket: #1279
-# Bug still in: 4.8-7-gf4a8253
-use i3test;
-
-sub send_iconic_state_request {
-    my ($win) = @_;
-
-    my $msg = pack "CCSLLLLLL",
-        X11::XCB::CLIENT_MESSAGE, # response_type
-        32, # format
-        0, # sequence
-        $win->id, # window
-        $x->atom(name => 'WM_CHANGE_STATE')->id, # message type
-        3, # data32[0]
-        0, # data32[1]
-        0, # data32[2]
-        0, # data32[3]
-        0; # data32[4]
-
-    $x->send_event(0, $x->get_root_window(), X11::XCB::EVENT_MASK_SUBSTRUCTURE_REDIRECT, $msg);
-}
-
-my $ws = fresh_workspace;
-my $win = open_window;
-
-send_iconic_state_request($win);
-sync_with_i3;
-
-is(@{get_ws($ws)->{nodes}}, 0, 'When a window requests the iconic state, the container should be closed');
-
-done_testing;