comparison src/frame.c @ 101019:f883a64629e1

(x_set_frame_parameters): Remember requested value for fullscreen before it's reset by the parameter handler.

101018:646ca842dc74

  int left_no_change = 0, top_no_change = 0;
  int icon_left_no_change = 0, icon_top_no_change = 0;
  int fullscreen_is_being_set = 0;
  int height_for_full_width = 0;
  int width_for_full_height = 0;

  struct gcpro gcpro1, gcpro2;

  i = 0;
  for (tail = alist; CONSP (tail); tail = Fcdr (tail))

  /* Process foreground_color and background_color before anything else.
     They are independent of other properties, but other properties (e.g.,
     cursor_color) are dependent upon them.  */
  /* Process default font as well, since fringe widths depends on it.  */
  /* Also, process fullscreen, width and height depend upon that */
  for (p = 0; p < i; p++)
    {
      Lisp_Object prop, val;

      prop = parms[p];

	  || EQ (prop, Qbackground_color)
	  || EQ (prop, Qfont)
          || EQ (prop, Qfullscreen))
	{
	  register Lisp_Object param_index, old_value;

	  old_value = get_frame_param (f, prop);
 	  fullscreen_is_being_set |= EQ (prop, Qfullscreen);
	  if (NILP (Fequal (val, old_value)))
	    {

      x_fullscreen_adjust (f, &width, &height, &new_top, &new_left);
      if (new_top != f->top_pos || new_left != f->left_pos)
        x_set_offset (f, new_left, new_top, 1);

      /* When height was set and we want fullwidth make sure
	 height gets applied.  */
      if (height_for_full_width && (f->want_fullscreen & FULLSCREEN_WIDTH))
	height = height_for_full_width;
      /* When width was set and we want fullheight make sure
	 width gets applied.  */
      if (width_for_full_height && (f->want_fullscreen & FULLSCREEN_HEIGHT))
	width = width_for_full_height;
    }

  /* Don't set these parameters unless they've been explicitly
     specified.  The window might be mapped or resized while we're in

101019:f883a64629e1

  int left_no_change = 0, top_no_change = 0;
  int icon_left_no_change = 0, icon_top_no_change = 0;
  int fullscreen_is_being_set = 0;
  int height_for_full_width = 0;
  int width_for_full_height = 0;
  enum fullscreen_type fullscreen_wanted = FULLSCREEN_NONE;

  struct gcpro gcpro1, gcpro2;

  i = 0;
  for (tail = alist; CONSP (tail); tail = Fcdr (tail))

  /* Process foreground_color and background_color before anything else.
     They are independent of other properties, but other properties (e.g.,
     cursor_color) are dependent upon them.  */
  /* Process default font as well, since fringe widths depends on it.  */
  /* Also, process fullscreen, width and height depend upon that.  */
  for (p = 0; p < i; p++)
    {
      Lisp_Object prop, val;

      prop = parms[p];

	  || EQ (prop, Qbackground_color)
	  || EQ (prop, Qfont)
          || EQ (prop, Qfullscreen))
	{
	  register Lisp_Object param_index, old_value;

	  if (EQ (prop, Qfullscreen))
	    {
	      /* The parameter handler can reset f->want_fullscreen to
	         FULLSCREEN_NONE.  But we need the requested value later
	         to decide whether a height or width parameter shall be
	         applied.  Therefore, we remember the requested value in
	         fullscreen_wanted for the following two cases.  */ 
	      if (EQ (val, Qfullheight))
		fullscreen_wanted = FULLSCREEN_HEIGHT;
	      else if (EQ (val, Qfullwidth))
		fullscreen_wanted = FULLSCREEN_WIDTH;
	    }

	  old_value = get_frame_param (f, prop);
 	  fullscreen_is_being_set |= EQ (prop, Qfullscreen);
	  if (NILP (Fequal (val, old_value)))
	    {

      x_fullscreen_adjust (f, &width, &height, &new_top, &new_left);
      if (new_top != f->top_pos || new_left != f->left_pos)
        x_set_offset (f, new_left, new_top, 1);

      /* When both height and fullwidth were requested, make sure the
	 requested value for height gets applied.  */
      if (height_for_full_width && fullscreen_wanted == FULLSCREEN_WIDTH)
	height = height_for_full_width;
      /* When both width and fullheight were requested, make sure the
	 requested value for width gets applied.  */
      if (width_for_full_height && fullscreen_wanted == FULLSCREEN_HEIGHT)
	width = width_for_full_height;
    }

  /* Don't set these parameters unless they've been explicitly
     specified.  The window might be mapped or resized while we're in