Mercurial > mxe-octave
annotate src/readline-2-event-hook.patch @ 5031:5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
* src/readline-1-display.patch, src/readline-1-input.patch,
src/readline-1-sigwinch.patch, src/readline-2-event-hook.patch
dist-files.mk: add refes to added files
author | John Donoghue |
---|---|
date | Thu, 21 Mar 2019 09:34:09 -0400 |
parents | |
children | 41e50d658de0 |
rev | line source |
---|---|
5031
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
1 diff -ur readline-8.0.sigwinch/input.c readline-8.0/input.c |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
2 --- readline-8.0.sigwinch/input.c 2019-03-20 08:15:55.450361377 -0400 |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
3 +++ readline-8.0/input.c 2019-03-20 08:30:58.059756179 -0400 |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
4 @@ -140,6 +140,11 @@ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
5 static unsigned char ibuffer[512]; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
6 static int ibuffer_len = sizeof (ibuffer) - 1; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
7 |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
8 +#if defined (__MINGW32__) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
9 +static int _win32_getch (void); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
10 +static int _win32_kbhit (void); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
11 +#endif |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
12 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
13 #define any_typein (push_index != pop_index) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
14 |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
15 int |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
16 @@ -266,7 +271,7 @@ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
17 #if defined (__MINGW32__) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
18 /* Use getch/_kbhit to check for available console input, in the same way |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
19 that we read it normally. */ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
20 - chars_avail = isatty (tty) ? _kbhit () : 0; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
21 + chars_avail = isatty (tty) ? _win32_kbhit () : 0; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
22 result = 0; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
23 #endif |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
24 |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
25 @@ -501,6 +506,120 @@ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
26 return (c); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
27 } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
28 |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
29 +#if defined (__MINGW32__) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
30 +#define _WIN32_READ_NOCHAR (-2) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
31 +static char _win32_buf[16] = {'0'}; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
32 +static int _win32_bufidx = 0; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
33 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
34 +static int |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
35 +_win32_getch_internal (int block) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
36 +{ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
37 + INPUT_RECORD rec; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
38 + DWORD evRead, waitResult; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
39 + HANDLE hInput = (HANDLE) _get_osfhandle (fileno (rl_instream)); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
40 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
41 + if (_win32_bufidx > 0) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
42 + return _win32_buf[--_win32_bufidx]; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
43 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
44 + hInput = (HANDLE) _get_osfhandle (fileno (rl_instream)); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
45 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
46 + do |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
47 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
48 + if (! block) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
49 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
50 + if (WaitForSingleObject(hInput, _keyboard_input_timeout/1000) != WAIT_OBJECT_0) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
51 + return _WIN32_READ_NOCHAR; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
52 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
53 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
54 + if (!ReadConsoleInput(hInput, &rec, 1, &evRead) || evRead != 1) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
55 + return EOF; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
56 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
57 + switch (rec.EventType) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
58 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
59 + case KEY_EVENT: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
60 + if ((rec.Event.KeyEvent.bKeyDown && |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
61 + (rec.Event.KeyEvent.wVirtualKeyCode < VK_SHIFT || |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
62 + rec.Event.KeyEvent.wVirtualKeyCode > VK_MENU)) || |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
63 + (!rec.Event.KeyEvent.bKeyDown && |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
64 + rec.Event.KeyEvent.wVirtualKeyCode == VK_MENU && |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
65 + rec.Event.KeyEvent.uChar.AsciiChar)) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
66 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
67 + if (rec.Event.KeyEvent.uChar.AsciiChar) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
68 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
69 + if (rec.Event.KeyEvent.uChar.AsciiChar < 0 || |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
70 + (rec.Event.KeyEvent.uChar.AsciiChar < 32 && |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
71 + !(rec.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED)))) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
72 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
73 + char c = rec.Event.KeyEvent.uChar.AsciiChar; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
74 + if (GetOEMCP () == GetConsoleCP ()) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
75 + OemToCharBuff (&c, &c, 1); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
76 + return (int)(unsigned char)c; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
77 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
78 + else |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
79 + return (int)rec.Event.KeyEvent.uChar.UnicodeChar; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
80 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
81 + else |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
82 + switch (rec.Event.KeyEvent.wVirtualKeyCode) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
83 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
84 + case VK_UP: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
85 + _win32_buf[_win32_bufidx++] = 'H'; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
86 + return 0340; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
87 + case VK_DOWN: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
88 + _win32_buf[_win32_bufidx++] = 'P'; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
89 + return 0340; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
90 + case VK_RIGHT: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
91 + _win32_buf[_win32_bufidx++] = 'M'; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
92 + return 0340; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
93 + case VK_LEFT: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
94 + _win32_buf[_win32_bufidx++] = 'K'; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
95 + return 0340; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
96 + case VK_HOME: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
97 + _win32_buf[_win32_bufidx++] = 'G'; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
98 + return 0340; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
99 + case VK_END: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
100 + _win32_buf[_win32_bufidx++] = 'O'; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
101 + return 0340; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
102 + case VK_DELETE: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
103 + _win32_buf[_win32_bufidx++] = 'S'; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
104 + return 0340; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
105 + default: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
106 + break; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
107 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
108 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
109 + break; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
110 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
111 + case WINDOW_BUFFER_SIZE_EVENT: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
112 + rl_resize_terminal (); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
113 + break; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
114 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
115 + default: |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
116 + break; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
117 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
118 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
119 + while (1); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
120 +} |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
121 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
122 +static int |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
123 +_win32_kbhit (void) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
124 +{ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
125 + int result; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
126 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
127 + result = _win32_getch_internal (0); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
128 + if (result == _WIN32_READ_NOCHAR |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
129 + || result == EOF) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
130 + return 0; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
131 + _win32_buf[_win32_bufidx++] = result; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
132 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
133 + return _win32_bufidx; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
134 +} |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
135 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
136 +static int |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
137 +_win32_getch (void) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
138 +{ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
139 + return _win32_getch_internal (1); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
140 +} |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
141 +#endif |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
142 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
143 int |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
144 rl_getc (FILE *stream) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
145 { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
146 @@ -520,9 +639,9 @@ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
147 #if defined (__MINGW32__) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
148 if (isatty (fileno (stream))) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
149 { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
150 - int c = _getch (); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
151 + int c = _win32_getch (); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
152 if (c == 0xe0) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
153 - rl_execute_next (_getch ()); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
154 + rl_execute_next (_win32_getch ()); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
155 return (c); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
156 } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
157 #endif |