Mercurial > vim
comparison src/proto/if_xcmdsrv.pro @ 11211:71311d899b42 v8.0.0492
patch 8.0.0492: a failing client-server request can make Vim hang
commit https://github.com/vim/vim/commit/81b9d0bd5c705815e903e671e81b0b05828efd9c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 19 21:20:53 2017 +0100
patch 8.0.0492: a failing client-server request can make Vim hang
Problem: A failing client-server request can make Vim hang.
Solution: Add a timeout argument to functions that wait.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 19 Mar 2017 21:30:05 +0100 |
parents | 21b0a39d13ed |
children |
comparison
equal
deleted
inserted
replaced
11210:5ffe3a7f9bd7 | 11211:71311d899b42 |
---|---|
1 /* if_xcmdsrv.c */ | 1 /* if_xcmdsrv.c */ |
2 int serverRegisterName(Display *dpy, char_u *name); | 2 int serverRegisterName(Display *dpy, char_u *name); |
3 void serverChangeRegisteredWindow(Display *dpy, Window newwin); | 3 void serverChangeRegisteredWindow(Display *dpy, Window newwin); |
4 int serverSendToVim(Display *dpy, char_u *name, char_u *cmd, char_u **result, Window *server, int asExpr, int localLoop, int silent); | 4 int serverSendToVim(Display *dpy, char_u *name, char_u *cmd, char_u **result, Window *server, int asExpr, int timeout, int localLoop, int silent); |
5 char_u *serverGetVimNames(Display *dpy); | 5 char_u *serverGetVimNames(Display *dpy); |
6 Window serverStrToWin(char_u *str); | 6 Window serverStrToWin(char_u *str); |
7 int serverSendReply(char_u *name, char_u *str); | 7 int serverSendReply(char_u *name, char_u *str); |
8 int serverReadReply(Display *dpy, Window win, char_u **str, int localLoop); | 8 int serverReadReply(Display *dpy, Window win, char_u **str, int localLoop, int timeout); |
9 int serverPeekReply(Display *dpy, Window win, char_u **str); | 9 int serverPeekReply(Display *dpy, Window win, char_u **str); |
10 void serverEventProc(Display *dpy, XEvent *eventPtr, int immediate); | 10 void serverEventProc(Display *dpy, XEvent *eventPtr, int immediate); |
11 void server_parse_messages(void); | 11 void server_parse_messages(void); |
12 int server_waiting(void); | 12 int server_waiting(void); |
13 /* vim: set ft=c : */ | 13 /* vim: set ft=c : */ |