+2011-11-29 Jan Djärv <jan.h.d@swipnet.se>
+
+ * xterm.h (struct x_output): net_wm_state_hidden_seen is new.
+
+ * xterm.c (handle_one_xevent): Only set async_visible and friends
+ if net_wm_state_hidden_seen is non-zero (Bug#10002)
+ (get_current_wm_state): Set net_wm_state_hidden_seen to 1 if
+ _NET_WM_STATE_HIDDEN is in NET_WM_STATE.
+
2011-11-28 Paul Eggert <eggert@cs.ucla.edu>
Remove GCPRO-related macros that exist only to avoid shadowing locals.
last_user_time = event.xproperty.time;
f = x_top_window_to_frame (dpyinfo, event.xproperty.window);
if (f && event.xproperty.atom == dpyinfo->Xatom_net_wm_state)
- if (x_handle_net_wm_state (f, &event.xproperty) && f->iconified)
+ if (x_handle_net_wm_state (f, &event.xproperty) && f->iconified
+ && f->output_data.x->net_wm_state_hidden_seen)
{
/* Gnome shell does not iconify us when C-z is pressed. It hides
the frame. So if our state says we aren't hidden anymore,
f->async_visible = 1;
f->async_iconified = 0;
f->output_data.x->has_been_visible = 1;
+ f->output_data.x->net_wm_state_hidden_seen = 0;
inev.ie.kind = DEICONIFY_EVENT;
XSETFRAME (inev.ie.frame_or_window, f);
}
{
Atom a = ((Atom*)tmp_data)[i];
if (a == dpyinfo->Xatom_net_wm_state_hidden)
- is_hidden = 1;
+ {
+ is_hidden = 1;
+ f->output_data.x->net_wm_state_hidden_seen = 1;
+ }
else if (a == dpyinfo->Xatom_net_wm_state_maximized_horz)
{
if (*size_state == FULLSCREEN_HEIGHT)
x_check_expected_move. */
int left_before_move;
int top_before_move;
+
+ /* Non-zero if _NET_WM_STATE_HIDDEN is set for this frame. */
+ int net_wm_state_hidden_seen;
};
#define No_Cursor (None)