[Emacs-diffs] Changes to emacs/src/xfns.c

[Kim F. Storm]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.529 emacs/src/xfns.c:1.530
*** emacs/src/xfns.c:1.529      Sat Nov 24 12:48:40 2001
--- emacs/src/xfns.c    Fri Nov 30 20:23:29 2001
***************
*** 740,745 ****
--- 740,746 ----
  void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
  void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
  void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
+ static void x_set_fringe_width P_ ((struct frame *, Lisp_Object, 
Lisp_Object));
  void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object));
  void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
  void x_set_internal_border_width P_ ((struct frame *, Lisp_Object,
***************
*** 802,807 ****
--- 803,810 ----
    "scroll-bar-background",    x_set_scroll_bar_background,
    "screen-gamma",             x_set_screen_gamma,
    "line-spacing",             x_set_line_spacing,
+   "left-fringe",              x_set_fringe_width,
+   "right-fringe",             x_set_fringe_width,
    "wait-for-wm",              x_set_wait_for_wm
  };
  
***************
*** 896,908 ****
    /* 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.  */
    for (p = 0; p < i; p++) 
      {
        Lisp_Object prop, val;
  
        prop = parms[p];
        val = values[p];
!       if (EQ (prop, Qforeground_color) || EQ (prop, Qbackground_color))
        {
          register Lisp_Object param_index, old_value;
  
--- 899,914 ----
    /* 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.  */
    for (p = 0; p < i; p++) 
      {
        Lisp_Object prop, val;
  
        prop = parms[p];
        val = values[p];
!       if (EQ (prop, Qforeground_color)
!         || EQ (prop, Qbackground_color)
!         || EQ (prop, Qfont))
        {
          register Lisp_Object param_index, old_value;
  
***************
*** 941,947 ****
        icon_top = val;
        else if (EQ (prop, Qicon_left))
        icon_left = val;
!       else if (EQ (prop, Qforeground_color) || EQ (prop, Qbackground_color))
        /* Processed above.  */
        continue;
        else
--- 947,955 ----
        icon_top = val;
        else if (EQ (prop, Qicon_left))
        icon_left = val;
!       else if (EQ (prop, Qforeground_color)
!              || EQ (prop, Qbackground_color)
!              || EQ (prop, Qfont))
        /* Processed above.  */
        continue;
        else
***************
*** 1904,1909 ****
--- 1912,1925 ----
      }
  }
  
+ static void
+ x_set_fringe_width (f, new_value, old_value)
+      struct frame *f;
+      Lisp_Object new_value, old_value;
+ {
+   x_compute_fringe_widths (f, 1);
+ }
+ 
  void
  x_set_border_width (f, arg, oldval)
       struct frame *f;
***************
*** 3120,3127 ****
      = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
         ? 0
         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font)));
!   f->output_data.x->fringes_extra
!     = FRAME_FRINGE_WIDTH (f);
    f->output_data.x->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
    f->output_data.x->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
  
--- 3136,3144 ----
      = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
         ? 0
         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font)));
! 
!   x_compute_fringe_widths (f, 0);
! 
    f->output_data.x->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
    f->output_data.x->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
  
***************
*** 4357,4362 ****
--- 4374,4383 ----
                       "screenGamma", "ScreenGamma", RES_TYPE_FLOAT);
    x_default_parameter (f, parms, Qline_spacing, Qnil,
                       "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);
+   x_default_parameter (f, parms, Qleft_fringe, Qnil,
+                      "leftFringe", "LeftFringe", RES_TYPE_NUMBER);
+   x_default_parameter (f, parms, Qright_fringe, Qnil,
+                      "rightFringe", "RightFringe", RES_TYPE_NUMBER);
  
    x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_foreground,
                                        "scrollBarForeground",