emacs: src/w32fns.c comparison

comparison src/w32fns.c @ 41726:2dd41afd9b55

Merged fringe width related changes from xfns.c.

author	Kim F. Storm <storm@cua.dk>
date	Sat, 01 Dec 2001 01:33:30 +0000
parents	aadcf676d5de
children	0d9b74cd27cd

comparison

equal deleted inserted replaced

-:07d263c6cf78
+:2dd41afd9b55
 #include <commdlg.h>
 #include <shellapi.h>
 #include <ctype.h>
 extern void free_frame_menubar ();
+extern void x_compute_fringe_widths (struct frame *, int);
 extern double atof ();
 extern int w32_console_toggle_lock_key (int vk_code, Lisp_Object new_state);
 extern void w32_menu_display_help (HWND owner, HMENU menu, UINT menu_item, UINT flags);
 extern int quit_char;
 void x_set_border_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
 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));
 void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object));
+static void x_set_fringe_width 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,
 				      Lisp_Object));
 void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_autoraise P_ ((struct frame *, Lisp_Object, Lisp_Object));
 "unsplittable", x_set_unsplittable,
 "vertical-scroll-bars", x_set_vertical_scroll_bars,
 "visibility", x_set_visibility,
 "tool-bar-lines", x_set_tool_bar_lines,
 "screen-gamma", x_set_screen_gamma,
-"line-spacing", x_set_line_spacing
+"line-spacing", x_set_line_spacing,
+"left-fringe", x_set_fringe_width,
+"right-fringe", x_set_fringe_width
 };
 /* Attach the `x-frame-parameter' properties to
 the Lisp symbol names of parameters relevant to W32.  */
 height = FRAME_HEIGHT (f);
 /* 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))
+if (EQ (prop, Qforeground_color)
+	  || EQ (prop, Qbackground_color)
+	  || EQ (prop, Qfont))
 	{
 	  register Lisp_Object param_index, old_value;
 	  old_value = get_frame_param (f, prop);
 	left = val;
 else if (EQ (prop, Qicon_top))
 	icon_top = val;
 else if (EQ (prop, Qicon_left))
 	icon_left = val;
-else if (EQ (prop, Qforeground_color) || EQ (prop, Qbackground_color))
+else if (EQ (prop, Qforeground_color)
+	       || EQ (prop, Qbackground_color)
+	       || EQ (prop, Qfont))
 	/* Processed above.  */
 	continue;
 else
 	{
 	  register Lisp_Object param_index, old_value;
 XSETFRAME (frame, f);
 call1 (Qface_set_after_frame_default, frame);
 }
 }
+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;
 Lisp_Object arg, oldval;
 {
 = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
 ? 0
 : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0
 ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)
 : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font)));
-f->output_data.w32->fringes_extra
+x_compute_fringe_widths (f, 0);
-= FRAME_FRINGE_WIDTH (f);
 f->output_data.w32->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
 f->output_data.w32->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
 tem0 = w32_get_arg (parms, Qtop, 0, 0, RES_TYPE_NUMBER);
 tem1 = w32_get_arg (parms, Qleft, 0, 0, RES_TYPE_NUMBER);
 		       "borderColor", "BorderColor", RES_TYPE_STRING);
 x_default_parameter (f, parms, Qscreen_gamma, Qnil,
 		       "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);
 /* Init faces before x_default_parameter is called for scroll-bar
 parameters because that function calls x_set_scroll_bar_width,
 which calls change_frame_size, which calls Fset_window_buffer,
 init_frame_faces (f);
 f->output_data.w32->dwStyle = WS_BORDER | WS_POPUP | WS_DISABLED;
 f->output_data.w32->parent_desc = FRAME_W32_DISPLAY_INFO (f)->root_window;
 window_prompting = x_figure_window_size (f, parms);
-/* No fringes on tip frame.  */
-f->output_data.w32->fringes_extra = 0;
 if (window_prompting & XNegative)
 {
 if (window_prompting & YNegative)
 	f->output_data.w32->win_gravity = SouthEastGravity;

Mercurial > emacs

comparison src/w32fns.c @ 41726:2dd41afd9b55