Mercurial > mxe-octave

annotate src/readline-1-sigwinch.patch @ 6538:8e1e1a000deb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-netcdf: Fix compatibility with Octave 9. * src/of-netcdf-1-octave-9-compat.patch: Add patch that replaces class that has been deprecated in Octave 7 and removed from Octave 9. * dist-files.mk: Add new file to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 19 Nov 2022 12:54:37 +0100
parents 5ef7d51c2195
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5607
41e50d658de0 readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents: 5031
diff changeset
1 diff -ur readline-8.1.2/readline.c readline-8.1.3/readline.c
41e50d658de0 readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents: 5031
diff changeset
2 --- readline-8.1.2/readline.c 2020-12-19 07:55:06.477760951 -0500
41e50d658de0 readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents: 5031
diff changeset
3 +++ readline-8.1.3/readline.c 2020-12-19 07:56:17.722659252 -0500
6516
5ef7d51c2195 readline: Update to version 8.2-001.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5607
diff changeset
4 @@ -1186,8 +1186,13 @@
5031
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
5 RL_SETSTATE(RL_STATE_INITIALIZED);
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
6 }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
7 else
6516
5ef7d51c2195 readline: Update to version 8.2-001.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5607
diff changeset
8 - _rl_reset_locale (); /* check current locale and set locale variables */
5031
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
9 + {
6516
5ef7d51c2195 readline: Update to version 8.2-001.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5607
diff changeset
10 + _rl_reset_locale (); /* check current locale and set locale variables */
5031
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
11 +#if defined (__MINGW32__)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
12 + rl_reset_screen_size ();
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
13 +#endif
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
14 + }
6516
5ef7d51c2195 readline: Update to version 8.2-001.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5607
diff changeset
15
5031
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
16 /* Initialize the current line information. */
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
17 _rl_init_line_state ();
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
18
5607
41e50d658de0 readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents: 5031
diff changeset
19 Only in readline-8.1.3: readline.c.orig
41e50d658de0 readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents: 5031
diff changeset
20 diff -ur readline-8.1.2/signals.c readline-8.1.3/signals.c
41e50d658de0 readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents: 5031
diff changeset
21 --- readline-8.1.2/signals.c 2020-12-19 07:55:06.471760622 -0500
41e50d658de0 readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents: 5031
diff changeset
22 +++ readline-8.1.3/signals.c 2020-12-19 08:19:50.548964783 -0500
5031
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
23 @@ -46,6 +46,11 @@
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 #include "rlprivate.h"
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
26
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
27 +#if defined (__MINGW32__)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
28 +# define WIN32_LEAN_AND_MEAN
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
29 +# include <windows.h>
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
30 +#endif
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
31 +
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
32 #if defined (HANDLE_SIGNALS)
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 #if !defined (RETSIGTYPE)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
35 @@ -92,7 +97,7 @@
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
36 int rl_catch_signals = 1;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
37
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
38 /* If non-zero, readline will install a signal handler for SIGWINCH. */
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
39 -#ifdef SIGWINCH
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
40 +#if defined (SIGWINCH) || defined(__MINGW32__)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
41 int rl_catch_sigwinch = 1;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
42 #else
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
43 int rl_catch_sigwinch = 0; /* for the readline state struct in readline.c */
5607
41e50d658de0 readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents: 5031
diff changeset
44 @@ -532,6 +539,21 @@
5031
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 #endif /* SIGWINCH */
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 defined (__MINGW32__)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
49 + if (rl_catch_sigwinch && sigwinch_set_flag == 0)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
50 + {
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
51 + DWORD mode;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
52 + HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE);
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 (GetConsoleMode (hStdIn, &mode))
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
55 + {
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
56 + mode |= ENABLE_WINDOW_INPUT;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
57 + if (SetConsoleMode (hStdIn, mode))
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
58 + sigwinch_set_flag = 1;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
59 + }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
60 + }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
61 +#endif
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
62 +
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
63 return 0;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
64 }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
65
5607
41e50d658de0 readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents: 5031
diff changeset
66 @@ -582,6 +604,20 @@
5031
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
67 sigwinch_set_flag = 0;
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 #endif
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
70 +#if defined (__MINGW32__)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
71 + if (rl_catch_sigwinch && sigwinch_set_flag == 1)
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 + DWORD mode;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
74 + HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE);
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
75 +
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
76 + if (GetConsoleMode (hStdIn, &mode))
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 + mode &= ~ENABLE_WINDOW_INPUT;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
79 + if (SetConsoleMode (hStdIn, mode))
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
80 + sigwinch_set_flag = 0;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
81 + }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
82 + }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
83 +#endif
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
84
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
85 return 0;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
86 }