From d64b707cb1e268b4c77a51f064d7e3fd95e3df85 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 20 Aug 2004 10:34:12 +0000 Subject: [PATCH] Rename wait_reading_process_input to wait_reading_process_output. --- src/keyboard.c | 4 ++-- src/lisp.h | 8 ++++---- src/msdos.c | 2 +- src/w32proc.c | 2 +- src/w32term.c | 2 +- src/xdisp.c | 2 +- src/xselect.c | 8 ++++---- src/xterm.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/keyboard.c b/src/keyboard.c index 77b3886d809..78e7498287e 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -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. */ diff --git a/src/lisp.h b/src/lisp.h index e4fd7ef2c16..7e1e122fbc2 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -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)); diff --git a/src/msdos.c b/src/msdos.c index 2653f0bf213..f2d1dc66a69 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -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; diff --git a/src/w32proc.c b/src/w32proc.c index 8452337f7e2..9abee2bf0c2 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -1218,7 +1218,7 @@ count_children: { 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. */ diff --git a/src/w32term.c b/src/w32term.c index 71125fe4195..f71736dffad 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -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); diff --git a/src/xdisp.c b/src/xdisp.c index 7a727938a2c..334ebb72fcb 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -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. */ diff --git a/src/xselect.c b/src/xselect.c index bf7b21cf323..5de1beb9ac4 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -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; diff --git a/src/xterm.c b/src/xterm.c index 593716032e1..5e6a236c4be 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -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 -- 2.39.2