comparison src/xterm.c @ 7738:a810335742bb

(x_iconify_frame): Call x_set_offset, if x_make_frame_visible would do so. (x_make_frame_visible): Don't call x_set_offset if frame is iconic. (XTread_socket): For ConfigureNotify, if wm decorations exist, set NorthWestGravity.

7737:a071be44cfae

	      {
		int x, y;
		x_real_positions (f, &x, &y);
		f->display.x->left_pos = x;
		f->display.x->top_pos = y;
	      }
	    }
#endif /* not USE_X_TOOLKIT */
	  break;

  else
    x_lower_frame (f);
}


/* Change from withdrawn state to mapped state. */

x_make_frame_visible (f)
     struct frame *f;
{
  int mask;

  if (! FRAME_VISIBLE_P (f))
    {
#ifdef HAVE_X11
#ifndef USE_X_TOOLKIT
      x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0);
#endif

      if (! EQ (Vx_no_window_manager, Qt))
	x_wm_set_window_state (f, NormalState);
#ifdef USE_X_TOOLKIT

#else /* not USE_X_TOOLKIT */

  BLOCK_INPUT;

#ifdef HAVE_X11
  /* Since we don't know which revision of X we're running, we'll use both
     the X11R3 and X11R4 techniques.  I don't know if this is a good idea.  */

  /* X11R4: send a ClientMessage to the window manager using the
     WM_CHANGE_STATE type.  */

7738:a810335742bb

	      {
		int x, y;
		x_real_positions (f, &x, &y);
		f->display.x->left_pos = x;
		f->display.x->top_pos = y;
		if (y != event.xconfigure.y)
		  {
		    /* Since the WM decorations come below top_pos now,
		       we must put them below top_pos in the future.  */
		    f->display.x->win_gravity = NorthWestGravity;
		    x_wm_set_size_hint (f, 0, 0);
		  }
	      }
	    }
#endif /* not USE_X_TOOLKIT */
	  break;

  else
    x_lower_frame (f);
}


/* Change from withdrawn state to mapped state,
   or deiconify. */

x_make_frame_visible (f)
     struct frame *f;
{
  int mask;

  if (! FRAME_VISIBLE_P (f))
    {
#ifdef HAVE_X11
#ifndef USE_X_TOOLKIT
      if (! FRAME_ICONIFIED_P (f))
	x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0);
#endif

      if (! EQ (Vx_no_window_manager, Qt))
	x_wm_set_window_state (f, NormalState);
#ifdef USE_X_TOOLKIT

#else /* not USE_X_TOOLKIT */

  BLOCK_INPUT;

#ifdef HAVE_X11
  /* Make sure the X server knows where the window should be positioned,
     in case the user deiconifies with the window manager.  */
  if (! FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f))
    x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0);

  /* Since we don't know which revision of X we're running, we'll use both
     the X11R3 and X11R4 techniques.  I don't know if this is a good idea.  */

  /* X11R4: send a ClientMessage to the window manager using the
     WM_CHANGE_STATE type.  */