xemacs-beta: src/frame.c comparison

comparison src/frame.c @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91

author	cvs
date	Mon, 13 Aug 2007 08:49:20 +0200
parents	ac2d302a0011
children	859a2309aef8

comparison

equal deleted inserted replaced

-:ad457d5f7d04
+:0293115a14e9
 ((markobj) (f->toolbar_visible_p[0]));
 ((markobj) (f->toolbar_visible_p[1]));
 ((markobj) (f->toolbar_visible_p[2]));
 ((markobj) (f->toolbar_visible_p[3]));
-#endif
+#endif /* HAVE_TOOLBARS */
 if (FRAME_LIVE_P (f)) /* device is nil for a dead frame */
 MAYBE_FRAMEMETH (f, mark_frame, (f, markobj));
 return Qnil;
 struct frame *frm = XFRAME (obj);
 char buf[200];
 if (print_readably)
 error ("printing unreadable object #<frame %s 0x%x>",
-string_data (XSTRING (frm->name)), frm->header.uid);
+XSTRING_DATA (frm->name), frm->header.uid);
 sprintf (buf, "#<%s-frame ", !FRAME_LIVE_P (frm) ? "dead" :
 	   FRAME_TYPE_NAME (frm));
 write_c_string (buf, printcharfun);
 print_internal (frm->name, printcharfun, 1);
 f->toolbar_visible_p[0] = Qnil;
 f->toolbar_visible_p[1] = Qnil;
 f->toolbar_visible_p[2] = Qnil;
 f->toolbar_visible_p[3] = Qnil;
-#endif
+#endif /* HAVE_TOOLBARS */
 }
 /* Allocate a new frame object and set all its fields to reasonable
 values.  The root window is created but the minibuffer will be done
 later. */
 Avoid infinite looping on the window chain by marking next pointer
 as nil. */
 mini_window = f->minibuffer_window = f->root_window;
 XWINDOW (mini_window)->mini_p = Qt;
-XWINDOW (mini_window)->next = Qnil;
+XWINDOW (mini_window)->next   = Qnil;
-XWINDOW (mini_window)->prev = Qnil;
+XWINDOW (mini_window)->prev   = Qnil;
-XWINDOW (mini_window)->frame = frame;
+XWINDOW (mini_window)->frame  = frame;
 /* Put the proper buffer in that window.  */
 Fset_window_buffer (mini_window, Vminibuffer_zero);
 }
 struct frame *
 decode_frame (Lisp_Object frame)
 {
 if (NILP (frame))
 return selected_frame ();
-else
-{
+CHECK_LIVE_FRAME (frame);
-CHECK_LIVE_FRAME (frame);
+return (XFRAME (frame));
-return (XFRAME (frame));
-}
 }
 struct frame *
 decode_frame_or_selected (Lisp_Object cdf)
 {
 frame this is.  Use the cleaner function `frame-type' for that.
 */ )
 (object)
 Lisp_Object object;
 {
-if (!FRAMEP (object))
+return FRAMEP (object) ? Qt : Qnil;
-return Qnil;
-return Qt;
 }
 DEFUN ("frame-live-p", Fframe_live_p, Sframe_live_p, 1, 1, 0 /*
 Return non-nil if OBJECT is a frame which has not been deleted.
 */ )
 (object)
 Lisp_Object object;
 {
-if (FRAMEP (object) && FRAME_LIVE_P (XFRAME (object)))
+return FRAMEP (object) && FRAME_LIVE_P (XFRAME (object)) ? Qt : Qnil;
-return Qt;
-return Qnil;
 }
 /* Called from Fselect_window() */
 void
 #endif
 if (NILP (type))
 type = Qnomini;
 if (ZEROP (type))
-type = Qiconic;
+type = Qvisible_iconic;
 if (EQ (type, Qvisible))
 return FRAME_VISIBLE_P (f);
 if (EQ (type, Qiconic))
 return FRAME_ICONIFIED_P (f);
 any other frames exist.) */
 static int
 other_visible_frames_internal (struct frame *f, int called_from_delete_device)
 {
-Lisp_Object frame = Qnil;
+Lisp_Object frame;
 XSETFRAME (frame, f);
 if (FRAME_STREAM_P (f))
 return !EQ (frame, next_frame_internal (frame, Qt, Qt,
 					    called_from_delete_device));
 {
 /* This function can GC */
 int minibuffer_selected;
 struct device *d;
 struct console *con;
-Lisp_Object frame = Qnil;
+Lisp_Object frame;
 Lisp_Object device;
 Lisp_Object console;
 struct gcpro gcpro1;
 /* OK to delete an already deleted frame. */
 		("Attempt to delete a surrogate minibuffer frame", frame);
 	    }
 	}
 }
+/* Before here, we haven't made any dangerous changes (just checked for
+error conditions).  Now run the delete-frame-hook.  Remember that
+user code there could do any number of dangerous things, including
+signalling an error. */
+va_run_hook_with_args (Qdelete_frame_hook, 1, frame);
+if (!FRAME_LIVE_P (f)) /* Make sure the delete-frame-hook didn't */
+{		         /* go ahead and delete anything. */
+UNGCPRO;
+return;
+}
+/* Call the delete-device-hook and delete-console-hook now if
+appropriate, before we do any dangerous things -- they too could
+signal an error. */
+if (XINT (Flength (DEVICE_FRAME_LIST (d))) == 1)
+{
+va_run_hook_with_args (Qdelete_device_hook, 1, device);
+if (!FRAME_LIVE_P (f)) /* Make sure the delete-device-hook didn't */
+	{		     /* go ahead and delete anything. */
+	  UNGCPRO;
+	  return;
+	}
+if (XINT (Flength (CONSOLE_DEVICE_LIST (con))) == 1)
+	{
+	  va_run_hook_with_args (Qdelete_console_hook, 1, console);
+	  if (!FRAME_LIVE_P (f)) /* Make sure the delete-console-hook didn't */
+	    {			 /* go ahead and delete anything. */
+	      UNGCPRO;
+	      return;
+	    }
+	}
+}
 minibuffer_selected = EQ (minibuf_window, Fselected_window (Qnil));
 /* If we were focused on this frame, then we're not any more.
 Assume that we lost the focus; that way, the call to
 Fselect_frame() below won't end up making us explicitly
 if (EQ (frame, DEVICE_FRAME_WITH_FOCUS_FOR_HOOKS (d)))
 DEVICE_FRAME_WITH_FOCUS_FOR_HOOKS (d) = Qnil;
 if (EQ (frame, DEVICE_FRAME_THAT_OUGHT_TO_HAVE_FOCUS (d)))
 DEVICE_FRAME_THAT_OUGHT_TO_HAVE_FOCUS (d) = Qnil;
-/* Don't allow deleted frame to remain selected.
+/* Don't allow the deleted frame to remain selected.
 Note that in the former scheme of things, this would
 have caused us to regain the focus.  This no longer
 applies (see above); I think the new behavior is more
 logical.  If someone disagrees, it can always be
-changed (or a new user variable can be introduced,
+changed (or a new user variable can be introduced, ugh.) */
-ugh.) */
 if (EQ (frame, DEVICE_SELECTED_FRAME (d)))
 {
 Lisp_Object next;
 /* If this is a popup frame, select its parent if possible.
 	 select the new one.  */
 if (minibuffer_selected)
 	Fselect_window (minibuf_window);
 }
-/* Before here, we haven't made any dangerous changes (just checked for
-error conditions).  Now run the delete-frame-hook.  Remember that
-user code there could do any number of dangerous things, including
-signalling an error.
-*/
-va_run_hook_with_args (Qdelete_frame_hook, 1, frame);
-if (!FRAME_LIVE_P (f)) /* make sure the delete-frame-hook didn't
-			    go ahead and delete anything */
-{
-UNGCPRO;
-return;
-}
-/* Call the delete-device-hook and delete-console-hook now if
-appropriate, before we do any dangerous things -- they too could
-signal an error. */
-if (XINT (Flength (DEVICE_FRAME_LIST (d))) == 1)
-{
-va_run_hook_with_args (Qdelete_device_hook, 1, device);
-if (!FRAME_LIVE_P (f)) /* make sure the delete-device-hook didn't
-				go ahead and delete anything */
-	{
-	  UNGCPRO;
-	  return;
-	}
-if (XINT (Flength (CONSOLE_DEVICE_LIST (con))) == 1)
-	{
-	  va_run_hook_with_args (Qdelete_console_hook, 1, console);
-	  if (!FRAME_LIVE_P (f)) /* make sure the delete-console-hook didn't
-				    go ahead and delete anything */
-	    {
-	      UNGCPRO;
-	      return;
-	    }
-	}
-}
 /* After this point, no errors must be allowed to occur. */
 #ifdef HAVE_MENUBARS
 free_frame_menubars (f);
 #endif
 remove the reference to them.  */
 delete_all_subwindows (XWINDOW (f->root_window));
 f->root_window = Qnil;
 /* Remove the frame now from the list.  This way, any events generated
-on this frame by the maneuvers below will disperse themselves.
+on this frame by the maneuvers below will disperse themselves. */
-*/
+/* This used to be Fdelq(), but that will cause a seg fault if the
-{
+QUIT checker happens to get invoked, because the frame list is in
-/* This used to be Fdelq(), but that will cause a seg fault if the
+an inconsistent state. */
-QUIT checker happens to get invoked, because the frame list is
+d->frame_list = delq_no_quit (frame, d->frame_list);
-in an inconsistent state */
+RESET_CHANGED_SET_FLAGS;
-d->frame_list = delq_no_quit (frame, d->frame_list);
-RESET_CHANGED_SET_FLAGS;
-}
 f->dead = 1;
 f->visible = 0;
 free_window_mirror (f->root_mirror);
 if (EQ (frame, con->default_minibuffer_frame))
 {
 Lisp_Object frmcons, devcons;
 /* The last frame we saw with a minibuffer, minibuffer-only or not.  */
 Lisp_Object frame_with_minibuf;
-/* Some frame we found on the same console, or nil if there are
+/* Some frame we found on the same console, or nil if there are none. */
-none.  */
 Lisp_Object frame_on_same_console;
 frame_on_same_console = Qnil;
 frame_with_minibuf = Qnil;
 if (!NILP (frame_on_same_console))
 	{
 	  /* We know that there must be some frame with a minibuffer out
 	     there.  If this were not true, all of the frames present
-	     would have to be minibufferless, which implies that at some
+	     would have to be minibuffer-less, which implies that at some
 	     point their minibuffer frames must have been deleted, but
 	     that is prohibited at the top; you can't delete surrogate
 	     minibuffer frames.  */
 	  if (NILP (frame_with_minibuf))
 	    abort ();
 	con->default_minibuffer_frame = Qnil;
 }
 nuke_all_frame_slots (f); /* nobody should be accessing the device
 			       or anything else any more, and making
-			       then Qnil allows for better GC'ing
+			       them Qnil allows for better GC'ing
 			       in case a pointer to the dead frame
-			       still hangs around. */
+			       continues to hang around. */
 f->framemeths = dead_console_methods;
 UNGCPRO;
 }
 void
 case -1:
 *frame = DEVICE_SELECTED_FRAME (d);
 break;
 default:
-abort (); /* hook is incorrectly written */
+abort (); /* method is incorrectly written */
 }
 return 0;
 }
 x = y = Qnil;
 if (mouse_pixel_position_1 (d, &frame, &intx, &inty))
 {
-struct window *w = find_window_by_pixel_pos (intx, inty,
+struct window *w =
-						   XFRAME (frame)->
+	find_window_by_pixel_pos (intx, inty, XFRAME (frame)->root_window);
-						   root_window);
 if (!w)
 	window = Qnil;
 else
 	{
 	  XSETWINDOW (window, w);
 */ );
 Vdeselect_frame_hook = Qnil;
 DEFVAR_LISP ("delete-frame-hook", &Vdelete_frame_hook /*
 Function or functions to call when a frame is deleted.
-One argument, the to-be-deleted frame.
+One argument, the about-to-be-deleted frame.
-When this hook is called, the selected frame is different from
-the to-be-deleted frame, and the hook should not change that.
 */ );
 Vdelete_frame_hook = Qnil;
 DEFVAR_LISP ("create-frame-hook", &Vcreate_frame_hook /*
 Function or functions to call when a frame is created.
 One argument, the newly-created frame.
 */ );
 Vcreate_frame_hook = Qnil;
 DEFVAR_LISP ("mouse-enter-frame-hook", &Vmouse_enter_frame_hook /*
-Function or functions to call when mouse enters a frame.
+Function or functions to call when the mouse enters a frame.
 One argument, the frame.
-Be careful not to make assumptions about the window manger's focus model.
+Be careful not to make assumptions about the window manager's focus model.
 In most cases, the `deselect-frame-hook' is more appropriate.
 */ );
 Vmouse_enter_frame_hook = Qnil;
 DEFVAR_LISP ("mouse-leave-frame-hook", &Vmouse_leave_frame_hook /*
-Function or functions to call when mouse leaves frame.
+Function or functions to call when the mouse leaves a frame.
 One argument, the frame.
-Be careful not to make assumptions about the window manger's focus model.
+Be careful not to make assumptions about the window manager's focus model.
 In most cases, the `select-frame-hook' is more appropriate.
 */ );
 Vmouse_leave_frame_hook = Qnil;
 DEFVAR_LISP ("map-frame-hook", &Vmap_frame_hook /*
-Function or functions to call when frame is mapped.
+Function or functions to call when a frame is mapped.
 One argument, the frame.
 */ );
 Vmap_frame_hook = Qnil;
 DEFVAR_LISP ("unmap-frame-hook", &Vunmap_frame_hook /*
-Function or functions to call when frame is unmapped.
+Function or functions to call when a frame is unmapped.
 One argument, the frame.
 */ );
 Vunmap_frame_hook = Qnil;
 DEFVAR_LISP ("allow-deletion-of-last-visible-frame",
 #if defined (HAVE_CDE) || defined (HAVE_OFFIX_DND)
 DEFVAR_LISP ("drag-and-drop-functions", &Vdrag_and_drop_functions /*
 Function or functions to run when an object is dropped on a frame.
 Each function is called with either two or three args.  If called with
 two args, the args are a frame and a pathname.  If with three, the
-args are a frame, a pathname (which is may be either a string or nil)
+args are a frame, a pathname (which will be either a string or nil)
 and the textual representation of the dragged object.
 */ );
 Vdrag_and_drop_functions = Qnil;
-#endif
+#endif /* HAVE_CDE */
 DEFVAR_LISP ("mouse-motion-handler", &Vmouse_motion_handler /*
 Handler for motion events.  One arg, the event.
 For most applications, you should use `mode-motion-hook' instead of this.
 */ );
 */ );
 Vframe_title_format = Fpurecopy (build_string ("%S: %b"));
 DEFVAR_LISP ("frame-icon-title-format", &Vframe_icon_title_format /*
 Controls the title of the icon corresponding to the selected frame.
-See also the variable `frame-title-format'
+See also the variable `frame-title-format'.
 */ );
 Vframe_icon_title_format = Fpurecopy (build_string ("%b"));
 DEFVAR_LISP ("default-frame-name", &Vdefault_frame_name /*
 The default name to assign to newly-created frames.

Mercurial > hg > xemacs-beta

comparison src/frame.c @ 16:0293115a14e9 r19-15b91