comparison src/xterm.c @ 69173:fdee8318ddc9

* xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary argument. * xterm.c: (x_load_font, x_term_init, XTmouse_position) (handle_one_xevent, x_connection_closed, x_list_fonts): No arg for x_uncatch_errors. * xselect.c (x_own_selection, x_decline_selection_request) (x_reply_selection_request, x_get_foreign_selection) (Fx_get_atom_name, Fx_send_client_event): Likewise. * xfns.c (x_real_positions, x_set_mouse_color, Fx_focus_frame): Likewise.

69172:e22243af3267

static void x_update_window_end P_ ((struct window *, int, int));
void x_delete_display P_ ((struct x_display_info *));

static int x_io_error_quitter P_ ((Display *));
void x_catch_errors P_ ((Display *));
void x_uncatch_errors P_ ((Display *));
void x_lower_frame P_ ((struct frame *));
void x_scroll_bar_clear P_ ((struct frame *));
int x_had_errors_p P_ ((Display *));
void x_wm_set_size_hint P_ ((struct frame *, long, int));
void x_raise_frame P_ ((struct frame *));

	  }

	if (x_had_errors_p (FRAME_X_DISPLAY (*fp)))
	  f1 = 0;

	x_uncatch_errors (FRAME_X_DISPLAY (*fp));

	/* If not, is it one of our scroll bars?  */
	if (! f1)
	  {
	    struct scroll_bar *bar;

                                    RevertToParent,
                                    event.xclient.data.l[1]);
                    /* This is needed to detect the error
                       if there is an error.  */
                    XSync (d, False);
                    x_uncatch_errors (d);
                  }
                /* Not certain about handling scroll bars here */
#endif /* 0 */
		goto done;
              }

/* Undo the last x_catch_errors call.
   DPY should be the display that was passed to x_catch_errors.  */

void
x_uncatch_errors (dpy)
     Display *dpy;
{
  struct x_error_message_stack *tmp;

  eassert (x_error_message && dpy == x_error_message->dpy);

  /* The display may have been closed before this function is called.
     Check if it is still open before calling XSync.  */
  if (x_display_info_for_display (dpy) != 0)
    {
      BLOCK_INPUT;
      XSync (dpy, False);
      UNBLOCK_INPUT;
    }

  tmp = x_error_message;
  x_error_message = x_error_message->prev;

  if (x_error_message->string[0])
    {
      char string[X_ERROR_MESSAGE_SIZE];
      bcopy (x_error_message->string, string, X_ERROR_MESSAGE_SIZE);
      x_uncatch_errors (dpy);
      error (format, string);
    }
}

/* Nonzero if we had any X protocol errors

      }

  if (dpyinfo)
    x_delete_display (dpyinfo);

  x_uncatch_errors (dpy);

  if (x_display_list == 0)
    {
      fprintf (stderr, "%s\n", error_msg);
      shut_down_emacs (0, 0, Qnil);

	      names = NULL;
	      x_clear_errors (dpy);
	    }
	}

      x_uncatch_errors (dpy);
      UNBLOCK_INPUT;

      if (names)
	{
	  int i;

		  /* This error is perhaps due to insufficient memory on X
		     server.  Let's just ignore it.  */
		  thisinfo = NULL;
		  x_clear_errors (dpy);
		}
	      x_uncatch_errors (dpy);
	      UNBLOCK_INPUT;

	      if (thisinfo)
		{
		  XSETCDR (tem,

	/* This error is perhaps due to insufficient memory on X
	   server.  Let's just ignore it.  */
	font = NULL;
	x_clear_errors (FRAME_X_DISPLAY (f));
      }
    x_uncatch_errors (FRAME_X_DISPLAY (f));
    UNBLOCK_INPUT;
    if (!font)
      return NULL;

    /* Find a free slot in the font table.  */

    x_catch_errors (dpy);
    if (!XtCallConverter (dpy, XtCvtStringToFont, &d, 1, &fr, &to, NULL))
      abort ();
    if (x_had_errors_p (dpy) || !XQueryFont (dpy, font))
      XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15");
    x_uncatch_errors (dpy);
  }
#endif
#endif

  /* See if we should run in synchronous mode.  This is useful

69173:fdee8318ddc9

static void x_update_window_end P_ ((struct window *, int, int));
void x_delete_display P_ ((struct x_display_info *));

static int x_io_error_quitter P_ ((Display *));
void x_catch_errors P_ ((Display *));
void x_uncatch_errors P_ ((void));
void x_lower_frame P_ ((struct frame *));
void x_scroll_bar_clear P_ ((struct frame *));
int x_had_errors_p P_ ((Display *));
void x_wm_set_size_hint P_ ((struct frame *, long, int));
void x_raise_frame P_ ((struct frame *));

	  }

	if (x_had_errors_p (FRAME_X_DISPLAY (*fp)))
	  f1 = 0;

	x_uncatch_errors ();

	/* If not, is it one of our scroll bars?  */
	if (! f1)
	  {
	    struct scroll_bar *bar;

                                    RevertToParent,
                                    event.xclient.data.l[1]);
                    /* This is needed to detect the error
                       if there is an error.  */
                    XSync (d, False);
                    x_uncatch_errors ();
                  }
                /* Not certain about handling scroll bars here */
#endif /* 0 */
		goto done;
              }

/* Undo the last x_catch_errors call.
   DPY should be the display that was passed to x_catch_errors.  */

void
x_uncatch_errors ()
{
  struct x_error_message_stack *tmp;

  /* The display may have been closed before this function is called.
     Check if it is still open before calling XSync.  */
  if (x_display_info_for_display (x_error_message->dpy) != 0)
    {
      BLOCK_INPUT;
      XSync (x_error_message->dpy, False);
      UNBLOCK_INPUT;
    }

  tmp = x_error_message;
  x_error_message = x_error_message->prev;

  if (x_error_message->string[0])
    {
      char string[X_ERROR_MESSAGE_SIZE];
      bcopy (x_error_message->string, string, X_ERROR_MESSAGE_SIZE);
      x_uncatch_errors ();
      error (format, string);
    }
}

/* Nonzero if we had any X protocol errors

      }

  if (dpyinfo)
    x_delete_display (dpyinfo);

  x_uncatch_errors ();

  if (x_display_list == 0)
    {
      fprintf (stderr, "%s\n", error_msg);
      shut_down_emacs (0, 0, Qnil);

	      names = NULL;
	      x_clear_errors (dpy);
	    }
	}

      x_uncatch_errors ();
      UNBLOCK_INPUT;

      if (names)
	{
	  int i;

		  /* This error is perhaps due to insufficient memory on X
		     server.  Let's just ignore it.  */
		  thisinfo = NULL;
		  x_clear_errors (dpy);
		}
	      x_uncatch_errors ();
	      UNBLOCK_INPUT;

	      if (thisinfo)
		{
		  XSETCDR (tem,

	/* This error is perhaps due to insufficient memory on X
	   server.  Let's just ignore it.  */
	font = NULL;
	x_clear_errors (FRAME_X_DISPLAY (f));
      }
    x_uncatch_errors ();
    UNBLOCK_INPUT;
    if (!font)
      return NULL;

    /* Find a free slot in the font table.  */

    x_catch_errors (dpy);
    if (!XtCallConverter (dpy, XtCvtStringToFont, &d, 1, &fr, &to, NULL))
      abort ();
    if (x_had_errors_p (dpy) || !XQueryFont (dpy, font))
      XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15");
    x_uncatch_errors ();
  }
#endif
#endif

  /* See if we should run in synchronous mode.  This is useful