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