comparison src/widget.c @ 6464:7f93299356e2

(set_frame_size): Put #if 0 around a lot of useless code. Compute explicitely the geometry of the toplevel widget.

6463:380e8fcde9a2

  int flags = 0;
  
  Widget wmshell = get_wm_shell ((Widget) ew);
  Widget app_shell = XtParent ((Widget) wmshell);
  
  
  if (! XtIsSubclass (wmshell, shellWidgetClass)) abort ();
  if (! XtIsSubclass (app_shell, shellWidgetClass)) abort ();

  /* If the EmacsFrame doesn't have a geometry but the shell does,
     treat that as the geometry of the frame.  (Is this bogus?
     I'm not sure.) */
  if (ew->emacs_frame.geometry == 0)
    XtVaGetValues (wmshell, XtNgeometry, &ew->emacs_frame.geometry, 0);

	  w = app_w;
	  h = app_h;
	  flags |= (app_flags & (WidthValue | HeightValue));
	}
    }

  {
    struct frame* frame = ew->emacs_frame.frame;
    Dimension pixel_width, pixel_height;
    char shell_position [32];

    change_frame_size (frame, h, w, 1, 0);
    char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height);
    ew->core.width = pixel_width;
    ew->core.height = pixel_height;


    /* If a position was specified, assign it to the shell widget.
       (Else WM won't do anything with it.)
     */
    if (flags & (XValue | YValue))
      {

      mark_shell_size_user_specified (wmshell);

    /* Also assign the iconic status of the frame to the Shell, so that
       the WM sees it. */
    XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, 0);
  }
}


static void

6464:7f93299356e2

  int flags = 0;
  
  Widget wmshell = get_wm_shell ((Widget) ew);
  Widget app_shell = XtParent ((Widget) wmshell);
  
  if (! XtIsSubclass (wmshell, shellWidgetClass)) abort ();
  if (! XtIsSubclass (app_shell, shellWidgetClass)) abort ();

  /* We don't need this for the momment. The geometry is computed in 
     xfns.c.  */
#if 0
  /* If the EmacsFrame doesn't have a geometry but the shell does,
     treat that as the geometry of the frame.  (Is this bogus?
     I'm not sure.) */
  if (ew->emacs_frame.geometry == 0)
    XtVaGetValues (wmshell, XtNgeometry, &ew->emacs_frame.geometry, 0);

	  w = app_w;
	  h = app_h;
	  flags |= (app_flags & (WidthValue | HeightValue));
	}
    }
#endif /* 0 */
  {
    struct frame* frame = ew->emacs_frame.frame;
    Dimension pixel_width, pixel_height;
    char shell_position [32];

    change_frame_size (frame, h, w, 1, 0);
    char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height);
    ew->core.width = pixel_width;
    ew->core.height = pixel_height;

    /* Compute the geometry of the toplevel shell because on some platforms
       when the geometry is not set, the widget children are resized.  */
    {
      int len;
      char *tem;
      sprintf (shell_position, "=%dx%d", pixel_width, pixel_height);
      len = strlen (shell_position) + 1;
      tem = (char *) xmalloc (len);
      strncpy (tem, shell_position, len);
      XtVaSetValues (wmshell, XtNgeometry, tem, 0);
    }

#if 0 /* We don't need this also.  */
    /* If a position was specified, assign it to the shell widget.
       (Else WM won't do anything with it.)
     */
    if (flags & (XValue | YValue))
      {

      mark_shell_size_user_specified (wmshell);

    /* Also assign the iconic status of the frame to the Shell, so that
       the WM sees it. */
    XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, 0);
#endif /* 0 */
  }
}


static void