comparison src/frame.c @ 83003:19208c3cbcc9

Fix more SEGV cases in frame.c src/frame.c (Fmouse_pixel_position, Fraise_frame, Flower_frame) (Fredirect_frame_focus): Don't do anything if the current frame is a termcap frame. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-43

83002:e654e1383970

  f = SELECTED_FRAME ();
  x = y = Qnil;

#ifdef HAVE_MOUSE
  /* It's okay for the hook to refrain from storing anything.  */
  if (mouse_position_hook)
    (*mouse_position_hook) (&f, -1,
			    &lispy_dummy, &party_dummy,
			    &x, &y,
			    &long_dummy);
#endif

  CHECK_LIVE_FRAME (frame);

  /* Do like the documentation says. */
  Fmake_frame_visible (frame);

  if (frame_raise_lower_hook)
    (*frame_raise_lower_hook) (XFRAME (frame), 1);

  return Qnil;
}

  if (NILP (frame))
    frame = selected_frame;

  CHECK_LIVE_FRAME (frame);

  if (frame_raise_lower_hook)
    (*frame_raise_lower_hook) (XFRAME (frame), 0);

  return Qnil;
}

  if (! NILP (focus_frame))
    CHECK_LIVE_FRAME (focus_frame);

  XFRAME (frame)->focus_frame = focus_frame;

  if (!FRAME_TERMCAP_P (XFRAME (frame)) && frame_rehighlight_hook)
    (*frame_rehighlight_hook) (XFRAME (frame));

  return Qnil;
}

83003:19208c3cbcc9

  f = SELECTED_FRAME ();
  x = y = Qnil;

#ifdef HAVE_MOUSE
  /* It's okay for the hook to refrain from storing anything.  */
  if (FRAME_TERMCAP_P (f)
      && mouse_position_hook)
    (*mouse_position_hook) (&f, -1,
			    &lispy_dummy, &party_dummy,
			    &x, &y,
			    &long_dummy);
#endif

  CHECK_LIVE_FRAME (frame);

  /* Do like the documentation says. */
  Fmake_frame_visible (frame);

  if (FRAME_TERMCAP_P (XFRAME (frame))
      && frame_raise_lower_hook)
    (*frame_raise_lower_hook) (XFRAME (frame), 1);

  return Qnil;
}

  if (NILP (frame))
    frame = selected_frame;

  CHECK_LIVE_FRAME (frame);

  if (FRAME_TERMCAP_P (XFRAME (frame))
      && frame_raise_lower_hook)
    (*frame_raise_lower_hook) (XFRAME (frame), 0);

  return Qnil;
}

  if (! NILP (focus_frame))
    CHECK_LIVE_FRAME (focus_frame);

  XFRAME (frame)->focus_frame = focus_frame;

  if (!FRAME_TERMCAP_P (XFRAME (frame))
      && frame_rehighlight_hook)
    (*frame_rehighlight_hook) (XFRAME (frame));

  return Qnil;
}