1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
|
Origin: https://savannah.gnu.org/bugs/download.php?file_id=52911
Author: Hayaki Saito <user@zuse.jp>
Date: Fri, 15 Mar 2013 16:23:54 +0100
Description: Support "bracket paste mode" and cursor-style manipulation
Bug: https://savannah.gnu.org/bugs/?62102
Bug-Debian: https://bugs.debian.org/1019576
Hello, lists
This patch adds the following two features to GNU Screen:
- Bracket Paste Mode (DECSET/DECRST 2004)
- DECSCUSR(cursor style manipulation)
By using "bracketed paste mode", the pasted text is bracketed with special
control sequences.
DECSCUSR can change cursor style and shape (blink/steady, block/Vertical
bar/horizontal bar).
ref: http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
These days, many of xterm-compatible terminal emulators support these features.
But current GNU Screen blocks them.
This patch manages states of "Bracket Paste Mode (DECSET/DECRST 2004)" and
DECSCUSR(cursor style manipulation), for each of screens.
Please check it.
Hayaki Saito <user@zuse.jp>
https://lists.gnu.org/archive/html/screen-devel/2013-03/msg00000.html
---
ansi.c | 12 ++++++++++++
display.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
display.h | 4 ++++
extern.h | 4 ++++
layer.c | 26 ++++++++++++++++++++++++++
window.c | 2 ++
window.h | 2 ++
7 files changed, 100 insertions(+)
--- a/ansi.c 2022-09-03 21:07:05.736418077 -0400
+++ b/ansi.c 2022-09-03 21:07:05.728418022 -0400
@@ -194,6 +194,8 @@
p->w_origin = 0;
p->w_insert = 0;
p->w_revvid = 0;
+ p->w_bracketed = 0;
+ p->w_cursorstyle = 0;
p->w_mouse = 0;
p->w_curinv = 0;
p->w_curvvis = 0;
@@ -1346,6 +1348,12 @@
break;
}
break;
+ case ' ':
+ if (c == 'q') {
+ curr->w_cursorstyle = a1;
+ LCursorStyle(&curr->w_layer, curr->w_cursorstyle);
+ }
+ break;
case '?':
for (a2 = 0; a2 < curr->w_NumArgs; a2++)
{
@@ -1477,6 +1485,10 @@
LExtMouseMode(&curr->w_layer, curr->w_extmouse);
break;
/* case 1015: UXRVT mouse mode rejected */
+ case 2004: /* bracketed paste mode */
+ curr->w_bracketed = i ? 1 : 0;
+ LBracketedPasteMode(&curr->w_layer, curr->w_bracketed);
+ break;
}
}
break;
--- a/display.c 2022-09-03 21:07:05.736418077 -0400
+++ b/display.c 2022-09-03 21:07:05.732418049 -0400
@@ -130,6 +130,8 @@
int defobuflimit = OBUF_MAX;
int defnonblock = -1;
int defmousetrack = 0;
+int defbracketed = 0;
+int defcursorstyle = 0;
#ifdef AUTO_NUKE
int defautonuke = 0;
#endif
@@ -192,6 +194,8 @@
LCursorkeysMode(flayer, 0);
LCursorVisibility(flayer, 0);
LMouseMode(flayer, 0);
+ LBracketedPasteMode(flayer, 0);
+ LCursorStyle(flayer, 0);
LSetRendition(flayer, &mchar_null);
LSetFlow(flayer, nwin_default.flowflag & FLOW_NOW);
}
@@ -323,6 +327,8 @@
D_user = *u;
D_processinput = ProcessInput;
D_mousetrack = defmousetrack;
+ D_bracketed = defbracketed;
+ D_cursorstyle = defcursorstyle;
return display;
}
@@ -497,6 +503,8 @@
D_mousetrack = 0;
MouseMode(0);
ExtMouseMode(0);
+ BracketedPasteMode(0);
+ CursorStyle(0);
SetRendition(&mchar_null);
SetFlow(FLOW_NOW);
#ifdef MAPKEYS
@@ -871,6 +879,42 @@
}
}
+void BracketedPasteMode(int mode)
+{
+ if (!display)
+ return;
+
+ if (D_bracketed != mode) {
+ if (!D_CXT)
+ return;
+ if (D_bracketed) {
+ AddStr("\033[?2004l");
+ }
+ if (mode) {
+ AddStr("\033[?2004h");
+ }
+ D_bracketed = mode;
+ }
+}
+
+void CursorStyle(int mode)
+{
+ char buf[32];
+
+ if (!display)
+ return;
+
+ if (D_cursorstyle != mode) {
+ if (!D_CXT)
+ return;
+ if (mode < 0)
+ return;
+ sprintf(buf, "\033[%d q", mode);
+ AddStr(buf);
+ D_cursorstyle = mode;
+ }
+}
+
static int StrCost;
/* ARGSUSED */
@@ -1297,6 +1341,8 @@
CursorVisibility(0);
MouseMode(0);
ExtMouseMode(0);
+ BracketedPasteMode(0);
+ CursorStyle(0);
SetRendition(&mchar_null);
SetFlow(FLOW_NOW);
@@ -3198,6 +3244,8 @@
int oldcurvis = D_curvis;
int oldmouse = D_mouse;
int oldextmouse = D_extmouse;
+ int oldbracketed = D_bracketed;
+ int oldcursorstyle = D_cursorstyle;
oldrend = D_rend;
len = D_obufp - D_obuf;
@@ -3261,6 +3309,8 @@
CursorVisibility(oldcurvis);
MouseMode(oldmouse);
ExtMouseMode(oldextmouse);
+ BracketedPasteMode(oldbracketed);
+ CursorStyle(oldcursorstyle);
if (D_CWS)
{
debug("ResizeDisplay: using WS\n");
--- a/display.h 2022-09-03 21:07:05.736418077 -0400
+++ b/display.h 2022-09-03 21:07:05.732418049 -0400
@@ -111,6 +111,8 @@
struct mouse_parse d_mouse_parse; /* state of mouse code parsing */
int d_mousetrack; /* set when user wants to use mouse even when the window
does not */
+ int d_bracketed; /* bracketed paste mode */
+ int d_cursorstyle; /* cursor style */
#ifdef RXVT_OSC
int d_xtermosc[5]; /* osc used */
#endif
@@ -198,6 +200,8 @@
#define D_user DISPLAY(d_user)
#define D_username (DISPLAY(d_user) ? DISPLAY(d_user)->u_name : 0)
+#define D_bracketed DISPLAY(d_bracketed)
+#define D_cursorstyle DISPLAY(d_cursorstyle)
#define D_canvas DISPLAY(d_canvas)
#define D_cvlist DISPLAY(d_cvlist)
#define D_layout DISPLAY(d_layout)
--- a/extern.h 2022-09-03 21:07:05.736418077 -0400
+++ b/extern.h 2022-09-03 21:07:05.732418049 -0400
@@ -291,6 +291,8 @@
extern void CursorVisibility __P((int));
extern void MouseMode __P((int));
extern void ExtMouseMode __P((int));
+extern void BracketedPasteMode (int);
+extern void CursorStyle (int);
extern void SetFont __P((int));
extern void SetAttr __P((int));
extern void SetColor __P((int, int));
@@ -454,6 +456,8 @@
extern void LCursorkeysMode __P((struct layer *, int));
extern void LMouseMode __P((struct layer *, int));
extern void LExtMouseMode __P((struct layer *, int));
+extern void LBracketedPasteMode __P((struct layer *, int));
+extern void LCursorStyle __P((struct layer *, int));
#if defined(USEVARARGS)
extern void LMsg __P((int, const char *, ...)) __attribute__((format(printf, 2, 3)));
#else
--- a/layer.c 2022-09-03 21:07:05.736418077 -0400
+++ b/layer.c 2022-09-03 21:07:05.732418049 -0400
@@ -840,6 +840,32 @@
}
}
+void LBracketedPasteMode(struct layer *l, int on)
+{
+ struct canvas *cv;
+ for (cv = l->l_cvlist; cv; cv = cv->c_lnext) {
+ display = cv->c_display;
+ if (D_blocked)
+ continue;
+ if (cv != D_forecv)
+ continue;
+ BracketedPasteMode(on);
+ }
+}
+
+void LCursorStyle(struct layer *l, int style)
+{
+ struct canvas *cv;
+ for (cv = l->l_cvlist; cv; cv = cv->c_lnext) {
+ display = cv->c_display;
+ if (D_blocked)
+ continue;
+ if (cv != D_forecv)
+ continue;
+ CursorStyle(style);
+ }
+}
+
void LClearAll(struct layer *l, int uself)
{
LClearArea(l, 0, 0, l->l_width - 1, l->l_height - 1, 0, uself);
--- a/window.c 2022-09-03 21:07:05.736418077 -0400
+++ b/window.c 2022-09-03 21:07:05.732418049 -0400
@@ -509,6 +509,8 @@
CursorVisibility(fore->w_curinv ? -1 : fore->w_curvvis);
MouseMode(fore->w_mouse);
ExtMouseMode(fore->w_extmouse);
+ BracketedPasteMode(fore->w_bracketed);
+ CursorStyle(fore->w_cursorstyle);
}
}
--- a/window.h 2022-09-03 21:07:05.736418077 -0400
+++ b/window.h 2022-09-03 21:07:05.732418049 -0400
@@ -241,6 +241,8 @@
#endif
int w_mouse; /* mouse mode 0,9,1000 */
int w_extmouse; /* extended mouse mode 0,1006 */
+ int w_bracketed; /* bracketed paste mode */
+ int w_cursorstyle; /* cursor style */
#ifdef HAVE_BRAILLE
int w_bd_x, w_bd_y; /* Braille cursor position */
#endif
|
