comparison src/xterm.c @ 14489:9bc700f13f97

(x_connection_signal): Call x_connection_closed properly. (x_connection_closed): Set FRAME_X_DISPLAY to 0. (x_destroy_window): Don't do any X operations if FRAME_X_DISPLAY is 0. (x_term_init): Use "" as 2nd arg to setlocale. (x_connection_signal): Don't stop polling. Don't mess with SIGALRM. Those were relics of the superseded Dec 19 change.

14488:4deac8b4941c

  TOTALLY_UNBLOCK_INPUT;

  if (_Xdebug)
    abort ();

  /* First delete frames whose minibuffers are on frames
     that are on the dead display.  */
  FOR_EACH_FRAME (tail, frame)
    {
      Lisp_Object minibuf_frame;

x_connection_signal (signalnum)	/* If we don't have an argument, */
     int signalnum;		/* some compilers complain in signal calls. */
{
  x_connection_signal_dpyinfo = x_display_list;

  stop_polling ();
  sigunblock (SIGPIPE);

  while (x_connection_signal_dpyinfo)
    {
      signal (SIGPIPE, x_connection_signal_1);
      signal (SIGALRM, x_connection_signal_1);

#ifdef SOLARIS2
#ifdef XlibDisplayWriting
      /* If the thread-interlock is locked, assume this connection is dead.
	 This assumes that the library does not make other threads
	 that can be locking the display legitimately.  */
      if (x_connection_signal_dpyinfo->display->flags & XlibDisplayWriting)
	x_connection_closed (x_connection_signal_dpyinfo,
			     "connection was lost");
#endif
#endif

      XNoOp (x_connection_signal_dpyinfo->display);

{
  struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);

  BLOCK_INPUT;

  if (f->output_data.x->icon_desc != 0)
    XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc);
  XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->window_desc);
#ifdef USE_X_TOOLKIT
  XtDestroyWidget (f->output_data.x->widget);
  free_frame_menubar (f);
#endif /* USE_X_TOOLKIT */

  free_frame_faces (f);
  XFlush (FRAME_X_DISPLAY (f));

  xfree (f->output_data.x);
  f->output_data.x = 0;
  if (f == dpyinfo->x_focus_frame)
    dpyinfo->x_focus_frame = 0;

      x_initialize ();
      x_initialized = 1;
    }

#ifdef HAVE_X_I18N
  setlocale (LC_ALL, NULL);
#endif

#ifdef USE_X_TOOLKIT
  /* [e-mail] reports that this causes
     errors with X11R5:

14489:9bc700f13f97

  TOTALLY_UNBLOCK_INPUT;

  if (_Xdebug)
    abort ();

  /* Indicate that this display is dead.  */

  dpyinfo->display = 0;

  /* First delete frames whose minibuffers are on frames
     that are on the dead display.  */
  FOR_EACH_FRAME (tail, frame)
    {
      Lisp_Object minibuf_frame;

x_connection_signal (signalnum)	/* If we don't have an argument, */
     int signalnum;		/* some compilers complain in signal calls. */
{
  x_connection_signal_dpyinfo = x_display_list;

  sigunblock (SIGPIPE);

  while (x_connection_signal_dpyinfo)
    {
      signal (SIGPIPE, x_connection_signal_1);

#ifdef SOLARIS2
#ifdef XlibDisplayWriting
      /* If the thread-interlock is locked, assume this connection is dead.
	 This assumes that the library does not make other threads
	 that can be locking the display legitimately.  */
      if (x_connection_signal_dpyinfo->display->flags & XlibDisplayWriting)
	{
	  x_connection_signal_dpyinfo->display->flags &= ~XlibDisplayWriting;
	  x_connection_closed (x_connection_signal_dpyinfo->display,
			       "connection was lost");
	}
#endif
#endif

      XNoOp (x_connection_signal_dpyinfo->display);

{
  struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);

  BLOCK_INPUT;

  /* If a display connection is dead, don't try sending more
     commands to the X server.  */
  if (dpyinfo->display != 0)
    {
      if (f->output_data.x->icon_desc != 0)
	XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc);
      XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->window_desc);
#ifdef USE_X_TOOLKIT
      XtDestroyWidget (f->output_data.x->widget);
      free_frame_menubar (f);
#endif /* USE_X_TOOLKIT */

      free_frame_faces (f);
      XFlush (FRAME_X_DISPLAY (f));
    }

  xfree (f->output_data.x);
  f->output_data.x = 0;
  if (f == dpyinfo->x_focus_frame)
    dpyinfo->x_focus_frame = 0;

      x_initialize ();
      x_initialized = 1;
    }

#ifdef HAVE_X_I18N
  setlocale (LC_ALL, "");
#endif

#ifdef USE_X_TOOLKIT
  /* [e-mail] reports that this causes
     errors with X11R5: