Mercurial > mxe-octave

annotate src/readline-1-sigwinch.patch @ 5534:372ea4c0afb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move of-ocs PKG_XXXX to inst dir and add break patch * src/of-ocs-3-break-fixes.patch, src/of-ocs-4-pkgadd-fixes.patch: new files * dist-files.mk: add ref to files
author John Donoghue <john.donoghue@ieee.org>
date Sun, 13 Sep 2020 08:15:14 -0400
parents 5049ab5e66f6
children 41e50d658de0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5031
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
1 Common subdirectories: readline-8.0.input/doc and readline-8.0/doc
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
2 Common subdirectories: readline-8.0.input/examples and readline-8.0/examples
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
3 diff -u readline-8.0.input/readline.c readline-8.0/readline.c
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
4 --- readline-8.0.input/readline.c 2019-03-20 08:02:03.533512025 -0400
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
5 +++ readline-8.0/readline.c 2019-03-20 08:06:59.117185446 -0400
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
6 @@ -1103,8 +1103,12 @@
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
7 RL_SETSTATE(RL_STATE_INITIALIZED);
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
8 }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
9 else
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
10 - (void)_rl_init_locale (); /* check current locale */
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
11 -
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 + (void)_rl_init_locale (); /* check current locale */
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
14 +#if defined (__MINGW32__)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
15 + rl_reset_screen_size ();
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
16 +#endif
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
17 + }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
18 /* Initialize the current line information. */
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
19 _rl_init_line_state ();
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
20
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
21 Common subdirectories: readline-8.0.input/shlib and readline-8.0/shlib
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
22 diff -u readline-8.0.input/signals.c readline-8.0/signals.c
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
23 --- readline-8.0.input/signals.c 2019-03-20 08:02:03.529511918 -0400
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
24 +++ readline-8.0/signals.c 2019-03-20 08:13:44.347195350 -0400
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
25 @@ -46,6 +46,11 @@
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 #include "rlprivate.h"
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_LEAN_AND_MEAN
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
31 +# include <windows.h>
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
32 +#endif
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 (HANDLE_SIGNALS)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
35
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
36 #if !defined (RETSIGTYPE)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
37 @@ -92,7 +97,7 @@
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
38 int rl_catch_signals = 1;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
39
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
40 /* 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
41 -#ifdef SIGWINCH
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
42 +#if defined (SIGWINCH) || defined(__MINGW32__)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
43 int rl_catch_sigwinch = 1;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
44 #else
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
45 int rl_catch_sigwinch = 0; /* for the readline state struct in readline.c */
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
46 @@ -495,6 +500,21 @@
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 #endif /* SIGWINCH */
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 defined (__MINGW32__)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
51 + 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
52 + {
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
53 + DWORD mode;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
54 + HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE);
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 + if (GetConsoleMode (hStdIn, &mode))
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
57 + {
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
58 + mode |= ENABLE_WINDOW_INPUT;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
59 + if (SetConsoleMode (hStdIn, mode))
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
60 + sigwinch_set_flag = 1;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
61 + }
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 +#endif
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 return 0;
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
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
68 @@ -545,6 +565,20 @@
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
69 sigwinch_set_flag = 0;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
70 }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
71 #endif
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
72 +#if defined (__MINGW32__)
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
73 + 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
74 + {
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
75 + DWORD mode;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
76 + HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE);
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 + if (GetConsoleMode (hStdIn, &mode))
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
79 + {
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
80 + mode &= ~ENABLE_WINDOW_INPUT;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
81 + if (SetConsoleMode (hStdIn, mode))
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
82 + sigwinch_set_flag = 0;
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 + }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
85 +#endif
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
86
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
87 return 0;
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
88 }
5049ab5e66f6 Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff changeset
89 Common subdirectories: readline-8.0.input/support and readline-8.0/support