home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.595 < prev    next >
Encoding:
Internet Message Format  |  2012-11-20  |  3.8 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.595
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.3.595
  11. Problem:    The X command server responds slowly
  12. Solution:   Change the loop that waits for replies. (Brian Burns)
  13. Files:        src/if_xcmdsrv.c
  14.  
  15.  
  16. *** ../vim-7.3.594/src/if_xcmdsrv.c    2012-07-10 14:25:00.000000000 +0200
  17. --- src/if_xcmdsrv.c    2012-07-10 14:44:13.000000000 +0200
  18. ***************
  19. *** 572,632 ****
  20.   {
  21.       time_t        start;
  22.       time_t        now;
  23. -     time_t        lastChk = 0;
  24.       XEvent        event;
  25. !     XPropertyEvent *e = (XPropertyEvent *)&event;
  26. ! #   define SEND_MSEC_POLL 50
  27.   
  28.       time(&start);
  29. !     while (endCond(endData) == 0)
  30.       {
  31.       time(&now);
  32.       if (seconds >= 0 && (now - start) >= seconds)
  33.           break;
  34. !     if (now != lastChk)
  35. !     {
  36. !         lastChk = now;
  37. !         if (!WindowValid(dpy, w))
  38. !         break;
  39. !         /*
  40. !          * Sometimes the PropertyChange event doesn't come.
  41. !          * This can be seen in eg: vim -c 'echo remote_expr("gvim", "3+2")'
  42. !          */
  43. !         serverEventProc(dpy, NULL);
  44. !     }
  45.       if (localLoop)
  46.       {
  47. -         /* Just look out for the answer without calling back into Vim */
  48.   #ifndef HAVE_SELECT
  49. -         struct pollfd   fds;
  50. - 
  51. -         fds.fd = ConnectionNumber(dpy);
  52. -         fds.events = POLLIN;
  53.           if (poll(&fds, 1, SEND_MSEC_POLL) < 0)
  54.           break;
  55.   #else
  56. !         fd_set        fds;
  57. !         struct timeval  tv;
  58. ! 
  59. !         tv.tv_sec = 0;
  60. !         tv.tv_usec =  SEND_MSEC_POLL * 1000;
  61. !         FD_ZERO(&fds);
  62. !         FD_SET(ConnectionNumber(dpy), &fds);
  63. !         if (select(ConnectionNumber(dpy) + 1, &fds, NULL, NULL, &tv) < 0)
  64.           break;
  65.   #endif
  66. -         while (XEventsQueued(dpy, QueuedAfterReading) > 0)
  67. -         {
  68. -         XNextEvent(dpy, &event);
  69. -         if (event.type == PropertyNotify && e->window == commWindow)
  70. -             serverEventProc(dpy, &event);
  71. -         }
  72.       }
  73.       else
  74.       {
  75.           if (got_int)
  76.           break;
  77. !         ui_delay((long)SEND_MSEC_POLL, TRUE);
  78.           ui_breakcheck();
  79.       }
  80.       }
  81. --- 572,626 ----
  82.   {
  83.       time_t        start;
  84.       time_t        now;
  85.       XEvent        event;
  86. ! 
  87. ! #define UI_MSEC_DELAY 50
  88. ! #define SEND_MSEC_POLL 500
  89. ! #ifndef HAVE_SELECT
  90. !     struct pollfd   fds;
  91. ! 
  92. !     fds.fd = ConnectionNumber(dpy);
  93. !     fds.events = POLLIN;
  94. ! #else
  95. !     fd_set        fds;
  96. !     struct timeval  tv;
  97. ! 
  98. !     tv.tv_sec = 0;
  99. !     tv.tv_usec =  SEND_MSEC_POLL * 1000;
  100. !     FD_ZERO(&fds);
  101. !     FD_SET(ConnectionNumber(dpy), &fds);
  102. ! #endif
  103.   
  104.       time(&start);
  105. !     while (TRUE)
  106.       {
  107. +     while (XCheckWindowEvent(dpy, commWindow, PropertyChangeMask, &event))
  108. +         serverEventProc(dpy, &event);
  109. + 
  110. +     if (endCond(endData) != 0)
  111. +         break;
  112. +     if (!WindowValid(dpy, w))
  113. +         break;
  114.       time(&now);
  115.       if (seconds >= 0 && (now - start) >= seconds)
  116.           break;
  117. ! 
  118. !     /* Just look out for the answer without calling back into Vim */
  119.       if (localLoop)
  120.       {
  121.   #ifndef HAVE_SELECT
  122.           if (poll(&fds, 1, SEND_MSEC_POLL) < 0)
  123.           break;
  124.   #else
  125. !         if (select(FD_SETSIZE, &fds, NULL, NULL, &tv) < 0)
  126.           break;
  127.   #endif
  128.       }
  129.       else
  130.       {
  131.           if (got_int)
  132.           break;
  133. !         ui_delay((long)UI_MSEC_DELAY, TRUE);
  134.           ui_breakcheck();
  135.       }
  136.       }
  137. *** ../vim-7.3.594/src/version.c    2012-07-10 14:25:00.000000000 +0200
  138. --- src/version.c    2012-07-10 14:52:16.000000000 +0200
  139. ***************
  140. *** 716,717 ****
  141. --- 716,719 ----
  142.   {   /* Add new patch number below this line */
  143. + /**/
  144. +     595,
  145.   /**/
  146.  
  147. -- 
  148. hundred-and-one symptoms of being an internet addict:
  149. 104. When people ask about the Presidential Election you ask "Which country?"
  150.  
  151.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  152. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  153. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  154.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  155.