2002-05-04 Andrew Choi <akochoi@shaw.ca>

        * macterm.c (XTread_socket): Call WaitNextEvent once instead of
        repeatedly.

diff --git a/src/ChangeLog b/src/ChangeLog
index eb60fe8ce5714f986eebcfcd9303b39c9d9bdc3d..6c9681309d2475076512738753e132ec4c979ecd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-04  Andrew Choi  <akochoi@shaw.ca>
+
+       * macterm.c (XTread_socket): Call WaitNextEvent once instead of
+       repeatedly.
+
 2002-05-03  Jason Rumney  <jasonr@gnu.org>
 
        * process.c (Fmake_network_process): Only support server sockets

diff --git a/src/macterm.c b/src/macterm.c
index 4e3dc93d7cef5cef280391c8745a8eb7623268c6..5fb67a9a588f89e2c93791ba7b5952c7ab78435d 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -12301,7 +12301,7 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
   if (NILP (Fboundp (Qmac_ready_for_drag_n_drop)))
     event_mask -= highLevelEventMask;
 
-  while (WaitNextEvent (event_mask, &er, 0L, NULL) && numchars > 0)
+  if (WaitNextEvent (event_mask, &er, (expected ? app_sleep_time : 0L), NULL))
     switch (er.what)
       {
       case mouseDown:
@@ -12339,8 +12339,6 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
               mouse_tracking_in_progress = mouse_tracking_none;
               tracked_scroll_bar = NULL;
               count++;
-             bufp++;
-             numchars--;
               break;
             }
 
@@ -12356,8 +12354,6 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
                 bufp->kind = menu_bar_activate_event;
                 XSETFRAME (bufp->frame_or_window, f);
                 count++;
-               bufp++;
-               numchars--;
               }
              break;
 
@@ -12437,8 +12433,6 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
                    }
                                                                
                  count++;
-                 bufp++;
-                 numchars--;
                }
              break;
 
@@ -12462,8 +12456,6 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
                  XSETFRAME (bufp->frame_or_window,
                             ((mac_output *) GetWRefCon (window_ptr))->mFP);
                  count++;
-                 bufp++;
-                 numchars--;
                }
              break;
 
@@ -12603,8 +12595,6 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
        bufp->timestamp = er.when * (1000 / 60);  /* ticks to milliseconds */
 
        count++;
-       bufp++;
-       numchars--;
        break;
 
       case kHighLevelEvent:
@@ -12655,8 +12645,6 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
 #endif /* not TARGET_API_MAC_CARBON */
             
             count++;
-           bufp++;
-           numchars--;
           }
         
       default: