xemacs-beta: src/frame.c comparison

comparison src/frame.c @ 149:538048ae2ab8 r20-3b1

Import from CVS: tag r20-3b1

author	cvs
date	Mon, 13 Aug 2007 09:36:16 +0200
parents	2af401a6ecca
children	59463afc5666

comparison

equal deleted inserted replaced

-:f659db2a1f73
+:538048ae2ab8
 /* Called from Fselect_window() */
 void
 select_frame_1 (Lisp_Object frame)
 {
 struct frame *f = XFRAME (frame);
+/* If on a TTY, selecting a frame must raise it.  */
+#ifdef HAVE_TTY
+if (FRAME_TTY_P (f))
+FRAMEMETH(f, raise_frame, (f));  /* tty_raise_frame will call
+					select_frame_2, so we can skip
+					it. */
+else
+select_frame_2 (frame);
+#else
+select_frame_2 (frame);
+#endif
+}
+/* Called from tty_raise_frame. */
+void
+select_frame_2 (Lisp_Object frame)
+{
+struct frame *f = XFRAME (frame);
 Lisp_Object old_selected_frame = Fselected_frame (Qnil);
 if (EQ (frame, old_selected_frame))
 return;
 /* now select the frame's device */
 set_device_selected_frame (XDEVICE (FRAME_DEVICE (f)), frame);
 return XFRAME (frame);
 }
 #if 0 /* FSFmacs */
-xxDEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 2, "e" /*
+xxDEFUN ("handle-switch-frame", Fhandle_switch_frame, 1, 2, "e", /*
 Handle a switch-frame event EVENT.
 Switch-frame events are usually bound to this function.
 A switch-frame event tells Emacs that the window manager has requested
 that the user's events be directed to the frame mentioned in the event.
 This function selects the selected window of the frame of EVENT.
 If EVENT is frame object, handle it as if it were a switch-frame event
 to that frame.
-*/ )
+*/
-(Lisp_Object frame, Lisp_Object no_enter)
+	 (frame, no_enter))
 {
 /* Preserve prefix arg that the command loop just cleared.  */
 XCONSOLE (Vselected_console)->prefix_arg = Vcurrent_prefix_arg;
 #if 0 /* unclean! */
 run_hook (Qmouse_leave_buffer_hook);
 #endif
 return do_switch_frame (frame, no_enter, 0);
 }
 /* A load of garbage. */
-xxDEFUN ("ignore-event", Fignore_event, Signore_event, 0, 0, "" /*
+xxDEFUN ("ignore-event", Fignore_event, 0, 0, "", /*
 Do nothing, but preserve any prefix argument already specified.
 This is a suitable binding for iconify-frame and make-frame-visible.
-*/ )
+*/
-()
+	 ())
 {
 struct console *c = XCONSOLE (Vselected_console);
 c->prefix_arg = Vcurrent_prefix_arg;
 return Qnil;
 }
-#endif
+#endif /* 0 */
 DEFUN ("selected-frame", Fselected_frame, 0, 1, 0, /*
 Return the frame that is now selected on device DEVICE.
 If DEVICE is not specified, the selected device will be used.
 If no frames exist on the device, nil is returned.
 next_frame_internal (Lisp_Object frame, Lisp_Object frametype,
 		     Lisp_Object console, int called_from_delete_device)
 {
 int passed = 0;
 int started_over = 0;
+Lisp_Object tmp_frametype;
 /* If this frame is dead, it won't be in frame_list, and we'll loop
 forever.  Forestall that.  */
 CHECK_LIVE_FRAME (frame);
 		  /* If we've looped all the way around without finding any
 		     eligible frames, return the original frame.  */
 		  if (EQ (f, frame))
 		    return f;
-		  if (frame_matches_frametype (f, frametype))
+		  tmp_frametype = frametype;
+		  if (FRAME_TTY_P (XFRAME (f)))
+		    {
+		      /* Only one TTY frame is visible at a time, but
+next-frame and similar should still find
+them.  */
+		      if (EQ (frametype, Qvisible)
+			  || EQ (frametype, Qvisible_nomini)
+			  || EQ (frametype, Qvisible_iconic_nomini))
+			tmp_frametype = Qnil;
+		    }
+		  if (frame_matches_frametype (f, tmp_frametype))
 		    return f;
 		}
 	      if (EQ (frame, f))
 		passed++;
 Lisp_Object
 prev_frame (Lisp_Object frame, Lisp_Object frametype, Lisp_Object console)
 {
 Lisp_Object devcons, concons;
 Lisp_Object prev;
+Lisp_Object tmp_frametype;
 /* If this frame is dead, it won't be in frame_list, and we'll loop
 forever.  Forestall that.  */
 CHECK_LIVE_FRAME (frame);
 	    return prev;
 	  /* Decide whether this frame is eligible to be returned,
 	     according to frametype.  */
-	  if (frame_matches_frametype (f, frametype))
+	  tmp_frametype = frametype;
+	  if (FRAME_TTY_P (XFRAME (f)))
+	    {
+	      /* Only one TTY frame is visible at a time, but
+		 next-frame and similar should still find them.  */
+	      if (EQ (frametype, Qvisible)
+		  || EQ (frametype, Qvisible_nomini)
+		  || EQ (frametype, Qvisible_iconic_nomini))
+		tmp_frametype = Qnil;
+	    }
+	  if (frame_matches_frametype (f, tmp_frametype))
 	    prev = f;
 	}
 }
 is being "changed" to its existing size, and do nothing if so? */
 if (in_display)
 abort ();
 XSETFRAME (frame, f);
+/*
+* If the frame has been initialized and the new height and width
+* are the same as the current height and width, then just return.
+*/
+if (f->init_finished &&
+newheight == FRAME_HEIGHT (f) && newwidth == FRAME_WIDTH (f))
+return;
 default_face_height_and_width (frame, &font_height, &font_width);
 /* This size-change overrides any pending one for this frame.  */
 FRAME_NEW_HEIGHT (f) = 0;
 FRAME_NEW_WIDTH (f) = 0;
 /* */
 Vframe_being_created = Qnil;
 staticpro (&Vframe_being_created);
 #ifdef HAVE_CDE
-Vfeatures = Fcons (intern ("cde"), Vfeatures);
+Fprovide (intern ("cde"));
 #endif
 #if 0 /* FSFmacs stupidity */
 xxDEFVAR_LISP ("emacs-iconified", &Vemacs_iconified /*
 Non-nil if all of emacs is iconified and frame updates are not needed.

Mercurial > hg > xemacs-beta

comparison src/frame.c @ 149:538048ae2ab8 r20-3b1