comparison src/xterm.c @ 34673:77cda2c018e5

(x_connection_closed): Prevent being called recursively because of an error condition in XtCloseDisplay.

34672:8f55d03259de

/* Handling X errors.  */

/* Handle the loss of connection to display DISPLAY.  */

static SIGTYPE
x_connection_closed (display, error_message)
     Display *display;
     char *error_message;
{
  struct x_display_info *dpyinfo = x_display_info_for_display (display);
  Lisp_Object frame, tail;

  /* We have to close the display to inform Xt that it doesn't
     exist anymore.  If we don't, Xt will continue to wait for
     events from the display.  As a consequence, a sequence of

     Closing the display is reported to lead to a bus error on
     OpenWindows in certain situations.  I suspect that is a bug
     in OpenWindows.  I don't know how to cicumvent it here.  */
  
#ifdef USE_X_TOOLKIT
  XtCloseDisplay (display);
#endif

  /* Indicate that this display is dead.  */
  if (dpyinfo)
    dpyinfo->display = 0;

34673:77cda2c018e5

/* Handling X errors.  */

/* Handle the loss of connection to display DISPLAY.  */

static SIGTYPE
x_connection_closed (dpy, error_message)
     Display *dpy;
     char *error_message;
{
  struct x_display_info *dpyinfo = x_display_info_for_display (dpy);
  Lisp_Object frame, tail;

  /* We have to close the display to inform Xt that it doesn't
     exist anymore.  If we don't, Xt will continue to wait for
     events from the display.  As a consequence, a sequence of

     Closing the display is reported to lead to a bus error on
     OpenWindows in certain situations.  I suspect that is a bug
     in OpenWindows.  I don't know how to cicumvent it here.  */
  
#ifdef USE_X_TOOLKIT
  {
    /* Prevent being called recursively because of an error condition
       in XtCloseDisplay.  Otherwise, we might end up with printing
       ``can't find per display information'' in the recursive call
       instead of printing the original message here.  */
    int count = x_catch_errors (dpy);
    XtCloseDisplay (dpy);
    x_uncatch_errors (dpy, count);
  }
#endif

  /* Indicate that this display is dead.  */
  if (dpyinfo)
    dpyinfo->display = 0;