/[emacs]/emacs/mac/src/macfns.c
ViewVC logotype

Diff of /emacs/mac/src/macfns.c

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

revision 1.6 by kfstorm, Fri Nov 16 13:18:38 2001 UTC revision 1.7 by kfstorm, Sat Dec 1 01:33:30 2001 UTC
# Line 74  static unsigned char gray_bits[] = { Line 74  static unsigned char gray_bits[] = {
74  #endif  #endif
75    
76  /*extern void free_frame_menubar ();  /*extern void free_frame_menubar ();
77    extern void x_compute_fringe_widths (struct frame *, int);
78  extern double atof ();  extern double atof ();
79  extern int w32_console_toggle_lock_key (int vk_code, Lisp_Object new_state);  extern int w32_console_toggle_lock_key (int vk_code, Lisp_Object new_state);
80  extern int quit_char;*/  extern int quit_char;*/
# Line 604  void x_set_cursor_type P_ ((struct frame Line 605  void x_set_cursor_type P_ ((struct frame
605  void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
606  void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
607  void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object));
608    static void x_set_fringe_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
609  void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
610  void x_set_internal_border_width P_ ((struct frame *, Lisp_Object,  void x_set_internal_border_width P_ ((struct frame *, Lisp_Object,
611                                        Lisp_Object));                                        Lisp_Object));
# Line 659  static struct x_frame_parm_table x_frame Line 661  static struct x_frame_parm_table x_frame
661    "scroll-bar-background", x_set_scroll_bar_background,    "scroll-bar-background", x_set_scroll_bar_background,
662  #endif  #endif
663    "screen-gamma", x_set_screen_gamma,    "screen-gamma", x_set_screen_gamma,
664    "line-spacing", x_set_line_spacing    "line-spacing", x_set_line_spacing,
665      "left-fringe", x_set_fringe_width,
666      "right-fringe", x_set_fringe_width
667  };  };
668    
669  /* Attach the `x-frame-parameter' properties to  /* Attach the `x-frame-parameter' properties to
# Line 751  x_set_frame_parameters (f, alist) Line 755  x_set_frame_parameters (f, alist)
755    /* Process foreground_color and background_color before anything else.    /* Process foreground_color and background_color before anything else.
756       They are independent of other properties, but other properties (e.g.,       They are independent of other properties, but other properties (e.g.,
757       cursor_color) are dependent upon them.  */       cursor_color) are dependent upon them.  */
758      /* Process default font as well, since fringe widths depends on it.  */
759    for (p = 0; p < i; p++)    for (p = 0; p < i; p++)
760      {      {
761        Lisp_Object prop, val;        Lisp_Object prop, val;
762    
763        prop = parms[p];        prop = parms[p];
764        val = values[p];        val = values[p];
765        if (EQ (prop, Qforeground_color) || EQ (prop, Qbackground_color))        if (EQ (prop, Qforeground_color)
766              || EQ (prop, Qbackground_color)
767              || EQ (prop, Qfont))
768          {          {
769            register Lisp_Object param_index, old_value;            register Lisp_Object param_index, old_value;
770    
# Line 791  x_set_frame_parameters (f, alist) Line 798  x_set_frame_parameters (f, alist)
798          icon_top = val;          icon_top = val;
799        else if (EQ (prop, Qicon_left))        else if (EQ (prop, Qicon_left))
800          icon_left = val;          icon_left = val;
801        else if (EQ (prop, Qforeground_color) || EQ (prop, Qbackground_color))        else if (EQ (prop, Qforeground_color)
802                   || EQ (prop, Qbackground_color)
803                   || EQ (prop, Qfont))
804          /* Processed above.  */          /* Processed above.  */
805          continue;          continue;
806        else        else
# Line 2548  x_set_font (f, arg, oldval) Line 2557  x_set_font (f, arg, oldval)
2557      }      }
2558  }  }
2559    
2560    static void
2561    x_set_fringe_width (f, new_value, old_value)
2562         struct frame *f;
2563         Lisp_Object new_value, old_value;
2564    {
2565      x_compute_fringe_widths (f, 1);
2566    }
2567    
2568  void  void
2569  x_set_border_width (f, arg, oldval)  x_set_border_width (f, arg, oldval)
2570       struct frame *f;       struct frame *f;
# Line 3386  x_figure_window_size (f, parms) Line 3403  x_figure_window_size (f, parms)
3403         : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0         : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0
3404         ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)         ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)
3405         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.mac->font)));         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.mac->font)));
3406    f->output_data.mac->fringes_extra    x_compute_fringe_widths (f, 0);
     = FRAME_FRINGE_WIDTH (f);  
3407    f->output_data.mac->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);    f->output_data.mac->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
3408    f->output_data.mac->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);    f->output_data.mac->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
3409    
# Line 3825  This function is an internal primitive-- Line 3841  This function is an internal primitive--
3841                         "screenGamma", "ScreenGamma", RES_TYPE_FLOAT);                         "screenGamma", "ScreenGamma", RES_TYPE_FLOAT);
3842    x_default_parameter (f, parms, Qline_spacing, Qnil,    x_default_parameter (f, parms, Qline_spacing, Qnil,
3843                         "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);                         "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);
3844      x_default_parameter (f, parms, Qleft_fringe, Qnil,
3845                           "leftFringe", "LeftFringe", RES_TYPE_NUMBER);
3846      x_default_parameter (f, parms, Qright_fringe, Qnil,
3847                           "rightFringe", "RightFringe", RES_TYPE_NUMBER);
3848    
3849    /* Init faces before x_default_parameter is called for scroll-bar    /* Init faces before x_default_parameter is called for scroll-bar
3850       parameters because that function calls x_set_scroll_bar_width,       parameters because that function calls x_set_scroll_bar_width,

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

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