thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.3.595

Browse Source 
Problem:    The X command server responds slowly
Solution:   Change the loop that waits for replies. (Brian Burns)
This commit is contained in:
Bram Moolenaar 2012-07-10 14:56:45 +02:00
parent 52bf469f6f
commit 773c1ef81b
2 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/if_xcmdsrv.c
View File

@ -572,38 +572,15 @@ ServerWait(dpy, w, endCond, endData, localLoop, seconds)
{ {
time_t start; time_t start;
time_t now; time_t now;
time_t lastChk = 0;
XEvent event; XEvent event;
XPropertyEvent *e = (XPropertyEvent *)&event;
# define SEND_MSEC_POLL 50
time(&start); #define UI_MSEC_DELAY 50
while (endCond(endData) == 0) #define SEND_MSEC_POLL 500
{
time(&now);
if (seconds >= 0 && (now - start) >= seconds)
break;
if (now != lastChk)
{
lastChk = now;
if (!WindowValid(dpy, w))
break;
/*
* Sometimes the PropertyChange event doesn't come.
* This can be seen in eg: vim -c 'echo remote_expr("gvim", "3+2")'
*/
serverEventProc(dpy, NULL);
}
if (localLoop)
{
/* Just look out for the answer without calling back into Vim */
#ifndef HAVE_SELECT #ifndef HAVE_SELECT
struct pollfd fds; struct pollfd fds;
fds.fd = ConnectionNumber(dpy); fds.fd = ConnectionNumber(dpy);
fds.events = POLLIN; fds.events = POLLIN;
if (poll(&fds, 1, SEND_MSEC_POLL) < 0)
break;
#else #else
fd_set fds; fd_set fds;
struct timeval tv; struct timeval tv;
@ -612,21 +589,38 @@ ServerWait(dpy, w, endCond, endData, localLoop, seconds)
tv.tv_usec = SEND_MSEC_POLL * 1000; tv.tv_usec = SEND_MSEC_POLL * 1000;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(ConnectionNumber(dpy), &fds); FD_SET(ConnectionNumber(dpy), &fds);
if (select(ConnectionNumber(dpy) + 1, &fds, NULL, NULL, &tv) < 0) #endif
time(&start);
while (TRUE)
{
while (XCheckWindowEvent(dpy, commWindow, PropertyChangeMask, &event))
serverEventProc(dpy, &event);
if (endCond(endData) != 0)
break;
if (!WindowValid(dpy, w))
break;
time(&now);
if (seconds >= 0 && (now - start) >= seconds)
break;
/* Just look out for the answer without calling back into Vim */
if (localLoop)
{
#ifndef HAVE_SELECT
if (poll(&fds, 1, SEND_MSEC_POLL) < 0)
break;
#else
if (select(FD_SETSIZE, &fds, NULL, NULL, &tv) < 0)
break; break;
#endif #endif
while (XEventsQueued(dpy, QueuedAfterReading) > 0)
{
XNextEvent(dpy, &event);
if (event.type == PropertyNotify && e->window == commWindow)
serverEventProc(dpy, &event);
}
} }
else else
{ {
if (got_int) if (got_int)
break; break;
ui_delay((long)SEND_MSEC_POLL, TRUE); ui_delay((long)UI_MSEC_DELAY, TRUE);
ui_breakcheck(); ui_breakcheck();
} }
} }

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
595,
/**/ /**/
594, 594,
/**/ /**/