Mercurial > mxe-octave
annotate src/readline-1-sigwinch.patch @ 5893:53a6c7df43f8
Mesa 3D: Update to version 21.1.8.
* src/mesa.mk: Update version and checksum.
* src/mesa-2-uninitialized.patch: Remove file.
* dist-files.mk: Remove file from list.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 16 Sep 2021 22:37:45 +0200 |
parents | 41e50d658de0 |
children | 5ef7d51c2195 |
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 |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
4 @@ -1154,8 +1154,12 @@ |
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 |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
8 - (void)_rl_init_locale (); /* check current locale */ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
9 - |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
10 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
11 + (void)_rl_init_locale (); /* check current locale */ |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
12 +#if defined (__MINGW32__) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
13 + rl_reset_screen_size (); |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
14 +#endif |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
15 + } |
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 @@ -266,8 +271,10 @@ |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
45 case SIGQUIT: |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
46 #endif |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
47 |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
48 +#if defined (HAVE_POSIX_SIGNALS) |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
49 if (block_sig) |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
50 sigprocmask (SIG_BLOCK, &set, &oset); |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
51 +#endif |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
52 |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
53 rl_echo_signal_char (sig); |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
54 rl_cleanup_after_signal (); |
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
55 @@ -532,6 +539,21 @@ |
5031
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 #endif /* SIGWINCH */ |
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 +#if defined (__MINGW32__) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
60 + 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
|
61 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
62 + DWORD mode; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
63 + HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE); |
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 + if (GetConsoleMode (hStdIn, &mode)) |
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 + mode |= ENABLE_WINDOW_INPUT; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
68 + if (SetConsoleMode (hStdIn, mode)) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
69 + sigwinch_set_flag = 1; |
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 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
72 +#endif |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
73 + |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
74 return 0; |
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 |
5607
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5031
diff
changeset
|
77 @@ -582,6 +604,20 @@ |
5031
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
78 sigwinch_set_flag = 0; |
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 #endif |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
81 +#if defined (__MINGW32__) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
82 + 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
|
83 + { |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
84 + DWORD mode; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
85 + HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE); |
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 + if (GetConsoleMode (hStdIn, &mode)) |
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 + mode &= ~ENABLE_WINDOW_INPUT; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
90 + if (SetConsoleMode (hStdIn, mode)) |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
91 + sigwinch_set_flag = 0; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
92 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
93 + } |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
94 +#endif |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
95 |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
96 return 0; |
5049ab5e66f6
Re-add readline patches to work with readline 8 (Bug #55957)
John Donoghue
parents:
diff
changeset
|
97 } |