comparison src/gtkutil.c @ 50318:5b50d76d9211

* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared. (xg_frame_set_char_size): Calculate scroll bar width before frame width. Call SET_FRAME_GARBAGED and cancel_mouse_face. (xg_separator_p): Check for all documented separator types. (xg_update_scrollbar_pos): Variable gheight not needed, use height. (update_frame_tool_bar): Don't call gdk_window_process_all_updates.

50317:e0b9e9b6bfac

      all.width = pixelwidth;
      all.height = pixelheight - mbheight - tbheight;

      gtk_widget_size_allocate (x->edit_widget, &all);

      xg_frame_cleared (f);

      change_frame_size (f, rows, columns, 0, 1, 0);
      SET_FRAME_GARBAGED (f);
      cancel_mouse_face (f);
    }
}

     int cols;
     int rows;
{
  int pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows)
    + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
  int pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols);

  /* Take into account the size of the scroll bar.  Always use the
     number of columns occupied by the scroll bar here otherwise we
     might end up with a frame width that is not a multiple of the
     frame's character width which is bad for vertically split

       : (FRAME_SCROLL_BAR_COLS (f)
          * FONT_WIDTH (f->output_data.x->font)));

  compute_fringe_widths (f, 0);

  /* Must resize our top level widget.  Font size may have changed,
     but not rows/cols.  */
  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
                     pixelwidth, pixelheight);
  xg_resize_widgets (f, pixelwidth, pixelheight);
}

/* Convert an X Window WSESC to its corresponding GtkWidget.
   Must be done like this, because GtkWidget:s can have "hidden"
   X Window that aren't accessible.

xg_fixed_handle_expose(GtkWidget *widget,
                       GdkEventExpose *event,
                       gpointer user_data)
{
  GList *iter;
  
  for (iter = GTK_FIXED (widget)->children; iter; iter = g_list_next (iter))
    {
      GtkFixedChild *child_data = (GtkFixedChild *) iter->data;
      GtkWidget *child = child_data->widget;
      GdkWindow *window = child->window;

  if (! item->enabled) gtk_widget_set_sensitive (w, FALSE);

  return w;
}

/* Return non-zero if NAME specifies a separator (GTK only has one
   separator type)  */
static int
xg_separator_p (char *name)
{
  if (! name) return 0;

  return strcmp (name, "--") == 0
    || strncmp (name, "--:", 3) == 0
    || strcmp (name, "---") == 0;
}

GtkWidget *xg_did_tearoff;

/* Callback invoked when a detached menu window is removed.  Here we

  GtkWidget *wscroll = xg_get_widget_from_map (scrollbar_id);

  if (wscroll)
    {
      GtkWidget *wfixed = f->output_data.x->edit_widget;
      int gheight = max (height, 1);
      int winextra = canon_width > width ? (canon_width - width) / 2 : 0;
      int bottom = top + gheight;

      gint slider_width;
      int oldtop, oldleft, oldbottom;
      GtkRequisition req;

          bottomdiff = abs (oldbottom - bottom);
          topdiff = abs (oldtop - top);

          if (oldleft != left)
            {
              gdk_window_clear_area (wfixed->window, xl, top, wbl, gheight);
              gdk_window_clear_area (wfixed->window, xr, top, wbr, gheight);
            }

          if (oldtop > top)
            {
              gdk_window_clear_area (wfixed->window, xl, top, wbl, topdiff);

            }
        }

      /* Move and resize to new values.  */
      gtk_fixed_move (GTK_FIXED (wfixed), wscroll, left, top);
      gtk_widget_set_size_request (wscroll, width, gheight);

      /* Must force out update so changed scroll bars gets redrawn.  */
      gdk_window_process_all_updates ();

      SET_FRAME_GARBAGED (f);
      cancel_mouse_face (f);

    {
      FRAME_TOOLBAR_HEIGHT (f) = new_req.height;
      xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f));
    }

  /* Must force out update so changed images gets redrawn.  */
  gdk_window_process_all_updates ();
 
  if (icon_list) g_list_free (icon_list);

  UNBLOCK_INPUT;
}

