mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

Rename wait_reading_process_input to wait_reading_process_output.

Browse Source
This commit is contained in:
Kim F. Storm 2004-08-20 10:34:12 +00:00
parent 214d60691b
commit d64b707cb1
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/keyboard.c
View File

@ -3899,7 +3899,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
break;
#endif
{
wait_reading_process_input (0, 0, -1, 1, Qnil, NULL, 0);
wait_reading_process_output (0, 0, -1, 1, Qnil, NULL, 0);
if (!interrupt_input && kbd_fetch_ptr == kbd_store_ptr)
/* Pass 1 for EXPECT since we just waited to have input. */
@ -9917,7 +9917,7 @@ clear_input_pending ()
}
/* Return nonzero if there are pending requeued events.
This isn't used yet. The hope is to make wait_reading_process_input
This isn't used yet. The hope is to make wait_reading_process_output
call it, and return if it runs Lisp code that unreads something.
The problem is, kbd_buffer_get_event needs to be fixed to know what
to do in that case. It isn't trivial. */

8
src/lisp.h
View File

@ -2964,10 +2964,10 @@ EXFUN (Fprocess_send_eof, 1);
EXFUN (Fwaiting_for_user_input_p, 0);
extern Lisp_Object Qprocessp;
extern void kill_buffer_processes P_ ((Lisp_Object));
extern int wait_reading_process_input P_ ((int, int, int, int,
Lisp_Object,
struct Lisp_Process *,
int));
extern int wait_reading_process_output P_ ((int, int, int, int,
Lisp_Object,
struct Lisp_Process *,
int));
extern void deactivate_process P_ ((Lisp_Object));
extern void add_keyboard_wait_descriptor P_ ((int));
extern void delete_keyboard_wait_descriptor P_ ((int));

2
src/msdos.c
View File

@ -5102,7 +5102,7 @@ dos_yield_time_slice (void)
/* Only event queue is checked. */
/* We don't have to call timer_check here
because wait_reading_process_input takes care of that. */
because wait_reading_process_output takes care of that. */
int
sys_select (nfds, rfds, wfds, efds, timeout)
int nfds;

2
src/w32proc.c
View File

@ -1218,7 +1218,7 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
{
DebPrint (("select.WaitForMultipleObjects (%d, %lu) failed with %lu\n",
nh + nc, timeout_ms, GetLastError ()));
/* don't return EBADF - this causes wait_reading_process_input to
/* don't return EBADF - this causes wait_reading_process_output to
abort; WAIT_FAILED is returned when single-stepping under
Windows 95 after switching thread focus in debugger, and
possibly at other times. */

2
src/w32term.c
View File

@ -4570,7 +4570,7 @@ w32_read_socket (sd, expected, hold_quit)
f->async_visible = 1;
f->async_iconified = 0;
/* wait_reading_process_input will notice this and update
/* wait_reading_process_output will notice this and update
the frame's display structures. */
SET_FRAME_GARBAGED (f);

2
src/xdisp.c
View File

@ -10381,7 +10381,7 @@ redisplay_internal (preserve_echo_area)
This is useful in situations where you need to redisplay but no
user action has occurred, making it inappropriate for the message
area to be cleared. See tracking_off and
wait_reading_process_input for examples of these situations.
wait_reading_process_output for examples of these situations.
FROM_WHERE is an integer saying from where this function was
called. This is useful for debugging. */

8
src/xselect.c
View File

@ -1109,8 +1109,8 @@ wait_for_property_change (location)
secs = x_selection_timeout / 1000;
usecs = (x_selection_timeout % 1000) * 1000;
TRACE2 (" Waiting %d secs, %d usecs", secs, usecs);
wait_reading_process_input (secs, usecs, 0, 0,
property_change_reply, NULL, 0);
wait_reading_process_output (secs, usecs, 0, 0,
property_change_reply, NULL, 0);
if (NILP (XCAR (property_change_reply)))
{
@ -1289,8 +1289,8 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
secs = x_selection_timeout / 1000;
usecs = (x_selection_timeout % 1000) * 1000;
TRACE1 (" Start waiting %d secs for SelectionNotify", secs);
wait_reading_process_input (secs, usecs, 0, 0,
reading_selection_reply, NULL, 0);
wait_reading_process_output (secs, usecs, 0, 0,
reading_selection_reply, NULL, 0);
TRACE1 (" Got event = %d", !NILP (XCAR (reading_selection_reply)));
BLOCK_INPUT;

2
src/xterm.c
View File

@ -6174,7 +6174,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
f = x_top_window_to_frame (dpyinfo, event.xmap.window);
if (f)
{
/* wait_reading_process_input will notice this and update
/* wait_reading_process_output will notice this and update
the frame's display structures.
If we where iconified, we should not set garbaged,
because that stops redrawing on Expose events. This looks