xemacs-beta: src/frame.c comparison

comparison src/frame.c @ 4207:62d532188a28

[xemacs-hg @ 2007-10-03 10:06:39 by didierv] Fix some other DEFAULT_INDEX == 0 assumptions

author	didierv
date	Wed, 03 Oct 2007 10:06:42 +0000
parents	91950589598c
children	1bdc3bc255a4

comparison

equal deleted inserted replaced

-:a3e638b941b0
+:62d532188a28
 static const struct memory_description expose_ignore_description_1 [] = {
 { XD_LISP_OBJECT, offsetof (struct expose_ignore, next) },
 { XD_END }
 };
 DEFINE_LRECORD_IMPLEMENTATION ("expose-ignore",
 			       expose_ignore,
 			       1, /*dumpable-flag*/
-0, 0, 0, 0, 0,
+			       0, 0, 0, 0, 0,
 			       expose_ignore_description_1,
 			       struct expose_ignore);
 #else /* not NEW_GC */
 extern const struct sized_memory_description expose_ignore_description;
 { XD_BLOCK_ARRAY, offsetof (struct frame, desired_display_lines),
 4, { &display_line_dynarr_pointer_description } },
 { XD_BLOCK_PTR, offsetof (struct frame, framemeths), 1,
 { &console_methods_description } },
 { XD_UNION, offsetof (struct frame, frame_data),
 XD_INDIRECT (0, 0), { &frame_data_description } },
 { XD_END }
 };
 static Lisp_Object
 write_fmt_string (printcharfun, " 0x%x>", frm->header.uid);
 }
 DEFINE_LRECORD_IMPLEMENTATION ("frame", frame,
 			       0, /*dumpable-flag*/
-mark_frame, print_frame, 0, 0, 0,
+			       mark_frame, print_frame, 0, 0, 0,
 			       frame_description,
 			       struct frame);
 static void
 nuke_all_frame_slots (struct frame *f)
 {
 Lisp_Object lissed = XCDR (kawnz);
 if (!EQ (lissed, Qunbound))
 DEVICE_FRAME_LIST (XDEVICE (XCAR (kawnz))) = lissed;
 return Qnil;
 }
 DEFUN ("make-frame", Fmake_frame, 0, 2, "", /*
 Create and return a new frame, displaying the current buffer.
 Runs the functions listed in `create-frame-hook' after frame creation.
 {
 /* We leave Vdefault_frame_name alone here so that it'll remain Qnil
 	 in the dumped executable, and we can choose it at runtime. */
 name = build_string("XEmacs");
 }
 else if (NILP (Vdefault_frame_name))
 {
 if (egetenv ("USE_EMACS_AS_DEFAULT_APPLICATION_CLASS"))
 	{
 	  Vdefault_frame_name = build_string ("emacs");
 	}
 else
 	{
 	  Vdefault_frame_name = build_string ("XEmacs");
 	}
 }
 if (NILP(name) && STRINGP(Vdefault_frame_name))
 {
 update_frame_window_mirror (f);
 if (initialized && !DEVICE_STREAM_P (d))
 {
 if (!NILP (f->minibuffer_window))
-reset_face_cachels (XWINDOW (f->minibuffer_window));
+	reset_face_cachels (XWINDOW (f->minibuffer_window));
 reset_face_cachels (XWINDOW (f->root_window));
 }
 /* If no frames on this device formerly existed, say this is the
 first frame.  It kind of assumes that frameless devices don't
 					 first_frame_on_console));
 if (!DEVICE_STREAM_P (d))
 {
 /* Now initialise the gutters. This won't change the frame size,
-but is needed as input to the layout that change_frame_size
+	 but is needed as input to the layout that change_frame_size
-will eventually do. Unfortunately gutter sizing code relies
+	 will eventually do. Unfortunately gutter sizing code relies
-on the frame in question being visible so we can't do this
+	 on the frame in question being visible so we can't do this
-earlier. */
+	 earlier. */
 init_frame_gutters (f);
 change_frame_size (f, f->height, f->width, 0);
 }
 Possible values for WHICH-FRAMES are
 `visible'                 Consider only frames that are visible.
 `iconic'                  Consider only frames that are iconic.
 `invisible'               Consider only frames that are invisible
-(this is different from iconic).
+			  (this is different from iconic).
 `visible-iconic'          Consider frames that are visible or iconic.
 `invisible-iconic'        Consider frames that are invisible or iconic.
 `nomini'                  Consider all frames except minibuffer-only ones.
 `visible-nomini'          Like `visible' but omits minibuffer-only frames.
 `iconic-nomini'           Like `iconic' but omits minibuffer-only frames.
 `invisible-nomini'        Like `invisible' but omits minibuffer-only frames.
 `visible-iconic-nomini'   Like `visible-iconic' but omits minibuffer-only
-frames.
+			  frames.
 `invisible-iconic-nomini' Like `invisible-iconic' but omits minibuffer-only
-frames.
+			  frames.
 any other value           Consider all frames.
 If WHICH-FRAMES is omitted, `nomini' is used.  A value for WHICH-FRAMES
 of 0 (a number) is treated like `iconic', for backwards compatibility.
 {
 Lisp_Object next;
 /* If this is a popup frame, select its parent if possible.
 	 Otherwise, find another visible frame; if none, just take any frame.
-First try the same device, then the same console. */
+	 First try the same device, then the same console. */
 next = DEVMETH_OR_GIVEN (d, get_frame_parent, (f), Qnil);
 if (NILP (next) || EQ (next, frame) || ! FRAME_LIVE_P (XFRAME (next)))
 	next = next_frame (frame, Qvisible, device);
 if (NILP (next) || EQ (next, frame))
 #if 0
 /* mly wants this, but it's not reasonable to change the name of a
 	 frame after it has been created, because the old name was used
 	 for resource lookup. */
 if (EQ (prop, Qname))
-{
+	{
-CHECK_STRING (val);
+	  CHECK_STRING (val);
-f->name = val;
+	  f->name = val;
-}
+	}
 #endif /* 0 */
 if (EQ (prop, Qminibuffer))
 	store_minibuf_frame_prop (f, val);
 if (EQ (prop, Qunsplittable))
 	f->no_split = !NILP (val);
 {
 struct frame *f = decode_frame (frame);
 int height, pheight;
 frame = wrap_frame (f);
 if (!window_system_pixelated_geometry (frame))
 {
 height = FRAME_HEIGHT (f);
 frame_conversion_internal (f, CHAR_TO_DISPLAYABLE_PIXEL,
 				 0, &pheight, 0, &height, 0);
 }
 else
 pheight = FRAME_PIXHEIGHT (f);
 return make_int (pheight);
 }
 {
 struct frame *f = decode_frame (frame);
 int width, pwidth;
 frame = wrap_frame (f);
 if (!window_system_pixelated_geometry (frame))
 {
 width = FRAME_WIDTH (f);
 frame_conversion_internal (f, CHAR_TO_DISPLAYABLE_PIXEL,
 				 &pwidth, 0, &width, 0, 0);
 }
 else
 pwidth = FRAME_PIXWIDTH (f);
 return make_int (pwidth);
 }
 struct frame *f = decode_frame (frame);
 int pheight, width;
 frame = wrap_frame (f);
 CHECK_INT (height);
 if (!window_system_pixelated_geometry (frame))
 {
 int h = XINT (height);
 width = FRAME_WIDTH (f);
 frame_conversion_internal (f, TOTAL_PIXEL_TO_CHAR, 0, &h, 0, &pheight, 0);
 }
 else
 {
 width = FRAME_PIXWIDTH (f);
 pheight = XINT (height);
 }
 struct frame *f = decode_frame (frame);
 int pheight, width;
 frame = wrap_frame (f);
 CHECK_INT (height);
 if (!window_system_pixelated_geometry (frame))
 {
 int h = XINT (height);
 width = FRAME_WIDTH (f);
 frame_conversion_internal (f, DISPLAYABLE_PIXEL_TO_CHAR, 0, &h, 0, &pheight, 0);
 }
 else
 {
 width = FRAME_PIXWIDTH (f);
 pheight = XINT (height);
 }
 int pheight, pwidth;
 frame = wrap_frame (f);
 CHECK_INT (width);
 CHECK_INT (height);
 if (!window_system_pixelated_geometry (frame))
 {
 int w = XINT (width);
 int h = XINT (height);
 frame_conversion_internal (f, TOTAL_PIXEL_TO_CHAR, &w, &h, &pwidth, &pheight, 0);
 }
 int pheight, pwidth;
 frame = wrap_frame (f);
 CHECK_INT (width);
 CHECK_INT (height);
 if (!window_system_pixelated_geometry (frame))
 {
 int w = XINT (width);
 int h = XINT (height);
 frame_conversion_internal (f, DISPLAYABLE_PIXEL_TO_CHAR, &w, &h, &pwidth, &pheight, 0);
 }
 return;
 if (new_pixheight)
 {
 /* Adjust for gutters here so that we always get set
-properly. */
+	 properly. */
 new_pixheight -=
 	(FRAME_TOP_GUTTER_BOUNDS (f)
 	 + FRAME_BOTTOM_GUTTER_BOUNDS (f));
 XWINDOW (FRAME_ROOT_WINDOW (f))->pixel_top
 }
 if (new_pixwidth)
 {
 /* Adjust for gutters here so that we always get set
-properly. */
+	 properly. */
 new_pixwidth -=
 	(FRAME_LEFT_GUTTER_BOUNDS (f)
 	 + FRAME_RIGHT_GUTTER_BOUNDS (f));
 XWINDOW (FRAME_ROOT_WINDOW (f))->pixel_left =
 dl = &title_string_display_line;
 db = get_display_block_from_line (dl, TEXT);
 Dynarr_reset (db->runes);
 generate_formatted_string_db (format_str, Qnil, w, dl, db, findex, 0,
--1, type);
+				-1, type);
 Dynarr_reset (title_string_ichar_dynarr);
 while (elt < Dynarr_length (db->runes))
 {
 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
 #ifndef PDUMP
 if (!initialized)
 #endif
 {
 title_string_ichar_dynarr = Dynarr_new (Ichar);
-xzero (title_string_display_line);
+DISPLAY_LINE_INIT (title_string_display_line);
 }
 }
 void
 syms_of_frame (void)

Mercurial > hg > xemacs-beta

comparison src/frame.c @ 4207:62d532188a28