comparison src/frame.c @ 25209:eea9647c8246

(Fframe_parameters): Swap foreground and background colors returned in frame parameters if the frame has reverse in its parameter alist. (Fmake_terminal_frame): Make a unique copy of face_alist for each frame.

25208:76f5f50e7742

  (parms)
     Lisp_Object parms;
{
  struct frame *f;
  Lisp_Object frame;

#ifdef MSDOS
  if (selected_frame->output_method != output_msdos_raw)
    abort ();
#else

  adjust_glyphs (f);
  calculate_costs (f);
  XSETFRAME (frame, f);
  Fmodify_frame_parameters (frame, Vdefault_frame_alist);
  Fmodify_frame_parameters (frame, parms);
  f->face_alist = selected_frame->face_alist;
  return frame;
}

Lisp_Object
do_switch_frame (frame, no_enter, track)

#ifdef MSDOS
  if (FRAME_MSDOS_P (f))
    {
      int fg = FRAME_FOREGROUND_PIXEL (f);
      int bg = FRAME_BACKGROUND_PIXEL (f);

      store_in_alist (&alist, intern ("foreground-color"),
		      build_string (msdos_stdcolor_name (fg)));
      store_in_alist (&alist, intern ("background-color"),
		      build_string (msdos_stdcolor_name (bg)));
    }
  store_in_alist (&alist, intern ("font"), build_string ("ms-dos"));
#endif
  store_in_alist (&alist, Qname, f->name);
  height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f));

25209:eea9647c8246

  (parms)
     Lisp_Object parms;
{
  struct frame *f;
  Lisp_Object frame;
  Lisp_Object tem;

#ifdef MSDOS
  if (selected_frame->output_method != output_msdos_raw)
    abort ();
#else

  adjust_glyphs (f);
  calculate_costs (f);
  XSETFRAME (frame, f);
  Fmodify_frame_parameters (frame, Vdefault_frame_alist);
  Fmodify_frame_parameters (frame, parms);

  /* Make the frame face alist be frame-specific, so that each
     frame could change its face definitions independently.  */
  f->face_alist = Fcopy_alist (selected_frame->face_alist);
  /* Simple Fcopy_alist isn't enough, because we need the contents of
     the vectors which are the CDRs of associations in face_alist to
     be copied as well.  */
  for (tem = f->face_alist; CONSP (tem); tem = XCDR (tem))
    XCDR (XCAR (tem)) = Fcopy_sequence (XCDR (XCAR (tem)));
  return frame;
}

Lisp_Object
do_switch_frame (frame, no_enter, track)

#ifdef MSDOS
  if (FRAME_MSDOS_P (f))
    {
      int fg = FRAME_FOREGROUND_PIXEL (f);
      int bg = FRAME_BACKGROUND_PIXEL (f);
      Lisp_Object qreverse = intern ("reverse");
      int rv =
	!NILP (Fassq (qreverse, alist))
	|| !NILP (Fassq (qreverse, Vdefault_frame_alist));

      store_in_alist (&alist, intern ("foreground-color"),
		      build_string (msdos_stdcolor_name (rv ? bg : fg)));
      store_in_alist (&alist, intern ("background-color"),
		      build_string (msdos_stdcolor_name (rv ? fg : bg)));
    }
  store_in_alist (&alist, intern ("font"), build_string ("ms-dos"));
#endif
  store_in_alist (&alist, Qname, f->name);
  height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f));