50318:5b50d76d9211

      all.width = pixelwidth;
      all.height = pixelheight - mbheight - tbheight;

      gtk_widget_size_allocate (x->edit_widget, &all);

      change_frame_size (f, rows, columns, 0, 1, 0);
      SET_FRAME_GARBAGED (f);
      cancel_mouse_face (f);
    }
}

     int cols;
     int rows;
{
  int pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows)
    + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
  int pixelwidth;

  /* Take into account the size of the scroll bar.  Always use the
     number of columns occupied by the scroll bar here otherwise we
     might end up with a frame width that is not a multiple of the
     frame's character width which is bad for vertically split

       : (FRAME_SCROLL_BAR_COLS (f)
          * FONT_WIDTH (f->output_data.x->font)));

  compute_fringe_widths (f, 0);

  /* CHAR_TO_PIXEL_WIDTH uses vertical_scroll_bar_extra, so call it
     after calculating that value.  */
  pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols);

  /* Must resize our top level widget.  Font size may have changed,
     but not rows/cols.  */
  gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
                     pixelwidth, pixelheight);
  xg_resize_widgets (f, pixelwidth, pixelheight);

  SET_FRAME_GARBAGED (f);
  cancel_mouse_face (f);
}

/* Convert an X Window WSESC to its corresponding GtkWidget.
   Must be done like this, because GtkWidget:s can have "hidden"
   X Window that aren't accessible.

xg_fixed_handle_expose(GtkWidget *widget,
                       GdkEventExpose *event,
                       gpointer user_data)
{
  GList *iter;

  for (iter = GTK_FIXED (widget)->children; iter; iter = g_list_next (iter))
    {
      GtkFixedChild *child_data = (GtkFixedChild *) iter->data;
      GtkWidget *child = child_data->widget;
      GdkWindow *window = child->window;

  if (! item->enabled) gtk_widget_set_sensitive (w, FALSE);

  return w;
}

/* Return non-zero if LABEL specifies a separator (GTK only has one
   separator type)  */
static int
xg_separator_p (char *label)
{
  if (! label) return 0;
  else if (strlen (label) > 3
	   && strncmp (label, "--", 2) == 0
	   && label[2] != '-')
    {
      static char* separator_names[] = {
        "space",
	"no-line",
	"single-line",
	"double-line",
	"single-dashed-line",
	"double-dashed-line",
	"shadow-etched-in",
	"shadow-etched-out",
	"shadow-etched-in-dash",
	"shadow-etched-out-dash",
	"shadow-double-etched-in",
	"shadow-double-etched-out",
	"shadow-double-etched-in-dash",
	"shadow-double-etched-out-dash",
        0,
      };

      int i;

      label += 2;
      for (i = 0; separator_names[i]; ++i)
	if (strcmp (label, separator_names[i]) == 0)
          return 1;
    }
  else
    {
      /* Old-style separator, maybe.  It's a separator if it contains
	 only dashes.  */
      while (*label == '-')
	++label;
      if (*label == 0) return 1;
    }

  return 0;
}

GtkWidget *xg_did_tearoff;

/* Callback invoked when a detached menu window is removed.  Here we

  GtkWidget *wscroll = xg_get_widget_from_map (scrollbar_id);

  if (wscroll)
    {
      GtkWidget *wfixed = f->output_data.x->edit_widget;
      int winextra = canon_width > width ? (canon_width - width) / 2 : 0;
      int bottom = top + height;

      gint slider_width;
      int oldtop, oldleft, oldbottom;
      GtkRequisition req;

          bottomdiff = abs (oldbottom - bottom);
          topdiff = abs (oldtop - top);

          if (oldleft != left)
            {
              gdk_window_clear_area (wfixed->window, xl, top, wbl, height);
              gdk_window_clear_area (wfixed->window, xr, top, wbr, height);
            }

          if (oldtop > top)
            {
              gdk_window_clear_area (wfixed->window, xl, top, wbl, topdiff);

            }
        }

      /* Move and resize to new values.  */
      gtk_fixed_move (GTK_FIXED (wfixed), wscroll, left, top);
      gtk_widget_set_size_request (wscroll, width, height);
      
      /* Must force out update so changed scroll bars gets redrawn.  */
      gdk_window_process_all_updates ();

      SET_FRAME_GARBAGED (f);
      cancel_mouse_face (f);

    {
      FRAME_TOOLBAR_HEIGHT (f) = new_req.height;
      xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f));
    }

  if (icon_list) g_list_free (icon_list);

  UNBLOCK_INPUT;
}