comparison src/xsmfns.c @ 83067:b44978264e1d

Merged in changes from CVS HEAD Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-118 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119 src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-120 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-107
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 28 Feb 2004 04:52:40 +0000
parents 7900111db01c 6851117e8d89
children dbcd0af66869
comparison
equal deleted inserted replaced
83066:887bb2eb4a89 83067:b44978264e1d
105 #define NOSPLASH_OPT "--no-splash" 105 #define NOSPLASH_OPT "--no-splash"
106 106
107 107
108 /* Handle any messages from the session manager. If no connection is 108 /* Handle any messages from the session manager. If no connection is
109 open to a session manager, just return 0. 109 open to a session manager, just return 0.
110 Otherwise returns the number of events stored in buffer BUFP, 110 Otherwise returns 1 if SAVE_SESSION_EVENT is stored in buffer BUFP. */
111 which can hold up to *NUMCHARS characters. At most one event is
112 stored, a SAVE_SESSION_EVENT. */
113 int 111 int
114 x_session_check_input (bufp, numchars) 112 x_session_check_input (bufp)
115 struct input_event *bufp; 113 struct input_event *bufp;
116 int *numchars;
117 { 114 {
118 SELECT_TYPE read_fds; 115 SELECT_TYPE read_fds;
119 EMACS_TIME tmout; 116 EMACS_TIME tmout;
120 117
121 if (ice_fd == -1) return 0; 118 if (ice_fd == -1) return 0;
145 (IceReplyWaitInfo *)0, (Bool *)0); 142 (IceReplyWaitInfo *)0, (Bool *)0);
146 143
147 144
148 /* Check if smc_interact_CB was called and we shall generate a 145 /* Check if smc_interact_CB was called and we shall generate a
149 SAVE_SESSION_EVENT. */ 146 SAVE_SESSION_EVENT. */
150 if (*numchars > 0 && emacs_event.kind != NO_EVENT) 147 if (emacs_event.kind == NO_EVENT)
151 { 148 return 0;
152 bcopy (&emacs_event, bufp, sizeof (struct input_event)); 149
153 bufp++; 150 bcopy (&emacs_event, bufp, sizeof (struct input_event));
154 (*numchars)--; 151 return 1;
155
156 return 1;
157 }
158
159 return 0;
160 } 152 }
161 153
162 /* Return non-zero if we have a connection to a session manager.*/ 154 /* Return non-zero if we have a connection to a session manager.*/
163 int 155 int
164 x_session_have_connection () 156 x_session_have_connection ()