[Emacs-diffs] Changes to emacs/src/xsmfns.c

[Pavel Janík]

Index: emacs/src/xsmfns.c
diff -c emacs/src/xsmfns.c:1.3 emacs/src/xsmfns.c:1.4
*** emacs/src/xsmfns.c:1.3      Thu Mar 14 16:36:28 2002
--- emacs/src/xsmfns.c  Thu Jun 13 10:59:14 2002
***************
*** 57,71 ****
  
  extern Lisp_Object Vuser_login_name;
  
! /* This is the event used when save_session occurs */
  
  static struct input_event emacs_event;
  
! /* The descriptor that we use to check for data from the session manager. */
  
  static int ice_fd = -1;
  
! /* A flag that says if we are in shutdown interactions or not. */
  
  static int doing_interact = False;
  
--- 57,71 ----
  
  extern Lisp_Object Vuser_login_name;
  
! /* This is the event used when SAVE_SESSION_EVENT occurs.  */
  
  static struct input_event emacs_event;
  
! /* The descriptor that we use to check for data from the session manager.  */
  
  static int ice_fd = -1;
  
! /* A flag that says if we are in shutdown interactions or not.  */
  
  static int doing_interact = False;
  
***************
*** 98,104 ****
     open to a session manager, just return 0.
     Otherwise returns the number of events stored in buffer BUFP,
     which can hold up to *NUMCHARS characters.  At most one event is
!    stored, an save_session_event. */
  int
  x_session_check_input (bufp, numchars)
       struct input_event *bufp;
--- 98,104 ----
     open to a session manager, just return 0.
     Otherwise returns the number of events stored in buffer BUFP,
     which can hold up to *NUMCHARS characters.  At most one event is
!    stored, an SAVE_SESSION_EVENT. */
  int
  x_session_check_input (bufp, numchars)
       struct input_event *bufp;
***************
*** 117,125 ****
    
    /* Reset this so wo can check kind after callbacks have been called by
       IceProcessMessages.  The smc_interact_CB sets the kind to
!      save_session_event, but we don't know beforehand if that callback
       will be called. */
!   emacs_event.kind = no_event;
  
    if (select (ice_fd+1, &read_fds,
                (SELECT_TYPE *)0, (SELECT_TYPE *)0, &tmout) < 0)
--- 117,125 ----
    
    /* Reset this so wo can check kind after callbacks have been called by
       IceProcessMessages.  The smc_interact_CB sets the kind to
!      SAVE_SESSION_EVENT, but we don't know beforehand if that callback
       will be called. */
!   emacs_event.kind = NO_EVENT;
  
    if (select (ice_fd+1, &read_fds,
                (SELECT_TYPE *)0, (SELECT_TYPE *)0, &tmout) < 0)
***************
*** 135,142 ****
  
    
    /* Check if smc_interact_CB was called and we shall generate a
!      save_session event. */
!   if (*numchars > 0 && emacs_event.kind != no_event)
      {
        bcopy (&emacs_event, bufp, sizeof (struct input_event));
        bufp++;
--- 135,142 ----
  
    
    /* Check if smc_interact_CB was called and we shall generate a
!      SAVE_SESSION_EVENT. */
!   if (*numchars > 0 && emacs_event.kind != NO_EVENT)
      {
        bcopy (&emacs_event, bufp, sizeof (struct input_event));
        bufp++;
***************
*** 156,162 ****
  }
  
  /* This is called when the session manager says it is OK to interact with the
!    user.  Here we set the kind to save_session so an event is generated.
     Then lisp code can interact with the user. */
  static void
  smc_interact_CB (smcConn, clientData)
--- 156,162 ----
  }
  
  /* This is called when the session manager says it is OK to interact with the
!    user.  Here we set the kind to SAVE_SESSION_EVENT so an event is generated.
     Then lisp code can interact with the user. */
  static void
  smc_interact_CB (smcConn, clientData)
***************
*** 164,170 ****
       SmPointer clientData;
  {
    doing_interact = True;
!   emacs_event.kind = save_session_event;
  }
  
  /* This is called when the session manager tells us to save ourself.
--- 164,170 ----
       SmPointer clientData;
  {
    doing_interact = True;
!   emacs_event.kind = SAVE_SESSION_EVENT;
  }
  
  /* This is called when the session manager tells us to save ourself.