[Emacs-diffs] trunk r118159: * src/xterm.c (handle_one_xevent): Check return value from

[Jan D.]

------------------------------------------------------------
revno: 118159
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18722
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2014-10-19 19:07:54 +0200
message:
  * src/xterm.c (handle_one_xevent): Check return value from
  x_handle_net_wm_state, remove net_wm_state_hidden_seen.
  (get_current_wm_state): Remove net_wm_state_hidden_seen setting.
  
  * src/xterm.h (x_output): Remove net_wm_state_hidden_seen.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244
  src/xterm.h                    xterm.h-20091113204419-o5vbwnq5f7feedwu-228

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-19 16:28:49 +0000
+++ b/src/ChangeLog     2014-10-19 17:07:54 +0000
@@ -1,5 +1,11 @@
 2014-10-19  Jan Djärv  <address@hidden>
 
+       * xterm.h (x_output): Remove net_wm_state_hidden_seen.
+
+       * xterm.c (handle_one_xevent): Check return value from
+       x_handle_net_wm_state, remove net_wm_state_hidden_seen (Bug#18722).
+       (get_current_wm_state): Remove net_wm_state_hidden_seen setting.
+
        * gtkutil.c (create_dialog): Don't use gtk_dialog_get_action_area on
        Gt+ >= 3.12, or gtk_misc_set_alignment on Gtk+ >= 3.14 (Bug#18674).
        (make_widget_for_menu_item): Don't use gtk_misc_set_alignment on

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-10-18 13:09:18 +0000
+++ b/src/xterm.c       2014-10-19 17:07:54 +0000
@@ -6850,9 +6850,8 @@
       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)
-             && FRAME_ICONIFIED_P (f)
-             && f->output_data.x->net_wm_state_hidden_seen)
+          int not_hidden = x_handle_net_wm_state (f, &event->xproperty);
+         if (not_hidden && FRAME_ICONIFIED_P (f))
            {
              /* Gnome shell does not iconify us when C-z is pressed.
                 It hides the frame.  So if our state says we aren't
@@ -6860,12 +6859,10 @@
              SET_FRAME_VISIBLE (f, 1);
              SET_FRAME_ICONIFIED (f, 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);
            }
-         else if (! FRAME_ICONIFIED_P (f)
-                  && f->output_data.x->net_wm_state_hidden_seen)
+         else if (! not_hidden && ! FRAME_ICONIFIED_P (f))
            {
              SET_FRAME_VISIBLE (f, 0);
              SET_FRAME_ICONIFIED (f, 1);
@@ -9165,7 +9162,6 @@
       if (a == dpyinfo->Xatom_net_wm_state_hidden)
         {
           is_hidden = 1;
-          f->output_data.x->net_wm_state_hidden_seen = 1;
         }
       else if (a == dpyinfo->Xatom_net_wm_state_maximized_horz)
         {

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2014-10-18 16:19:53 +0000
+++ b/src/xterm.h       2014-10-19 17:07:54 +0000
@@ -609,9 +609,6 @@
      false, tell Xt not to wait.  */
   bool_bf wait_for_wm : 1;
 
-  /* True if _NET_WM_STATE_HIDDEN is set for this frame.  */
-  bool_bf net_wm_state_hidden_seen : 1;
-
 #ifdef HAVE_X_I18N
   /* Input context (currently, this means Compose key handler setup).  */
   XIC xic;