/[emacs]/emacs/src/xfns.c
ViewVC logotype

Diff of /emacs/src/xfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.529 by jasonr, Sat Nov 24 17:48:40 2001 UTC revision 1.530 by kfstorm, Sat Dec 1 01:23:29 2001 UTC
# Line 740  void x_set_border_color P_ ((struct fram Line 740  void x_set_border_color P_ ((struct fram
740  void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
741  void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
742  void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
743    static void x_set_fringe_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
744  void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object));
745  void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
746  void x_set_internal_border_width P_ ((struct frame *, Lisp_Object,  void x_set_internal_border_width P_ ((struct frame *, Lisp_Object,
# Line 802  static struct x_frame_parm_table x_frame Line 803  static struct x_frame_parm_table x_frame
803    "scroll-bar-background",      x_set_scroll_bar_background,    "scroll-bar-background",      x_set_scroll_bar_background,
804    "screen-gamma",               x_set_screen_gamma,    "screen-gamma",               x_set_screen_gamma,
805    "line-spacing",               x_set_line_spacing,    "line-spacing",               x_set_line_spacing,
806      "left-fringe",                x_set_fringe_width,
807      "right-fringe",               x_set_fringe_width,
808    "wait-for-wm",                x_set_wait_for_wm    "wait-for-wm",                x_set_wait_for_wm
809  };  };
810    
# Line 896  x_set_frame_parameters (f, alist) Line 899  x_set_frame_parameters (f, alist)
899    /* Process foreground_color and background_color before anything else.    /* Process foreground_color and background_color before anything else.
900       They are independent of other properties, but other properties (e.g.,       They are independent of other properties, but other properties (e.g.,
901       cursor_color) are dependent upon them.  */       cursor_color) are dependent upon them.  */
902      /* Process default font as well, since fringe widths depends on it.  */
903    for (p = 0; p < i; p++)    for (p = 0; p < i; p++)
904      {      {
905        Lisp_Object prop, val;        Lisp_Object prop, val;
906    
907        prop = parms[p];        prop = parms[p];
908        val = values[p];        val = values[p];
909        if (EQ (prop, Qforeground_color) || EQ (prop, Qbackground_color))        if (EQ (prop, Qforeground_color)
910              || EQ (prop, Qbackground_color)
911              || EQ (prop, Qfont))
912          {          {
913            register Lisp_Object param_index, old_value;            register Lisp_Object param_index, old_value;
914    
# Line 941  x_set_frame_parameters (f, alist) Line 947  x_set_frame_parameters (f, alist)
947          icon_top = val;          icon_top = val;
948        else if (EQ (prop, Qicon_left))        else if (EQ (prop, Qicon_left))
949          icon_left = val;          icon_left = val;
950        else if (EQ (prop, Qforeground_color) || EQ (prop, Qbackground_color))        else if (EQ (prop, Qforeground_color)
951                   || EQ (prop, Qbackground_color)
952                   || EQ (prop, Qfont))
953          /* Processed above.  */          /* Processed above.  */
954          continue;          continue;
955        else        else
# Line 1904  x_set_font (f, arg, oldval) Line 1912  x_set_font (f, arg, oldval)
1912      }      }
1913  }  }
1914    
1915    static void
1916    x_set_fringe_width (f, new_value, old_value)
1917         struct frame *f;
1918         Lisp_Object new_value, old_value;
1919    {
1920      x_compute_fringe_widths (f, 1);
1921    }
1922    
1923  void  void
1924  x_set_border_width (f, arg, oldval)  x_set_border_width (f, arg, oldval)
1925       struct frame *f;       struct frame *f;
# Line 3120  x_figure_window_size (f, parms) Line 3136  x_figure_window_size (f, parms)
3136      = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)      = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
3137         ? 0         ? 0
3138         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font)));         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font)));
3139    f->output_data.x->fringes_extra  
3140      = FRAME_FRINGE_WIDTH (f);    x_compute_fringe_widths (f, 0);
3141    
3142    f->output_data.x->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);    f->output_data.x->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
3143    f->output_data.x->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);    f->output_data.x->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
3144    
# Line 4357  This function is an internal primitive-- Line 4374  This function is an internal primitive--
4374                         "screenGamma", "ScreenGamma", RES_TYPE_FLOAT);                         "screenGamma", "ScreenGamma", RES_TYPE_FLOAT);
4375    x_default_parameter (f, parms, Qline_spacing, Qnil,    x_default_parameter (f, parms, Qline_spacing, Qnil,
4376                         "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);                         "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);
4377      x_default_parameter (f, parms, Qleft_fringe, Qnil,
4378                           "leftFringe", "LeftFringe", RES_TYPE_NUMBER);
4379      x_default_parameter (f, parms, Qright_fringe, Qnil,
4380                           "rightFringe", "RightFringe", RES_TYPE_NUMBER);
4381    
4382    x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_foreground,    x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_foreground,
4383                                          "scrollBarForeground",                                          "scrollBarForeground",

Legend:
Removed from v.1.529  
changed lines
  Added in v.1.530

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26