comparison src/widget.c @ 6629:1a11d0ceb11b

(EmacsFrameSetCharSize): Clean up code. Replace XtVaSetValues by XtSetValues.

6628:c359dfd21b00

{
  EmacsFrame ew = (EmacsFrame) widget;
  Dimension pixel_width, pixel_height, granted_width, granted_height;
  XtGeometryResult result;
  struct frame *f = ew->emacs_frame.frame;

  if (columns < 3) columns = 3;  /* no way buddy */
  if (rows < 3) rows = 3;

  f->display.x->left_pos = f->display.x->widget->core.x;
  f->display.x->top_pos = f->display.x->widget->core.y;

    = (FRAME_HAS_VERTICAL_SCROLL_BARS (f)
       ? VERTICAL_SCROLL_BAR_PIXEL_WIDTH (f)
       : 0);
  char_to_pixel_size (ew, columns, rows, &pixel_width, &pixel_height);

/* Dont call XtMakeResize Request. This appears to not work for all
   the cases.
   Use XtVaSetValues instead.  */
#if 0
result = XtMakeResizeRequest ((Widget)ew,
				pixel_width, pixel_height,
				&granted_width, &granted_height);
  if (result == XtGeometryAlmost)
    XtMakeResizeRequest ((Widget) ew, granted_width, granted_height,
			 NULL, NULL);
#endif
  /* Recompute the entire geometry management.  */
  if (ew->core.width != pixel_width || ew->core.height != pixel_height)
    {
      int hdelta = pixel_height - ew->core.height;
      int column_widget_height = f->display.x->column_widget->core.height;
      Arg al[2];
      int ac = 0;

      XawPanedSetRefigureMode (f->display.x->column_widget, False);

      XtSetArg (al[ac], XtNheight, pixel_height); ac++;
      XtSetArg (al[ac], XtNwidth, pixel_width); ac++;
      XtSetValues ((Widget) ew, al, ac);
#if 0
      XtVaSetValues ((Widget) ew, 
		          XtNheight, pixel_height,
		          XtNwidth, pixel_width,
		          0);
#endif
      XtVaSetValues (f->display.x->column_widget,
		          XtNwidth, pixel_width,
		          XtNheight, column_widget_height + hdelta, 
		          0);
      XawPanedSetRefigureMode (f->display.x->column_widget, True);
    }

  /* We've set {FRAME,PIXEL}_{WIDTH,HEIGHT} to the values we hope to
     receive in the ConfigureNotify event; if we get what we asked

     we have to make sure to do it here.  */
  SET_FRAME_GARBAGED (f);

  /* Coordinates of the toplevel widget seem to have been lost.
     So set it to the rignt values.  */
  XtVaSetValues (f->display.x->widget, 
	        XtNx, f->display.x->left_pos,
	        XtNy, f->display.x->top_pos,
	        0);
}

6629:1a11d0ceb11b

{
  EmacsFrame ew = (EmacsFrame) widget;
  Dimension pixel_width, pixel_height, granted_width, granted_height;
  XtGeometryResult result;
  struct frame *f = ew->emacs_frame.frame;
  Arg al[2];
  int ac = 0;
  
  if (columns < 3) columns = 3;  /* no way buddy */
  if (rows < 3) rows = 3;

  f->display.x->left_pos = f->display.x->widget->core.x;
  f->display.x->top_pos = f->display.x->widget->core.y;

    = (FRAME_HAS_VERTICAL_SCROLL_BARS (f)
       ? VERTICAL_SCROLL_BAR_PIXEL_WIDTH (f)
       : 0);
  char_to_pixel_size (ew, columns, rows, &pixel_width, &pixel_height);

  /* Recompute the entire geometry management.  */
  if (ew->core.width != pixel_width || ew->core.height != pixel_height)
    {
      int hdelta = pixel_height - ew->core.height;
      int column_widget_height = f->display.x->column_widget->core.height;
      XawPanedSetRefigureMode (f->display.x->column_widget, False);

      ac = 0;
      XtSetArg (al[ac], XtNheight, pixel_height); ac++;
      XtSetArg (al[ac], XtNwidth, pixel_width); ac++;
      XtSetValues ((Widget) ew, al, ac);
 
      ac = 0;
      XtSetArg (al[ac], XtNheight, column_widget_height + hdelta); ac++;
      XtSetArg (al[ac], XtNwidth, pixel_width); ac++;
      XtSetValues (f->display.x->column_widget, al, ac);

      XawPanedSetRefigureMode (f->display.x->column_widget, True);
    }

  /* We've set {FRAME,PIXEL}_{WIDTH,HEIGHT} to the values we hope to
     receive in the ConfigureNotify event; if we get what we asked

     we have to make sure to do it here.  */
  SET_FRAME_GARBAGED (f);

  /* Coordinates of the toplevel widget seem to have been lost.
     So set it to the rignt values.  */
  ac = 0;
  XtSetArg (al[ac], XtNx, f->display.x->left_pos); ac++;
  XtSetArg (al[ac], XtNy, f->display.x->top_pos); ac++;
  XtSetValues (f->display.x->widget, al, ac);
}