nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove _NET_WM_STATE on withdrawn windows. 

According to the spec, _NET_WM_STATE must be removed when the window is
withdrawn, much like _NET_WM_DESKTOP.

fixes #2165
This commit is contained in:
Ingo Bürk 2016-02-07 12:08:50 +01:00
parent fbfbdb8e12
commit ad95038c5e
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/handlers.c
View File

@ -503,8 +503,10 @@ static void handle_unmap_notify_event(xcb_unmap_notify_event_t *event) {
goto ignore_end; goto ignore_end;
} }
/* Since we close the container, we need to unset _NET_WM_DESKTOP according to the spec. */ /* Since we close the container, we need to unset _NET_WM_DESKTOP and
* _NET_WM_STATE according to the spec. */
xcb_delete_property(conn, event->window, A__NET_WM_DESKTOP); xcb_delete_property(conn, event->window, A__NET_WM_DESKTOP);
xcb_delete_property(conn, event->window, A__NET_WM_STATE);
tree_close_internal(con, DONT_KILL_WINDOW, false, false); tree_close_internal(con, DONT_KILL_WINDOW, false, false);
tree_render(); tree_render();

16
testcases/t/253-multiple-net-wm-state-atoms.t
View File

@ -33,7 +33,7 @@ sub get_wm_state {
my $reply = $x->get_property_reply($cookie->{sequence}); my $reply = $x->get_property_reply($cookie->{sequence});
my $len = $reply->{length}; my $len = $reply->{length};
return 0 if $len == 0; return undef if $len == 0;
my @atoms = unpack("L$len", $reply->{value}); my @atoms = unpack("L$len", $reply->{value});
return \@atoms; return \@atoms;
@ -64,6 +64,20 @@ cmd 'sticky enable';
cmd 'fullscreen disable'; cmd 'fullscreen disable';
is_deeply(get_wm_state($window), [ $wm_state_sticky ], 'only _NET_WM_STATE_STICKY is set'); is_deeply(get_wm_state($window), [ $wm_state_sticky ], 'only _NET_WM_STATE_STICKY is set');
###############################################################################
# _NET_WM_STATE is removed when the window is withdrawn.
###############################################################################
fresh_workspace;
$window = open_window;
cmd 'sticky enable';
is_deeply(get_wm_state($window), [ $wm_state_sticky ], 'sanity check: _NET_WM_STATE_STICKY is set');
$window->unmap;
wait_for_unmap($window);
is(get_wm_state($window), undef, '_NET_WM_STATE is removed');
########################################################################## ##########################################################################
done_testing; done_testing;