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

Diff of /emacs/src/w32fns.c

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

revision 1.141 by jasonr, Wed Nov 28 20:34:46 2001 UTC revision 1.142 by kfstorm, Sat Dec 1 01:27:00 2001 UTC
# Line 53  Boston, MA 02111-1307, USA.  */ Line 53  Boston, MA 02111-1307, USA.  */
53  #include <ctype.h>  #include <ctype.h>
54    
55  extern void free_frame_menubar ();  extern void free_frame_menubar ();
56    extern void x_compute_fringe_widths (struct frame *, int);
57  extern double atof ();  extern double atof ();
58  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);
59  extern void w32_menu_display_help (HWND owner, HMENU menu, UINT menu_item, UINT flags);  extern void w32_menu_display_help (HWND owner, HMENU menu, UINT menu_item, UINT flags);
# Line 676  void x_set_cursor_type P_ ((struct frame Line 677  void x_set_cursor_type P_ ((struct frame
677  void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
678  void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
679  void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object));
680    static void x_set_fringe_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
681  void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object));  void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
682  void x_set_internal_border_width P_ ((struct frame *, Lisp_Object,  void x_set_internal_border_width P_ ((struct frame *, Lisp_Object,
683                                        Lisp_Object));                                        Lisp_Object));
# Line 718  static struct x_frame_parm_table x_frame Line 720  static struct x_frame_parm_table x_frame
720    "visibility", x_set_visibility,    "visibility", x_set_visibility,
721    "tool-bar-lines", x_set_tool_bar_lines,    "tool-bar-lines", x_set_tool_bar_lines,
722    "screen-gamma", x_set_screen_gamma,    "screen-gamma", x_set_screen_gamma,
723    "line-spacing", x_set_line_spacing    "line-spacing", x_set_line_spacing,
724      "left-fringe", x_set_fringe_width,
725      "right-fringe", x_set_fringe_width
726    
727  };  };
728    
729  /* Attach the `x-frame-parameter' properties to  /* Attach the `x-frame-parameter' properties to
# Line 810  x_set_frame_parameters (f, alist) Line 815  x_set_frame_parameters (f, alist)
815    /* Process foreground_color and background_color before anything else.    /* Process foreground_color and background_color before anything else.
816       They are independent of other properties, but other properties (e.g.,       They are independent of other properties, but other properties (e.g.,
817       cursor_color) are dependent upon them.  */       cursor_color) are dependent upon them.  */
818      /* Process default font as well, since fringe widths depends on it.  */
819    for (p = 0; p < i; p++)    for (p = 0; p < i; p++)
820      {      {
821        Lisp_Object prop, val;        Lisp_Object prop, val;
822    
823        prop = parms[p];        prop = parms[p];
824        val = values[p];        val = values[p];
825        if (EQ (prop, Qforeground_color) || EQ (prop, Qbackground_color))        if (EQ (prop, Qforeground_color)
826              || EQ (prop, Qbackground_color)
827              || EQ (prop, Qfont))
828          {          {
829            register Lisp_Object param_index, old_value;            register Lisp_Object param_index, old_value;
830    
# Line 855  x_set_frame_parameters (f, alist) Line 863  x_set_frame_parameters (f, alist)
863          icon_top = val;          icon_top = val;
864        else if (EQ (prop, Qicon_left))        else if (EQ (prop, Qicon_left))
865          icon_left = val;          icon_left = val;
866        else if (EQ (prop, Qforeground_color) || EQ (prop, Qbackground_color))        else if (EQ (prop, Qforeground_color)
867                   || EQ (prop, Qbackground_color)
868                   || EQ (prop, Qfont))
869          /* Processed above.  */          /* Processed above.  */
870          continue;          continue;
871        else        else
# Line 2438  x_set_font (f, arg, oldval) Line 2448  x_set_font (f, arg, oldval)
2448      }      }
2449  }  }
2450    
2451    static void
2452    x_set_fringe_width (f, new_value, old_value)
2453         struct frame *f;
2454         Lisp_Object new_value, old_value;
2455    {
2456      x_compute_fringe_widths (f, 1);
2457    }
2458    
2459  void  void
2460  x_set_border_width (f, arg, oldval)  x_set_border_width (f, arg, oldval)
2461       struct frame *f;       struct frame *f;
# Line 3248  x_figure_window_size (f, parms) Line 3266  x_figure_window_size (f, parms)
3266         : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0         : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0
3267         ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)         ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)
3268         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font)));         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font)));
3269    f->output_data.w32->fringes_extra    x_compute_fringe_widths (f, 0);
     = FRAME_FRINGE_WIDTH (f);  
3270    f->output_data.w32->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);    f->output_data.w32->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
3271    f->output_data.w32->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);    f->output_data.w32->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
3272    
# Line 5449  This function is an internal primitive-- Line 5466  This function is an internal primitive--
5466                         "screenGamma", "ScreenGamma", RES_TYPE_FLOAT);                         "screenGamma", "ScreenGamma", RES_TYPE_FLOAT);
5467    x_default_parameter (f, parms, Qline_spacing, Qnil,    x_default_parameter (f, parms, Qline_spacing, Qnil,
5468                         "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);                         "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);
5469      x_default_parameter (f, parms, Qleft_fringe, Qnil,
5470                           "leftFringe", "LeftFringe", RES_TYPE_NUMBER);
5471      x_default_parameter (f, parms, Qright_fringe, Qnil,
5472                           "rightFringe", "RightFringe", RES_TYPE_NUMBER);
5473    
5474    
5475    /* Init faces before x_default_parameter is called for scroll-bar    /* Init faces before x_default_parameter is called for scroll-bar
# Line 13237  x_create_tip_frame (dpyinfo, parms, text Line 13258  x_create_tip_frame (dpyinfo, parms, text
13258    f->output_data.w32->parent_desc = FRAME_W32_DISPLAY_INFO (f)->root_window;    f->output_data.w32->parent_desc = FRAME_W32_DISPLAY_INFO (f)->root_window;
13259    window_prompting = x_figure_window_size (f, parms);    window_prompting = x_figure_window_size (f, parms);
13260    
   /* No fringes on tip frame.  */  
   f->output_data.w32->fringes_extra = 0;  
   
13261    if (window_prompting & XNegative)    if (window_prompting & XNegative)
13262      {      {
13263        if (window_prompting & YNegative)        if (window_prompting & YNegative)

Legend:
Removed from v.1.141  
changed lines
  Added in v.1.142

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