comparison src/mac.c @ 48740:b45c19284d24

sys_select: Call mac_check_for_quit_char every second while blocking sys_read: Use sys_select to test for input first before calling read to allow sys_select to test for quit_char.

48739:9f54273b7ff1

#ifdef MAC_OSX
#undef select

extern int inhibit_window_system;

/* When Emacs is started from the Finder, SELECT always immediately
   returns as if input is present when file descriptor 0 is polled for
   input.  Strangely, when Emacs is run as a GUI application from the
   command line, it blocks in the same situation.  This `wrapper' of

  SELECT_TYPE *efds;
  struct timeval *timeout;
{
  if (!inhibit_window_system && rfds && FD_ISSET (0, rfds))
    return 1;
  else
    return select (n, rfds, wfds, efds, timeout);
}


/* Set up environment variables so that Emacs can correctly find its
   support files when packaged as an application bundle.  Directories

48740:b45c19284d24

#ifdef MAC_OSX
#undef select

extern int inhibit_window_system;
extern int noninteractive;

/* When Emacs is started from the Finder, SELECT always immediately
   returns as if input is present when file descriptor 0 is polled for
   input.  Strangely, when Emacs is run as a GUI application from the
   command line, it blocks in the same situation.  This `wrapper' of

  SELECT_TYPE *efds;
  struct timeval *timeout;
{
  if (!inhibit_window_system && rfds && FD_ISSET (0, rfds))
    return 1;
  else if (inhibit_window_system || noninteractive)
    return select(n, rfds, wfds, efds, timeout);
  else
    {
      EMACS_TIME end_time, now;
      
      EMACS_GET_TIME (end_time);
      if (timeout)
	EMACS_ADD_TIME (end_time, end_time, *timeout);
      
      do
	{
	  int r;
	  EMACS_TIME one_second;
	  
	  EMACS_SET_SECS (one_second, 1);
	  EMACS_SET_USECS (one_second, 0);
	  
	  if ((r = select (n, rfds, wfds, efds, &one_second)) > 0)
	    return r;
	  
	  mac_check_for_quit_char();
	  
	  EMACS_GET_TIME (now);
	  EMACS_SUB_TIME (now, end_time, now);
	}
      while (!timeout || !EMACS_TIME_NEG_P (now));
      
      return 0;
    }
}

#undef read
int sys_read (fds, buf, nbyte)
     int fds;
     char *buf;
     unsigned int nbyte;
{
  SELECT_TYPE rfds;
  EMACS_TIME one_second;
  int r;

  /* Use select to block on IO while still checking for quit_char */
  if (!inhibit_window_system && !noninteractive)
    {
      FD_ZERO (&rfds);
      FD_SET (fds, &rfds);
      if (sys_select (fds+1, &rfds, 0, 0, NULL) < 0)
	return -1;
    }
      
  return read (fds, buf, nbyte);
}


/* Set up environment variables so that Emacs can correctly find its
   support files when packaged as an application bundle.  Directories