Mercurial > vim

comparison src/structs.h @ 8674:4a4d5815a974 v7.4.1626

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/580984e026a46ea0c29789897b701057423b4923 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 20 21:17:13 2016 +0100 patch 7.4.1626 Problem: Missing changes to structs. Solution: Include the changes.
author Christian Brabandt <cb@256bit.org>
date Sun, 20 Mar 2016 21:30:05 +0100
parents 8c80c21a1885
children f1840a719771
comparison
equal deleted inserted replaced
8673:ed7251c3e2d3 8674:4a4d5815a974
1317 MODE_RAW, 1317 MODE_RAW,
1318 MODE_JSON, 1318 MODE_JSON,
1319 MODE_JS 1319 MODE_JS
1320 } ch_mode_T; 1320 } ch_mode_T;
1321 1321
1322 typedef enum {
1323 JIO_PIPE, /* default */
1324 JIO_NULL,
1325 JIO_FILE,
1326 JIO_BUFFER,
1327 JIO_OUT
1328 } job_io_T;
1329
1322 /* Ordering matters, it is used in for loops: IN is last, only SOCK/OUT/ERR 1330 /* Ordering matters, it is used in for loops: IN is last, only SOCK/OUT/ERR
1323 * are polled. */ 1331 * are polled. */
1324 #define PART_SOCK 0 1332 #define PART_SOCK 0
1325 #define CH_SOCK_FD ch_part[PART_SOCK].ch_fd 1333 #define CH_SOCK_FD ch_part[PART_SOCK].ch_fd
1326 1334
1349 #ifdef FEAT_GUI_GTK 1357 #ifdef FEAT_GUI_GTK
1350 gint ch_inputHandler; /* Cookie for input */ 1358 gint ch_inputHandler; /* Cookie for input */
1351 #endif 1359 #endif
1352 1360
1353 ch_mode_T ch_mode; 1361 ch_mode_T ch_mode;
1362 job_io_T ch_io;
1354 int ch_timeout; /* request timeout in msec */ 1363 int ch_timeout; /* request timeout in msec */
1355 1364
1356 readq_T ch_head; /* header for circular raw read queue */ 1365 readq_T ch_head; /* header for circular raw read queue */
1357 jsonq_T ch_json_head; /* header for circular json read queue */ 1366 jsonq_T ch_json_head; /* header for circular json read queue */
1358 int ch_block_id; /* ID that channel_read_json_block() is 1367 int ch_block_id; /* ID that channel_read_json_block() is
1381 1390
1382 int ch_id; /* ID of the channel */ 1391 int ch_id; /* ID of the channel */
1383 int ch_last_msg_id; /* ID of the last message */ 1392 int ch_last_msg_id; /* ID of the last message */
1384 1393
1385 chanpart_T ch_part[4]; /* info for socket, out, err and in */ 1394 chanpart_T ch_part[4]; /* info for socket, out, err and in */
1395
1396 char *ch_hostname; /* only for socket, allocated */
1397 int ch_port; /* only for socket */
1386 1398
1387 int ch_error; /* When TRUE an error was reported. Avoids 1399 int ch_error; /* When TRUE an error was reported. Avoids
1388 * giving pages full of error messages when 1400 * giving pages full of error messages when
1389 * the other side has exited, only mention the 1401 * the other side has exited, only mention the
1390 * first error until the connection works 1402 * first error until the connection works
1440 1452
1441 #define JO_MODE_ALL (JO_MODE + JO_IN_MODE + JO_OUT_MODE + JO_ERR_MODE) 1453 #define JO_MODE_ALL (JO_MODE + JO_IN_MODE + JO_OUT_MODE + JO_ERR_MODE)
1442 #define JO_CB_ALL \ 1454 #define JO_CB_ALL \
1443 (JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK) 1455 (JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK)
1444 #define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT) 1456 #define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT)
1445
1446 typedef enum {
1447 JIO_PIPE, /* default */
1448 JIO_NULL,
1449 JIO_FILE,
1450 JIO_BUFFER,
1451 JIO_OUT
1452 } job_io_T;
1453 1457
1454 /* 1458 /*
1455 * Options for job and channel commands. 1459 * Options for job and channel commands.
1456 */ 1460 */
1457 typedef struct 1461 typedef struct