Mercurial > vim

comparison src/terminal.c @ 12138:bee3751f3d4e v8.0.0949

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0949: winpty.dll name is fixed commit https://github.com/vim/vim/commit/9e13aa7729486d79a530ecae1a7a95d10da27d61 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 16 23:14:08 2017 +0200 patch 8.0.0949: winpty.dll name is fixed Problem: winpty.dll name is fixed. Solution: Add the 'winptydll' option. Make the default name depend on whether it is a 32-bit or 64-bit build. (idea by Yasuhiro Matsumoto, closes #1978)
author Christian Brabandt <cb@256bit.org>
date Wed, 16 Aug 2017 23:15:03 +0200
parents 4e9c14cb1f5d
children abd69cea3459
comparison
equal deleted inserted replaced
12137:7b1eedab0ff1 12138:bee3751f3d4e
36 * that buffer, attributes come from the scrollback buffer tl_scrollback. 36 * that buffer, attributes come from the scrollback buffer tl_scrollback.
37 * When the buffer is changed it is turned into a normal buffer, the attributes 37 * When the buffer is changed it is turned into a normal buffer, the attributes
38 * in tl_scrollback are no longer used. 38 * in tl_scrollback are no longer used.
39 * 39 *
40 * TODO: 40 * TODO:
41 * - make [range]terminal pipe [range] lines to the terminal
41 * - implement term_setsize() 42 * - implement term_setsize()
42 * - add test for giving error for invalid 'termsize' value. 43 * - add test for giving error for invalid 'termsize' value.
43 * - support minimal size when 'termsize' is "rows*cols". 44 * - support minimal size when 'termsize' is "rows*cols".
44 * - support minimal size when 'termsize' is empty? 45 * - support minimal size when 'termsize' is empty?
45 * - implement job options when starting a terminal. Allow: 46 * - implement job options when starting a terminal. Allow:
2766 }; 2767 };
2767 2768
2768 /* No need to initialize twice. */ 2769 /* No need to initialize twice. */
2769 if (hWinPtyDLL) 2770 if (hWinPtyDLL)
2770 return 1; 2771 return 1;
2771 /* Load winpty.dll */ 2772 /* Load winpty.dll, prefer using the 'winptydll' option, fall back to just
2772 hWinPtyDLL = vimLoadLib(WINPTY_DLL); 2773 * winpty.dll. */
2774 if (*p_winptydll != NUL)
2775 hWinPtyDLL = vimLoadLib((char *)p_winptydll);
2773 if (!hWinPtyDLL) 2776 if (!hWinPtyDLL)
2774 { 2777 hWinPtyDLL = vimLoadLib(WINPTY_DLL);
2775 EMSG2(_(e_loadlib), WINPTY_DLL); 2778 if (!hWinPtyDLL)
2779 {
2780 EMSG2(_(e_loadlib), *p_winptydll != NUL ? p_winptydll : WINPTY_DLL);
2776 return 0; 2781 return 0;
2777 } 2782 }
2778 for (i = 0; winpty_entry[i].name != NULL 2783 for (i = 0; winpty_entry[i].name != NULL
2779 && winpty_entry[i].ptr != NULL; ++i) 2784 && winpty_entry[i].ptr != NULL; ++i)
2780 { 2785 {