ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.34 by pcg, Tue Feb 24 00:44:23 2004 UTC vs.
Revision 1.470 by root, Mon Aug 8 10:09:49 2022 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
6 * 8 *
7 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
10 * (at your option) any later version. 12 * (at your option) any later version.
11 * 13 *
12 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
16 * 18 *
17 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 20 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *--------------------------------------------------------------------------*/ 22 *--------------------------------------------------------------------------*/
23
21/* 24/*
22 * We handle _all_ screen updates and selections 25 * This file handles _all_ screen updates and selections
23 */ 26 */
24 27
25#include "../config.h" /* NECESSARY */ 28#include "../config.h" /* NECESSARY */
26#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
28#include "screen.intpro" /* PROTOS for internal routines */ 30#include "rxvtperl.h" /* NECESSARY */
29 31
30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31
32#include <stdint.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK!! 34static inline void
36
37inline void fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
43/* ------------------------------------------------------------------------- */ 41/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384
45#define TABSIZE 8 /* default tab size */ 42#define TABSIZE 8 /* default tab size */
46 43
47/* ------------------------------------------------------------------------- * 44/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 45 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 46 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 47#define ZERO_SCROLLBACK() \
51 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 48 if (option (Opt_scrollTtyOutput)) \
52 TermWin.view_start = 0 49 view_start = 0
53#define CLEAR_SELECTION() \ 50#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 51 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 52 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 53#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
58 = selection.mark.row = selection.mark.col \ 55 = selection.mark.row = selection.mark.col \
59 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
60 57
61#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 58#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
62 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 59 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
63#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 60#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
64 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 61 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
65#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 62#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
66 (((A) == (C)) && ((B) > (D))) 63 (((A) == (C)) && ((B) > (D)))
67#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 64#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) >= (D))) 65 (((A) == (C)) && ((B) >= (D)))
69#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 66#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
70 (((A) == (C)) && ((B) < (D))) 67 (((A) == (C)) && ((B) < (D)))
71#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 68#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) <= (D))) 69 (((A) == (C)) && ((B) <= (D)))
73 70
74/* these must be row_col_t */ 71/* these must be row_col_t */
75#define ROWCOL_IS_AFTER(X, Y) \ 72#define ROWCOL_IS_AFTER(X, Y) \
76 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 73 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
77#define ROWCOL_IS_BEFORE(X, Y) \ 74#define ROWCOL_IS_BEFORE(X, Y) \
78 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 75 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IN_ROW_AFTER(X, Y) \ 76#define ROWCOL_IN_ROW_AFTER(X, Y) \
80 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 77 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 78#define ROWCOL_IN_ROW_BEFORE(X, Y) \
82 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 79 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 80#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 81 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 82#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 84
88/* 85/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 86 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 87 */
93#define drawBuffer TermWin.vt
94
95#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \
97 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \
99 (unsigned int)Height2Pixel (num), False)
100
101#define CLEAR_CHARS(x, y, num) \ 88#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 89 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 90 XClearArea (dpy, vt, x, y, \
104 (unsigned int)Width2Pixel (num), \ 91 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 92 (unsigned int)Height2Pixel (1), False)
106
107#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
109 TermWin.int_bwidth, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \
111 (unsigned int)Height2Pixel (num))
112 93
113/* ------------------------------------------------------------------------- * 94/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
97
116/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
117void 99void
118rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept
119{ 101{
120 efs &= ~RS_baseattrMask; 102 if (!l.valid ())
121 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 103 {
104 l.alloc ();
105 col = 0;
106 width = ncol;
107 }
108
109 l.touch ();
110
111 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
112 efs = SET_FONT (efs, FONTSET (efs)->find_space_font ());
113
114 text_t *et = l.t + col;
115 rend_t *er = l.r + col;
122 116
123 while (width--) 117 while (width--)
124 { 118 {
125 *et++ = ' '; 119 *et++ = ' ';
126 *er++ = efs; 120 *er++ = efs;
… …
128} 122}
129 123
130/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
131/* Fill a full line with blanks - make sure it is allocated first */ 125/* Fill a full line with blanks - make sure it is allocated first */
132void 126void
133rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 127rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept
134{ 128{
135#ifdef DEBUG_STRICT 129 scr_blank_line (l, 0, ncol, efs);
136 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
137#endif
138 if (tp[row] == NULL)
139 {
140 tp[row] = (text_t *)talloc->alloc ();
141 rp[row] = (rend_t *)ralloc->alloc ();
142 }
143 130
144 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); 131 l.l = 0;
132 l.f = 0;
133}
134
135// nuke a single wide character at the given column
136void
137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
138{
139 // find begin
140 while (col > 0 && l.t[col] == NOCHAR)
141 col--;
142
143 rend_t rend = l.r[col] & ~RS_baseattrMask;
144 rend = SET_FONT (rend, FONTSET (rend)->find_space_font ());
145
146 l.touch ();
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
145} 164}
146 165
147/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
148 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
149 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
169
150void 170void
171rxvt_term::scr_alloc () noexcept
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
151rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
152{ 216{
153 unsigned int ncol, nrow, total_rows, prev_total_rows; 217#if ENABLE_OVERLAY
154 unsigned int p, q; 218 scr_overlay_off ();
155 int k; 219#endif
156 rend_t setrstyle;
157 220
158 D_SCREEN ((stderr, "rxvt_scr_reset ()"));
159
160 TermWin.view_start = 0; 221 view_start = 0;
161 num_scr = 0; 222 num_scr = 0;
162 223
163 if (TermWin.ncol == 0) 224 if (ncol == 0)
164 TermWin.ncol = 80; 225 ncol = 80;
165 226
166 if (TermWin.nrow == 0) 227 if (nrow == 0)
167 TermWin.nrow = 24; 228 nrow = 24;
168
169 ncol = TermWin.ncol;
170 nrow = TermWin.nrow;
171 229
172 if (ncol == prev_ncol && nrow == prev_nrow) 230 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 231 return;
174 232
233 // we need at least two lines for wrapping to work correctly
234 while (nrow + saveLines < 2)
235 {
236 //TODO//FIXME
237 saveLines++;
238 prev_nrow--;
239 top_row--;
240 }
241
175 want_refresh = 1; 242 want_refresh = 1;
176 243
244 int prev_total_rows = prev_nrow + saveLines;
177 total_rows = nrow + TermWin.saveLines; 245 total_rows = nrow + saveLines;
178 prev_total_rows = prev_nrow + TermWin.saveLines;
179 246
180 screen.tscroll = 0; 247 screen.tscroll = 0;
181 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
182 249
183 if (!talloc) 250 void *prev_chunk = chunk;
184 { 251 size_t prev_chunk_size = chunk_size;
185 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 252 line_t *prev_drawn_buf = drawn_buf;
186 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
258 if (!prev_row_buf)
187 } 259 {
260 top_row = 0;
261 term_start = 0;
188 262
189 if (prev_nrow == 0)
190 {
191 /*
192 * first time called so just malloc everything : don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */
195 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
196 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
197 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
198 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
199
200 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
201 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
202
203 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
204 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
205 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
206 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
207
208 for (p = 0; p < nrow; p++)
209 {
210 q = p + TermWin.saveLines;
211 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
213 screen.tlen[q] = swap.tlen[p] = 0;
214 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
215 }
216
217 MEMSET (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
218 TermWin.nscrolled = 0; /* no saved lines */
219 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
220 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
221 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
222 screen.charset = 0; 267 screen.charset = 0;
223 current_screen = PRIMARY; 268 current_screen = PRIMARY;
… …
235 selection.text = NULL; 280 selection.text = NULL;
236 selection.len = 0; 281 selection.len = 0;
237 selection.op = SELECTION_CLEAR; 282 selection.op = SELECTION_CLEAR;
238 selection.screen = PRIMARY; 283 selection.screen = PRIMARY;
239 selection.clicks = 0; 284 selection.clicks = 0;
240 CLEAR_ALL_SELECTION (); 285 selection.clip_text = NULL;
241 rvideo = 0; 286 selection.clip_len = 0;
242 } 287 }
243 else 288 else
244 { 289 {
245 /* 290 /*
246 * add or delete rows as appropriate 291 * add or delete rows as appropriate
247 */ 292 */
248 setrstyle = DEFAULT_RSTYLE;
249 293
250 if (nrow < prev_nrow) 294 int common_col = min (prev_ncol, ncol);
295
296 // resize swap_buf, blank drawn_buf
297 for (int row = min (nrow, prev_nrow); row--; )
298 {
299 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
300 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
301 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
302
303 copy_line (swap_buf [row], prev_swap_buf [row]);
251 { 304 }
252 /* delete rows */
253 k = min (TermWin.nscrolled, prev_nrow - nrow);
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
255 305
256 for (p = nrow; p < prev_nrow; p++) 306 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
307 int pend = MOD (term_start + top_row , prev_total_rows);
308 int q = total_rows; // rewrapped row
309
310#if ENABLE_FRILLS
311 if ((rewrap_always || top_row) && !rewrap_never)
312 {
313 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
314 // to come up with a lean and mean algorithm.
315 // TODO: maybe optimise when width didn't change
316
317 row_col_t ocur = screen.cur;
318 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
319
320 do
257 { 321 {
258 q = p + TermWin.saveLines; 322 p = MOD (p - 1, prev_total_rows);
259 if (screen.text[q]) 323 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
324 int plines = 1;
325 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
326
327 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
260 { 328 {
261#ifdef DEBUG_STRICT 329 p = MOD (p - 1, prev_total_rows);
262 assert (screen.rend[q]); 330
263#endif 331 plines++;
264 talloc->free (screen.text[q]); 332 llen += prev_ncol;
265 ralloc->free (screen.rend[q]);
266 } 333 }
267 if (swap.text[p]) 334
335 int qlines = max (0, (llen - 1) / ncol) + 1;
336
337 // drop partial lines completely
338 if (q < qlines)
339 break;
340
341 q -= qlines;
342
343 int lofs = 0;
344 line_t *qline;
345
346 // re-assemble the full line by destination lines
347 for (int qrow = q; qlines--; qrow++)
268 { 348 {
269#ifdef DEBUG_STRICT 349 qline = row_buf + qrow;
270 assert (swap.rend[p]); 350 qline->alloc (); // redundant with next line
271#endif 351 qline->l = ncol;
272 talloc->free (swap.text[p]); 352 qline->is_longer (1);
273 ralloc->free (swap.rend[p]); 353
354 int qcol = 0;
355
356 // see below for cursor adjustment rationale
357 if (p == ocur.row)
358 screen.cur.row = q - (total_rows - nrow);
359
360 // fill a single destination line
361 while (lofs < llen && qcol < ncol)
362 {
363 int prow = lofs / prev_ncol;
364 int pcol = lofs % prev_ncol;
365
366 prow = MOD (p + prow, prev_total_rows);
367
368 // we only adjust the cursor _row_ and put it into
369 // the topmost line of "long line" it was in, as
370 // this seems to upset applications/shells/readline
371 // least.
372 if (prow == ocur.row)
373 screen.cur.row = q - (total_rows - nrow);
374
375 line_t &pline = prev_row_buf [prow];
376
377 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
378
379 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
380 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
381
382 lofs += len;
383 qcol += len;
384 }
274 } 385 }
275#ifdef DEBUG_STRICT 386
276 assert (drawn_text[p] && drawn_rend[p]); 387 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
277#endif 388 qline->is_longer (0);
278 talloc->free (drawn_text[p]); 389 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
279 ralloc->free (drawn_rend[p]);
280 } 390 }
391 while (p != pend && q > 0);
281 392
282 /* we have fewer rows so fix up cursor position */ 393 term_start = total_rows - nrow;
283 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 394 top_row = q - term_start;
284 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
285 395
286 scr_reset_realloc (); /* realloc _last_ */ 396 // make sure all terminal lines exist
287 } 397 while (top_row > 0)
288 else if (nrow > prev_nrow) 398 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
289 { 399 }
290 /* add rows */ 400 else
291 scr_reset_realloc (); /* realloc _first_ */ 401#endif
292 402 {
293 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 403 // wing, instead of wrap
294 404 do
295 k = min (TermWin.nscrolled, nrow - prev_nrow);
296
297 for (p = prev_total_rows; p < total_rows; p++)
298 { 405 {
299 screen.tlen[p] = 0; 406 p = MOD (p - 1, prev_total_rows);
300 screen.text[p] = NULL; 407 q--;
301 screen.rend[p] = NULL; 408
409 copy_line (row_buf [q], prev_row_buf [p]);
302 } 410 }
411 while (p != pend);
303 412
304 for (p = prev_total_rows; p < total_rows - k; p++) 413 screen.cur.row += nrow - prev_nrow;
305 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); 414 term_start = total_rows - nrow;
306
307 for (p = prev_nrow; p < nrow; p++)
308 {
309 swap.tlen[p] = 0;
310 swap.text[p] = NULL;
311 swap.rend[p] = NULL;
312 drawn_text[p] = NULL;
313 drawn_rend[p] = NULL;
314 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
315 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
316 }
317
318 if (k > 0)
319 {
320 scr_scroll_text (0, (int)nrow - 1, -k, 1);
321 screen.cur.row += k;
322 screen.s_cur.row += k;
323 TermWin.nscrolled -= k;
324 }
325#ifdef DEBUG_STRICT
326 assert (screen.cur.row < TermWin.nrow);
327 assert (swap.cur.row < TermWin.nrow);
328#else /* drive with your eyes closed */
329
330 MIN_IT (screen.cur.row, nrow - 1);
331 MIN_IT (swap.cur.row, nrow - 1);
332#endif
333 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
334 }
335
336 /* resize columns */
337 if (ncol != prev_ncol)
338 { 415 }
339 int common = min (prev_ncol, ncol);
340 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
341 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
342 416
343 for (p = 0; p < total_rows; p++) 417 clamp_it (screen.cur.row, 0, nrow - 1);
344 { 418 clamp_it (screen.cur.col, 0, ncol - 1);
345 if (screen.text[p]) 419 }
346 {
347 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t;
348 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r;
349 420
350 MIN_IT (screen.tlen[p], (int16_t)ncol); 421 // ensure drawn_buf, swap_buf and terminal rows are all initialized
422 for (int row = nrow; row--; )
423 {
424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
427 }
351 428
352 if (ncol > prev_ncol) 429 chunk_free (prev_chunk, prev_chunk_size);
353 scr_blank_line (& (screen.text[p][prev_ncol]),
354 & (screen.rend[p][prev_ncol]),
355 ncol - prev_ncol,
356 setrstyle);
357 }
358 }
359 430
360 for (p = 0; p < nrow; p++)
361 {
362 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t;
363 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r;
364
365 if (ncol > prev_ncol)
366 scr_blank_line (& (drawn_text[p][prev_ncol]),
367 & (drawn_rend[p][prev_ncol]),
368 ncol - prev_ncol, setrstyle);
369
370 if (swap.text[p])
371 {
372 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t;
373 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r;
374
375 MIN_IT (swap.tlen[p], (int16_t)ncol);
376
377 if (ncol > prev_ncol)
378 scr_blank_line (& (swap.text[p][prev_ncol]),
379 & (swap.rend[p][prev_ncol]),
380 ncol - prev_ncol, setrstyle);
381 }
382
383 }
384
385 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
386 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
387
388 delete talloc; talloc = ta;
389 delete ralloc; ralloc = ra;
390 }
391
392 if (tabs)
393 free (tabs); 431 free (tabs);
394 } 432 tabs = (char *)rxvt_malloc (ncol);
433
434 for (int col = ncol; col--; )
435 tabs [col] = col % TABSIZE == 0;
436
437 CLEAR_ALL_SELECTION ();
395 438
396 prev_nrow = nrow; 439 prev_nrow = nrow;
397 prev_ncol = ncol; 440 prev_ncol = ncol;
398 441
399 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
400
401 for (p = 0; p < ncol; p++)
402 tabs[p] = (p % TABSIZE == 0) ? 1 : 0;
403
404 tt_winch (); 442 tt_winch ();
405}
406 443
407void 444 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
408rxvt_term::scr_reset_realloc ()
409{
410 uint16_t total_rows, nrow;
411
412 nrow = TermWin.nrow;
413 total_rows = nrow + TermWin.saveLines;
414 /* *INDENT-OFF* */
415 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
416 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
417 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
418 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
419
420 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
421 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
422
423 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
424 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
425 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
426 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
427 /* *INDENT-ON* */
428} 445}
429 446
430/* ------------------------------------------------------------------------- */ 447void ecb_cold
431/*
432 * Free everything. That way malloc debugging can find leakage.
433 */
434void
435rxvt_term::scr_release () 448rxvt_term::scr_release () noexcept
436{ 449{
437 uint16_t total_rows; 450 chunk_free (chunk, chunk_size);
438 int i; 451 chunk = 0;
452 row_buf = 0;
439 453
440 total_rows = TermWin.nrow + TermWin.saveLines;
441
442#ifdef DEBUG_STRICT
443 for (i = 0; i < total_rows; i++)
444 {
445 if (screen.text[i])
446 /* then so is screen.rend[i] */
447 assert (screen.rend[i]);
448 }
449#endif
450
451 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0;
453
454 free (screen.text);
455 free (screen.tlen);
456 free (screen.rend);
457 free (drawn_text);
458 free (drawn_rend);
459 free (swap.text);
460 free (swap.tlen);
461 free (swap.rend);
462 free (buf_text);
463 free (buf_rend);
464 free (tabs); 454 free (tabs);
465
466 /* NULL these so if anything tries to use them, we'll know about it */
467 screen.text = drawn_text = swap.text = NULL;
468 screen.rend = drawn_rend = swap.rend = NULL;
469 screen.tlen = swap.tlen = NULL;
470 buf_text = NULL;
471 buf_rend = NULL;
472 tabs = NULL; 455 tabs = 0;
473} 456}
474 457
475/* ------------------------------------------------------------------------- */ 458/* ------------------------------------------------------------------------- */
476/* 459/*
477 * Hard reset 460 * Hard/Soft reset
478 */ 461 */
479void 462void ecb_cold
480rxvt_term::scr_poweron () 463rxvt_term::scr_poweron ()
481{ 464{
482 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
483
484 scr_release (); 465 scr_release ();
466
485 prev_nrow = prev_ncol = 0; 467 prev_nrow = prev_ncol = 0;
468 rvideo_mode = false;
469 scr_soft_reset ();
486 scr_reset (); 470 scr_reset ();
487 471
488 scr_clear (); 472 scr_clear (true);
489 scr_refresh (SLOW_REFRESH); 473 scr_refresh ();
474}
475
476void ecb_cold
477rxvt_term::scr_soft_reset () noexcept
478{
479 /* only affects modes, nothing drastic such as clearing the screen */
480#if ENABLE_OVERLAY
481 scr_overlay_off ();
482#endif
483
484 if (current_screen != PRIMARY)
485 scr_swap_screen ();
486
487 scr_scroll_region (0, MAX_ROWS - 1);
488 scr_rendition (0, ~RS_None);
489 scr_insert_mode (0);
490} 490}
491 491
492/* ------------------------------------------------------------------------- * 492/* ------------------------------------------------------------------------- *
493 * PROCESS SCREEN COMMANDS * 493 * PROCESS SCREEN COMMANDS *
494 * ------------------------------------------------------------------------- */ 494 * ------------------------------------------------------------------------- */
… …
496 * Save and Restore cursor 496 * Save and Restore cursor
497 * XTERM_SEQ: Save cursor : ESC 7 497 * XTERM_SEQ: Save cursor : ESC 7
498 * XTERM_SEQ: Restore cursor: ESC 8 498 * XTERM_SEQ: Restore cursor: ESC 8
499 */ 499 */
500void 500void
501rxvt_term::scr_cursor (int mode) 501rxvt_term::scr_cursor (cursor_mode mode) noexcept
502{ 502{
503 screen_t *s; 503 screen_t *s;
504
505 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
506 504
507#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 505#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
508 if (current_screen == SECONDARY) 506 if (current_screen == SECONDARY)
509 s = & (swap); 507 s = &swap;
510 else 508 else
511#endif 509#endif
512 s = & (screen); 510 s = &screen;
511
513 switch (mode) 512 switch (mode)
514 { 513 {
515 case SAVE: 514 case SAVE:
516 s->s_cur.row = s->cur.row; 515 s->s_cur.row = screen.cur.row;
517 s->s_cur.col = s->cur.col; 516 s->s_cur.col = screen.cur.col;
518 s->s_rstyle = rstyle; 517 s->s_rstyle = rstyle;
519 s->s_charset = s->charset; 518 s->s_charset = screen.charset;
520 s->s_charset_char = charsets[s->charset]; 519 s->s_charset_char = charsets[screen.charset];
521 break; 520 break;
521
522 case RESTORE: 522 case RESTORE:
523 want_refresh = 1; 523 want_refresh = 1;
524 s->cur.row = s->s_cur.row; 524 screen.cur.row = s->s_cur.row;
525 s->cur.col = s->s_cur.col; 525 screen.cur.col = s->s_cur.col;
526 s->flags &= ~Screen_WrapNext; 526 screen.flags &= ~Screen_WrapNext;
527 rstyle = s->s_rstyle; 527 rstyle = s->s_rstyle;
528 s->charset = s->s_charset; 528 screen.charset = s->s_charset;
529 charsets[s->charset] = s->s_charset_char; 529 charsets[screen.charset] = s->s_charset_char;
530 set_font_style (); 530 set_font_style ();
531 break; 531 break;
532 } 532 }
533
533 /* boundary check in case screen size changed between SAVE and RESTORE */ 534 /* boundary check in case screen size changed between SAVE and RESTORE */
534 MIN_IT (s->cur.row, TermWin.nrow - 1); 535 min_it (s->cur.row, nrow - 1);
535 MIN_IT (s->cur.col, TermWin.ncol - 1); 536 min_it (s->cur.col, ncol - 1);
536#ifdef DEBUG_STRICT
537 assert (s->cur.row >= 0); 537 assert (s->cur.row >= 0);
538 assert (s->cur.col >= 0); 538 assert (s->cur.col >= 0);
539#else /* drive with your eyes closed */ 539}
540 MAX_IT (s->cur.row, 0); 540
541 MAX_IT (s->cur.col, 0); 541void
542#endif 542rxvt_term::scr_swap_screen () noexcept
543{
544 if (!option (Opt_secondaryScreen))
545 return;
546
547 for (int i = prev_nrow; i--; )
548 ::swap (ROW(i), swap_buf [i]);
549
550 ::swap (screen.cur, swap.cur);
551
552 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
553 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
543} 554}
544 555
545/* ------------------------------------------------------------------------- */ 556/* ------------------------------------------------------------------------- */
546/* 557/*
547 * Swap between primary and secondary screens 558 * Swap between primary and secondary screens
548 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 559 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
549 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 560 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
550 */ 561 */
551int 562void
552rxvt_term::scr_change_screen (int scrn) 563rxvt_term::scr_change_screen (int scrn)
553{ 564{
554 int i; 565 if (scrn == current_screen)
566 return;
567
568 want_refresh = 1;
569 view_start = 0;
570
571 /* check for boundary cross */
572 row_col_t pos;
573 pos.row = pos.col = 0;
574 if (ROWCOL_IS_BEFORE (selection.beg, pos)
575 && ROWCOL_IS_AFTER (selection.end, pos))
576 CLEAR_SELECTION ();
577
578 current_screen = scrn;
579
555#if NSCREENS 580#if NSCREENS
556 int offset; 581 if (option (Opt_secondaryScreen))
557#endif 582 {
558
559 want_refresh = 1;
560
561 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
562
563 TermWin.view_start = 0;
564
565 if (current_screen == scrn)
566 return current_screen;
567
568 selection_check (2); /* check for boundary cross */
569
570 SWAP_IT (current_screen, scrn, int);
571#if NSCREENS
572 num_scr = 0; 583 num_scr = 0;
573 offset = TermWin.saveLines; 584
574 for (i = prev_nrow; i--;) 585 scr_swap_screen ();
575 { 586
576 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 587 ::swap (screen.charset, swap.charset);
577 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 588 ::swap (screen.flags, swap.flags);
578 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
579 }
580 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
581 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
582# ifdef DEBUG_STRICT
583 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
584 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
585# else /* drive with your eyes closed */
586 MAX_IT (screen.cur.row, 0);
587 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
588 MAX_IT (screen.cur.col, 0);
589 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
590# endif
591 SWAP_IT (screen.charset, swap.charset, int16_t);
592 SWAP_IT (screen.flags, swap.flags, int);
593 screen.flags |= Screen_VisibleCursor; 589 screen.flags |= Screen_VisibleCursor;
594 swap.flags |= Screen_VisibleCursor; 590 swap.flags |= Screen_VisibleCursor;
595#else 591 }
596# ifdef SCROLL_ON_NO_SECONDARY 592 else
597 if (current_screen == PRIMARY) 593#endif
594 if (option (Opt_secondaryScroll))
598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 595 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
599# endif 596}
600#endif 597
601 return scrn; 598// clear WrapNext indicator, solidifying position on next line
599void
600rxvt_term::scr_do_wrap () noexcept
601{
602 if (!(screen.flags & Screen_WrapNext))
603 return;
604
605 screen.flags &= ~Screen_WrapNext;
606
607 screen.cur.col = 0;
608
609 if (screen.cur.row == screen.bscroll)
610 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
611 else if (screen.cur.row < nrow - 1)
612 screen.cur.row++;
602} 613}
603 614
604/* ------------------------------------------------------------------------- */ 615/* ------------------------------------------------------------------------- */
605/* 616/*
606 * Change the colour for following text 617 * Change the colour for following text
607 */ 618 */
608void 619void
609rxvt_term::scr_color (unsigned int color, int fgbg) 620rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
610{ 621{
611 color &= RS_fgMask; 622 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
623 color = fgbg;
624
612 if (fgbg == Color_fg) 625 if (fgbg == Color_fg)
613 rstyle = SET_FGCOLOR (rstyle, color); 626 rstyle = SET_FGCOLOR (rstyle, color);
614 else 627 else
615 rstyle = SET_BGCOLOR (rstyle, color); 628 rstyle = SET_BGCOLOR (rstyle, color);
616} 629}
… …
618/* ------------------------------------------------------------------------- */ 631/* ------------------------------------------------------------------------- */
619/* 632/*
620 * Change the rendition style for following text 633 * Change the rendition style for following text
621 */ 634 */
622void 635void
623rxvt_term::scr_rendition (int set, int style) 636rxvt_term::scr_rendition (int set, int style) noexcept
624 { 637{
625 if (set) 638 if (set)
626 rstyle |= style; 639 rstyle |= style;
627 else if (style == ~RS_None) 640 else if (style == ~RS_None)
628 rstyle = DEFAULT_RSTYLE; 641 rstyle = DEFAULT_RSTYLE;
629 else 642 else
630 rstyle &= ~style; 643 rstyle &= ~style;
631 } 644}
632 645
633/* ------------------------------------------------------------------------- */ 646/* ------------------------------------------------------------------------- */
634/* 647/*
635 * Scroll text between <row1> and <row2> inclusive, by <count> lines 648 * Scroll text between <row1> and <row2> inclusive, by <count> lines
636 * count positive ==> scroll up 649 * count positive ==> scroll up
637 * count negative ==> scroll down 650 * count negative ==> scroll down
638 * spec == 0 for normal routines
639 */ 651 */
640int 652int ecb_hot
641rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 653rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
642{ 654{
643 int i, j;
644 long nscrolled;
645
646 if (count == 0 || (row1 > row2)) 655 if (count == 0 || (row1 > row2))
647 return 0; 656 return 0;
648 657
649 want_refresh = 1; 658 want_refresh = 1;
650 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 659 num_scr += count;
651 660
652 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 661 if (count > 0
662 && row1 == 0
663 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
664 {
665 min_it (count, total_rows - (nrow - (row2 + 1)));
666
667 top_row = max (top_row - count, -saveLines);
668
669 // sever bottommost line
653 { 670 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 671 line_t &l = ROW(row2);
655 672 l.is_longer (0);
656 if (nscrolled > (long)TermWin.saveLines) 673 l.touch ();
657 TermWin.nscrolled = TermWin.saveLines;
658 else
659 TermWin.nscrolled = (uint16_t)nscrolled;
660
661 if ((Options & Opt_scrollWithBuffer)
662 && TermWin.view_start != 0
663 && TermWin.view_start != TermWin.saveLines)
664 scr_page (UP, count);
665 } 674 }
666 else if (!spec)
667 row1 += TermWin.saveLines;
668 675
669 row2 += TermWin.saveLines; 676 // scroll everything up 'count' lines
677 term_start = (term_start + count) % total_rows;
670 678
679 // now copy lines below the scroll region bottom to the
680 // bottom of the screen again, so they look as if they
681 // hadn't moved.
682 for (int i = nrow; --i > row2; )
683 {
684 line_t &l1 = ROW(i - count);
685 line_t &l2 = ROW(i);
686
687 ::swap (l1, l2);
688 l2.touch ();
689 }
690
691 // erase newly scrolled-in lines
692 for (int i = count; i--; )
693 {
694 line_t &l = ROW(row2 - i);
695
696 // optimise if already cleared, can be significant on slow machines
697 // could be rolled into scr_blank_screen_mem
698 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
699 {
700 scr_blank_line (l, 0, l.l, rstyle);
701 l.l = 0;
702 l.f = 0;
703 }
704 else
705 scr_blank_screen_mem (l, rstyle);
706 }
707
708 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 709 if (selection.op && current_screen == selection.screen
672 { 710 && selection.beg.row <= row2)
673 i = selection.beg.row + TermWin.saveLines;
674 j = selection.end.row + TermWin.saveLines;
675 if ((i < row1 && j > row1)
676 || (i < row2 && j > row2)
677 || (i - count < row1 && i >= row1)
678 || (i - count > row2 && i <= row2)
679 || (j - count < row1 && j >= row1)
680 || (j - count > row2 && j <= row2))
681 {
682 CLEAR_ALL_SELECTION ();
683 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
684 } 711 {
685 else if (j >= row1 && j <= row2)
686 {
687 /* move selected region too */
688 selection.beg.row -= count; 712 selection.beg.row -= count;
689 selection.end.row -= count; 713 selection.end.row -= count;
690 selection.mark.row -= count; 714 selection.mark.row -= count;
691 }
692 }
693 715
694 selection_check (0); /* _after_ TermWin.nscrolled update */ 716 selection_check (0);
695
696 num_scr += count;
697 j = count;
698
699 if (count < 0)
700 count = -count;
701
702 i = row2 - row1 + 1;
703 MIN_IT (count, i);
704
705 if (j > 0)
706 {
707 /* A: scroll up */
708
709 /* A1: Copy lines that will get clobbered by the rotation */
710 for (i = 0, j = row1; i < count; i++, j++)
711 { 717 }
712 buf_text[i] = screen.text[j]; 718
713 buf_rend[i] = screen.rend[j]; 719 // finally move the view window, if desired
720 if (option (Opt_scrollWithBuffer)
721 && view_start != 0
722 && view_start != -saveLines)
723 scr_page (count);
724
725 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
726 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
727 }
728 else
729 {
730 if (selection.op && current_screen == selection.screen)
714 } 731 {
715 /* A2: Rotate lines */ 732 if ((selection.beg.row < row1 && selection.end.row > row1)
716 for (j = row1, i = j + count; i <= row2; i++, j++) 733 || (selection.beg.row < row2 && selection.end.row > row2)
734 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
735 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
736 || (selection.end.row - count < row1 && selection.end.row >= row1)
737 || (selection.end.row - count > row2 && selection.end.row <= row2))
738 {
739 CLEAR_ALL_SELECTION ();
740 selection.op = SELECTION_CLEAR;
741 }
742 else if (selection.end.row >= row1 && selection.end.row <= row2)
743 {
744 /* move selected region too */
745 selection.beg.row -= count;
746 selection.end.row -= count;
747 selection.mark.row -= count;
748
749 selection_check (0);
750 }
717 { 751 }
718 screen.tlen[j] = screen.tlen[i]; 752
719 screen.text[j] = screen.text[i]; 753 // use a simple and robust scrolling algorithm, this
720 screen.rend[j] = screen.rend[i]; 754 // part of scr_scroll_text is not time-critical.
755
756 // sever line above scroll region
757 if (row1)
721 } 758 {
722 j = row2 - count + 1, i = count; 759 line_t &l = ROW(row1 - 1);
723 } 760 l.is_longer (0);
724 else /* if (j < 0) */ 761 l.touch ();
725 {
726 /* B: scroll down */
727
728 /* B1: Copy lines that will get clobbered by the rotation */
729 for (i = 0, j = row2; i < count; i++, j--)
730 { 762 }
731 buf_text[i] = screen.text[j]; 763
732 buf_rend[i] = screen.rend[j]; 764 int rows = row2 - row1 + 1;
765
766 min_it (count, rows);
767
768 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
769
770 for (int row = 0; row < rows; row++)
733 } 771 {
734 /* B2: Rotate lines */ 772 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
735 for (j = row2, i = j - count; i >= row1; i--, j--) 773
774 if (!IN_RANGE_EXC (row + count, 0, rows))
775 scr_blank_screen_mem (temp_buf [row], rstyle);
736 { 776 }
737 screen.tlen[j] = screen.tlen[i]; 777
738 screen.text[j] = screen.text[i]; 778 for (int row = 0; row < rows; row++)
739 screen.rend[j] = screen.rend[i]; 779 ROW(row1 + row) = temp_buf [row];
780
781 // sever bottommost line
782 {
783 line_t &l = ROW(row2);
784 l.is_longer (0);
785 l.touch ();
740 } 786 }
741 j = row1, i = count;
742 count = -count;
743 }
744
745 /* C: Resurrect lines */
746 for (; i--; j++)
747 {
748 screen.tlen[j] = 0;
749 screen.text[j] = buf_text[i];
750 screen.rend[j] = buf_rend[i];
751
752 if (!spec) /* line length may not equal TermWin.ncol */
753 scr_blank_screen_mem (screen.text, screen.rend,
754 (unsigned int)j, rstyle);
755 } 787 }
756 788
757 return count; 789 return count;
758} 790}
759 791
760/* ------------------------------------------------------------------------- */ 792/* ------------------------------------------------------------------------- */
761/* 793/*
762 * Add text given in <str> of length <len> to screen struct 794 * Add text given in <str> of length <len> to screen struct
763 */ 795 */
764void 796void ecb_hot
765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
766{ 798{
767 unsigned char checksel, clearsel;
768 uint32_t c;
769 int i, row, last_col;
770 text_t *stp;
771 rend_t *srp;
772
773 if (len <= 0) /* sanity */ 799 if (len <= 0) /* sanity */
774 return; 800 return;
775 801
802 bool checksel;
803 unicode_t c;
804 int ncol = this->ncol;
805 const wchar_t *strend = str + len;
806
776 want_refresh = 1; 807 want_refresh = 1;
777 last_col = TermWin.ncol;
778
779 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
780 ZERO_SCROLLBACK (); 808 ZERO_SCROLLBACK ();
809
781 if (nlines > 0) 810 if (minlines > 0)
782 { 811 {
783 nlines += (screen.cur.row - screen.bscroll); 812 minlines += screen.cur.row - screen.bscroll;
813 min_it (minlines, screen.cur.row - top_row);
814
784 if ((nlines > 0) 815 if (minlines > 0
785 && (screen.tscroll == 0) 816 && screen.tscroll == 0
786 && (screen.bscroll == (TermWin.nrow - 1))) 817 && screen.bscroll == nrow - 1)
787 { 818 {
788 /* _at least_ this many lines need to be scrolled */ 819 /* _at least_ this many lines need to be scrolled */
789 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 820 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
790 screen.cur.row -= nlines; 821 screen.cur.row -= minlines;
791 } 822 }
792 } 823 }
793#ifdef DEBUG_STRICT 824
794 assert (screen.cur.col < last_col); 825 assert (screen.cur.col < ncol);
795 assert ((screen.cur.row < TermWin.nrow) 826 assert (screen.cur.row < nrow
796 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 827 && screen.cur.row >= top_row);
797#else /* drive with your eyes closed */ 828 int row = screen.cur.row;
798 MIN_IT (screen.cur.col, last_col - 1);
799 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
800 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
801#endif
802 row = screen.cur.row + TermWin.saveLines;
803 829
804 checksel = (selection.op 830 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
805 && current_screen == selection.screen) ? 1 : 0;
806 clearsel = 0;
807 831
808 stp = screen.text[row]; 832 line_t *line = &ROW(row);
809 srp = screen.rend[row];
810 833
811 for (i = 0; i < len;) 834 while (str < strend)
812 { 835 {
813 c = str[i++]; 836 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
814 switch (c) 837
838 if (ecb_unlikely (c < 0x20))
839 if (c == C0_LF)
815 { 840 {
816 case '\t': 841 max_it (line->l, screen.cur.col);
817 scr_tab (1); 842
843 screen.flags &= ~Screen_WrapNext;
844
845 if (screen.cur.row == screen.bscroll)
846 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
847 else if (screen.cur.row < (nrow - 1))
848 row = ++screen.cur.row;
849
850 line = &ROW(row); /* _must_ refresh */
818 continue; 851 continue;
819 case '\n': 852 }
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 853 else if (c == C0_CR)
821 MAX_IT (screen.tlen[row], screen.cur.col); 854 {
822 screen.flags &= ~Screen_WrapNext; 855 max_it (line->l, screen.cur.col);
823 if (screen.cur.row == screen.bscroll) 856
824 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
825 else if (screen.cur.row < (TermWin.nrow - 1))
826 row = (++screen.cur.row) + TermWin.saveLines;
827 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */
829 continue;
830 case '\r':
831 if (screen.tlen[row] != -1) /* XXX: think about this */
832 MAX_IT (screen.tlen[row], screen.cur.col);
833 screen.flags &= ~Screen_WrapNext; 857 screen.flags &= ~Screen_WrapNext;
834 screen.cur.col = 0; 858 screen.cur.col = 0;
835 continue; 859 continue;
836 default:
837 if (c == 127)
838 continue; /* yummmm..... */
839 break;
840 } 860 }
861 else if (c == C0_HT)
862 {
863 scr_tab (1, true);
864 continue;
865 }
841 866
867 if (ecb_unlikely (
842 if (checksel /* see if we're writing within selection */ 868 checksel /* see if we're writing within selection */
843 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 869 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 870 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
871 ))
845 { 872 {
846 checksel = 0; 873 checksel = 0;
847 clearsel = 1;
848 } 874 /*
849 if (screen.flags & Screen_WrapNext) 875 * If we wrote anywhere in the selected area, kill the selection
876 * XXX: should we kill the mark too? Possibly, but maybe that
877 * should be a similar check.
878 */
879 CLEAR_SELECTION ();
850 { 880 }
851 screen.tlen[row] = -1;
852 if (screen.cur.row == screen.bscroll)
853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
854 else if (screen.cur.row < (TermWin.nrow - 1))
855 row = (++screen.cur.row) + TermWin.saveLines;
856 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext;
860 }
861 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT);
863 881
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 882 if (ecb_unlikely (screen.flags & Screen_WrapNext))
865 switch (c)
866 { 883 {
867 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 884 scr_do_wrap ();
868 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 885
869 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 886 line->l = ncol;
870 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; 887 line->is_longer (1);
871 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 888
872 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 889 row = screen.cur.row;
873 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; 890 line = &ROW(row); /* _must_ refresh */
874 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; 891 }
875 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; 892
876 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 893 // some utf-8 decoders "decode" surrogate characters: let's fix this.
877 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 894 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
895 c = 0xfffd;
896
897 // rely on wcwidth to tell us the character width, do wcwidth before
898 // further replacements, as wcwidth might return -1 for the line
899 // drawing characters below as they might be invalid in the current
900 // locale.
901 int width = WCWIDTH (c);
902
903 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
904 {
905 // vt100 special graphics and line drawing
906 // 5f-7e standard vt100
907 // 40-5e rxvt extension for extra curses acs chars
908 static uint16_t vt100_0[62] = { // 41 .. 7e
909 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
910 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
911 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
912 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
913 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
914 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
915 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
916 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
878 } 917 };
879 918
880 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 919 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
881 // rely on wcwidth to tell us the character width, at least for non-ascii 920 {
882 int width = c <= 128 ? 1 : wcwidth (c); 921 c = vt100_0[c - 0x41];
922 width = 1; // vt100 line drawing characters are always single-width
923 }
924 }
883 925
884 // width -1 characters (e.g. combining chars) are ignored currently. 926 if (ecb_unlikely (screen.flags & Screen_Insert))
927 scr_insdel_chars (width, INSERT);
928
885 if (width > 0) 929 if (width != 0)
886 do 930 {
931#if !UNICODE_3
932 // trim characters we can't store directly :(
933 if (c >= 0x10000)
934# if ENABLE_COMBINING
935 c = rxvt_composite.compose (c); // map to lower 16 bits
936# else
937 c = 0xfffd;
938# endif
939#endif
940
941 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
942
943 // if the character doesn't fit into the remaining columns...
944 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
887 { 945 {
946 if (screen.flags & Screen_Autowrap)
947 {
948 // ... artificially enlargen the previous one
949 c = NOCHAR;
950 // and try the same character next loop iteration
951 --str;
952 }
953 else
954 screen.cur.col = ncol - width;
955 }
956
957 // nuke the character at this position, if required
958 // due to wonderful coincidences everywhere else in this loop
959 // we never have to check for overwriting a wide char itself,
960 // only its tail.
961 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
962 scr_kill_char (*line, screen.cur.col);
963
964 line->touch ();
965
966 do
967 {
888 stp[screen.cur.col] = c; 968 line->t[screen.cur.col] = c;
889 srp[screen.cur.col] = rend; 969 line->r[screen.cur.col] = rend;
890 970
891 if (screen.cur.col < last_col - 1) 971 if (ecb_likely (screen.cur.col < ncol - 1))
892 screen.cur.col++; 972 screen.cur.col++;
893 else 973 else
894 { 974 {
895 screen.tlen[row] = last_col; 975 line->l = ncol;
896 if (screen.flags & Screen_Autowrap) 976 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 977 screen.flags |= Screen_WrapNext;
898 break; 978
979 goto end_of_line;
899 } 980 }
900 981
901 c = NOCHAR; 982 c = NOCHAR;
902 } 983 }
903 while (--width > 0); 984 while (ecb_unlikely (--width > 0));
904 else
905 (void)0; /* handle combining character etc. here. */
906 }
907 985
908 if (screen.tlen[row] != -1) /* XXX: think about this */ 986 // pad with spaces when overwriting wide character with smaller one
909 MAX_IT (screen.tlen[row], screen.cur.col); 987 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
988 {
989 line->t[c] = ' ';
990 line->r[c] = rend;
991 }
910 992
911 /* 993end_of_line:
912 * If we wrote anywhere in the selected area, kill the selection 994 ;
913 * XXX: should we kill the mark too? Possibly, but maybe that 995 }
914 * should be a similar check. 996#if ENABLE_COMBINING
915 */ 997 else // width == 0
916 if (clearsel) 998 {
917 CLEAR_SELECTION (); 999 if (c != 0xfeff) // ignore BOM
1000 {
1001 // handle combining characters
1002 // we just tag the accent on the previous on-screen character.
1003 // this is arguably not correct, but also arguably not wrong.
1004 // we don't handle double-width characters nicely yet.
1005 line_t *linep;
1006 text_t *tp;
1007 rend_t *rp;
918 1008
919#ifdef DEBUG_STRICT 1009 if (screen.cur.col > 0)
1010 {
1011 linep = line;
1012 tp = line->t + screen.cur.col - 1;
1013 rp = line->r + screen.cur.col - 1;
1014 }
1015 else if (screen.cur.row > 0
1016 && ROW(screen.cur.row - 1).is_longer ())
1017 {
1018 linep = &ROW(screen.cur.row - 1);
1019 tp = linep->t + ncol - 1;
1020 rp = linep->r + ncol - 1;
1021 }
1022 else
1023 continue;
1024
1025 linep->touch ();
1026
1027 while (*tp == NOCHAR && tp > linep->t)
1028 tp--, rp--;
1029
1030 // first try to find a precomposed character
1031 unicode_t n = rxvt_compose (*tp, c);
1032 if (n == NOCHAR)
1033 n = rxvt_composite.compose (*tp, c);
1034
1035 *tp = n;
1036 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1037 }
1038 }
1039#endif
1040 }
1041
1042 max_it (line->l, screen.cur.col);
1043
920 assert (screen.cur.row >= 0); 1044 assert (screen.cur.row >= 0);
921#else /* drive with your eyes closed */
922 MAX_IT (screen.cur.row, 0);
923#endif
924} 1045}
925 1046
926/* ------------------------------------------------------------------------- */ 1047/* ------------------------------------------------------------------------- */
927/* 1048/*
928 * Process Backspace. Move back the cursor back a position, wrap if have to 1049 * Process Backspace. Move back the cursor back a position, wrap if have to
929 * XTERM_SEQ: CTRL-H 1050 * XTERM_SEQ: CTRL-H
930 */ 1051 */
931void 1052void
932rxvt_term::scr_backspace () 1053rxvt_term::scr_backspace () noexcept
933{ 1054{
934 want_refresh = 1;
935 if (screen.cur.col == 0) 1055 if (screen.cur.col == 0)
936 { 1056 {
937 if (screen.cur.row > 0) 1057 if (screen.cur.row > 0)
938 { 1058 {
939#ifdef TERMCAP_HAS_BW 1059#ifdef TERMCAP_HAS_BW
940 screen.cur.col = TermWin.ncol - 1; 1060 screen.cur.col = ncol - 1;
941 screen.cur.row--; 1061 --screen.cur.row;
942 return;
943#endif
944 1062
1063 want_refresh = 1;
1064#endif
945 } 1065 }
946 } 1066 }
947 else if ((screen.flags & Screen_WrapNext) == 0) 1067 else if (screen.flags & Screen_WrapNext)
1068 screen.flags &= ~Screen_WrapNext;
1069 else
948 scr_gotorc (0, -1, RELATIVE); 1070 scr_gotorc (0, -1, RELATIVE);
949 screen.flags &= ~Screen_WrapNext;
950} 1071}
951 1072
952/* ------------------------------------------------------------------------- */ 1073/* ------------------------------------------------------------------------- */
953/* 1074/*
954 * Process Horizontal Tab 1075 * Process Horizontal Tab
955 * count: +ve = forward; -ve = backwards 1076 * count: +ve = forward; -ve = backwards
956 * XTERM_SEQ: CTRL-I 1077 * XTERM_SEQ: CTRL-I
957 */ 1078 */
958void 1079void
959rxvt_term::scr_tab (int count) 1080rxvt_term::scr_tab (int count, bool ht) noexcept
960{ 1081{
961 int i, x; 1082 int i, x;
962 1083
963 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
964 want_refresh = 1; 1084 want_refresh = 1;
965 i = x = screen.cur.col; 1085 i = x = screen.cur.col;
1086
966 if (count == 0) 1087 if (count == 0)
967 return; 1088 return;
968 else if (count > 0) 1089 else if (count > 0)
969 { 1090 {
1091 line_t &l = ROW(screen.cur.row);
1092 rend_t base_rend = l.r[i];
1093 ht &= l.t[i] == ' ';
1094
970 for (; ++i < TermWin.ncol; ) 1095 for (; ++i < ncol; )
971 if (tabs[i]) 1096 if (tabs[i])
972 { 1097 {
973 x = i; 1098 x = i;
1099
974 if (!--count) 1100 if (!--count)
975 break; 1101 break;
976 } 1102 }
1103 else
1104 ht &= l.t[i] == ' '
1105 && RS_SAME (l.r[i], base_rend);
1106
977 if (count) 1107 if (count)
978 x = TermWin.ncol - 1; 1108 x = ncol - 1;
1109
1110 // store horizontal tab commands as characters inside the text
1111 // buffer so they can be selected and pasted.
1112 if (ht && option (Opt_pastableTabs))
1113 {
1114 base_rend = SET_FONT (base_rend, 0);
1115
1116 l.touch (x);
1117
1118 i = screen.cur.col;
1119
1120 l.t[i] = '\t';
1121 l.r[i] = base_rend;
1122
1123 while (++i < x)
1124 {
1125 l.t[i] = NOCHAR;
1126 l.r[i] = base_rend;
1127 }
1128 }
979 } 1129 }
980 else /* if (count < 0) */ 1130 else /* if (count < 0) */
981 { 1131 {
982 for (; --i >= 0; ) 1132 for (; --i >= 0; )
983 if (tabs[i]) 1133 if (tabs[i])
984 { 1134 {
985 x = i; 1135 x = i;
986 if (!++count) 1136 if (!++count)
987 break; 1137 break;
988 } 1138 }
1139
989 if (count) 1140 if (count)
990 x = 0; 1141 x = 0;
991 } 1142 }
1143
992 if (x != screen.cur.col) 1144 if (x != screen.cur.col)
993 scr_gotorc (0, x, R_RELATIVE); 1145 scr_gotorc (0, x, R_RELATIVE);
994} 1146}
995 1147
996/* ------------------------------------------------------------------------- */ 1148/* ------------------------------------------------------------------------- */
… …
998 * Process DEC Back Index 1150 * Process DEC Back Index
999 * XTERM_SEQ: ESC 6 1151 * XTERM_SEQ: ESC 6
1000 * Move cursor left in row. If we're at the left boundary, shift everything 1152 * Move cursor left in row. If we're at the left boundary, shift everything
1001 * in that row right. Clear left column. 1153 * in that row right. Clear left column.
1002 */ 1154 */
1003#ifndef NO_FRILLS 1155#if !ENABLE_MINIMAL
1004void 1156void ecb_cold
1005rxvt_term::scr_backindex () 1157rxvt_term::scr_backindex () noexcept
1006{ 1158{
1007 if (screen.cur.col > 0) 1159 if (screen.cur.col > 0)
1008 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1009 else 1161 else
1010 {
1011 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1012 return; /* um, yeah? */
1013 scr_insdel_chars (1, INSERT); 1162 scr_insdel_chars (1, INSERT);
1014 }
1015} 1163}
1016#endif 1164#endif
1017/* ------------------------------------------------------------------------- */ 1165/* ------------------------------------------------------------------------- */
1018/* 1166/*
1019 * Process DEC Forward Index 1167 * Process DEC Forward Index
1020 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1021 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1022 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1023 */ 1171 */
1024#ifndef NO_FRILLS 1172#if !ENABLE_MINIMAL
1025void 1173void ecb_cold
1026rxvt_term::scr_forwardindex () 1174rxvt_term::scr_forwardindex () noexcept
1027{ 1175{
1028 int row;
1029
1030 if (screen.cur.col < TermWin.ncol - 1) 1176 if (screen.cur.col < ncol - 1)
1031 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1032 else 1178 else
1033 { 1179 {
1034 row = screen.cur.row + TermWin.saveLines; 1180 line_t &l = ROW(screen.cur.row);
1035 if (screen.tlen[row] == 0) 1181
1036 return; /* um, yeah? */ 1182 l.touch ();
1037 else if (screen.tlen[row] == -1) 1183 l.is_longer (0);
1038 screen.tlen[row] = TermWin.ncol; 1184
1039 scr_gotorc (0, 0, R_RELATIVE); 1185 scr_gotorc (0, 0, R_RELATIVE);
1040 scr_insdel_chars (1, DELETE); 1186 scr_insdel_chars (1, DELETE);
1041 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1187 scr_gotorc (0, ncol - 1, R_RELATIVE);
1042 } 1188 }
1043} 1189}
1044#endif 1190#endif
1045 1191
1046/* ------------------------------------------------------------------------- */ 1192/* ------------------------------------------------------------------------- */
1047/* 1193/*
1048 * Goto Row/Column 1194 * Goto Row/Column
1049 */ 1195 */
1050void 1196void
1051rxvt_term::scr_gotorc (int row, int col, int relative) 1197rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1052{ 1198{
1053 want_refresh = 1; 1199 want_refresh = 1;
1054 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
1055 1201
1056 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1057
1058 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1202 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1059 : col); 1203 clamp_it (screen.cur.col, 0, ncol - 1);
1060 MAX_IT (screen.cur.col, 0);
1061 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1062 1204
1063 screen.flags &= ~Screen_WrapNext; 1205 screen.flags &= ~Screen_WrapNext;
1206
1064 if (relative & R_RELATIVE) 1207 if (relative & R_RELATIVE)
1065 { 1208 {
1066 if (row > 0) 1209 if (row > 0)
1067 { 1210 {
1068 if (screen.cur.row <= screen.bscroll 1211 if (screen.cur.row <= screen.bscroll
… …
1081 } 1224 }
1082 } 1225 }
1083 else 1226 else
1084 { 1227 {
1085 if (screen.flags & Screen_Relative) 1228 if (screen.flags & Screen_Relative)
1229 {
1086 { /* relative origin mode */ 1230 /* relative origin mode */
1087 screen.cur.row = row + screen.tscroll; 1231 screen.cur.row = row + screen.tscroll;
1088 MIN_IT (screen.cur.row, screen.bscroll); 1232 min_it (screen.cur.row, screen.bscroll);
1089 } 1233 }
1090 else 1234 else
1091 screen.cur.row = row; 1235 screen.cur.row = row;
1092 } 1236 }
1093 MAX_IT (screen.cur.row, 0);
1094 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1095}
1096 1237
1238 clamp_it (screen.cur.row, 0, nrow - 1);
1239}
1240
1097/* ------------------------------------------------------------------------- */ 1241/* ------------------------------------------------------------------------- */
1098/* 1242/*
1099 * direction should be UP or DN 1243 * direction should be UP or DN
1100 */ 1244 */
1101void 1245void
1102rxvt_term::scr_index (enum page_dirn direction) 1246rxvt_term::scr_index (enum page_dirn direction) noexcept
1103{ 1247{
1104 int dirn;
1105
1106 want_refresh = 1; 1248 want_refresh = 1;
1107 dirn = ((direction == UP) ? 1 : -1);
1108 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1109
1110 ZERO_SCROLLBACK (); 1249 ZERO_SCROLLBACK ();
1111 1250
1112 screen.flags &= ~Screen_WrapNext; 1251 screen.flags &= ~Screen_WrapNext;
1252
1113 if ((screen.cur.row == screen.bscroll && direction == UP) 1253 if ((screen.cur.row == screen.bscroll && direction == UP)
1114 || (screen.cur.row == screen.tscroll && direction == DN)) 1254 || (screen.cur.row == screen.tscroll && direction == DN))
1115 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1255 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1116 else 1256 else
1117 screen.cur.row += dirn; 1257 screen.cur.row += direction;
1118 MAX_IT (screen.cur.row, 0); 1258
1119 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1259 clamp_it (screen.cur.row, 0, nrow - 1);
1120 selection_check (0); 1260 selection_check (0);
1121} 1261}
1122 1262
1123/* ------------------------------------------------------------------------- */ 1263/* ------------------------------------------------------------------------- */
1124/* 1264/*
1125 * Erase part or whole of a line 1265 * Erase part or whole of a line
1126 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1266 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1127 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1267 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1128 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1269 * extension: clear to right unless wrapped: ESC [ 3 K
1129 */ 1270 */
1130void 1271void
1131rxvt_term::scr_erase_line (int mode) 1272rxvt_term::scr_erase_line (int mode) noexcept
1132{ 1273{
1133 unsigned int row, col, num; 1274 unsigned int col, num;
1134 1275
1135 want_refresh = 1; 1276 want_refresh = 1;
1136 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1137 ZERO_SCROLLBACK (); 1277 ZERO_SCROLLBACK ();
1138 1278
1139 selection_check (1); 1279 selection_check (1);
1140 1280
1141 screen.flags &= ~Screen_WrapNext; 1281 line_t &line = ROW(screen.cur.row);
1142 1282
1143 row = TermWin.saveLines + screen.cur.row; 1283 line.touch ();
1284 line.is_longer (0);
1285
1144 switch (mode) 1286 switch (mode)
1145 { 1287 {
1288 case 3:
1289 if (screen.flags & Screen_WrapNext)
1290 return;
1291
1292 /* fall through */
1293
1146 case 0: /* erase to end of line */ 1294 case 0: /* erase to end of line */
1147 col = screen.cur.col; 1295 col = screen.cur.col;
1148 num = TermWin.ncol - col; 1296 num = ncol - col;
1149 MIN_IT (screen.tlen[row], (int16_t)col); 1297 min_it (line.l, col);
1298
1150 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1299 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1151 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1300 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1152 CLEAR_SELECTION (); 1301 CLEAR_SELECTION ();
1153 break; 1302 break;
1303
1154 case 1: /* erase to beginning of line */ 1304 case 1: /* erase to beginning of line */
1155 col = 0; 1305 col = 0;
1156 num = screen.cur.col + 1; 1306 num = screen.cur.col + 1;
1307
1157 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1308 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1158 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1309 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1159 CLEAR_SELECTION (); 1310 CLEAR_SELECTION ();
1160 break; 1311 break;
1312
1161 case 2: /* erase whole line */ 1313 case 2: /* erase whole line */
1162 col = 0; 1314 col = 0;
1163 num = TermWin.ncol; 1315 num = ncol;
1164 screen.tlen[row] = 0; 1316 line.l = 0;
1165 if (selection.beg.row <= screen.cur.row 1317 if (selection.beg.row <= screen.cur.row
1166 && selection.end.row >= screen.cur.row) 1318 && selection.end.row >= screen.cur.row)
1167 CLEAR_SELECTION (); 1319 CLEAR_SELECTION ();
1168 break; 1320 break;
1169 default: 1321 default:
1170 return; 1322 return;
1171 } 1323 }
1172 1324
1173 if (screen.text[row]) 1325 scr_blank_line (line, col, num, rstyle);
1174 scr_blank_line (& (screen.text[row][col]),
1175 & (screen.rend[row][col]), num, rstyle);
1176 else
1177 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1178} 1326}
1179 1327
1180/* ------------------------------------------------------------------------- */ 1328/* ------------------------------------------------------------------------- */
1181/* 1329/*
1182 * Erase part of whole of the screen 1330 * Erase part or whole of the screen
1183 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1331 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1184 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1332 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1185 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1333 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1186 */ 1334 */
1187void 1335void
1188rxvt_term::scr_erase_screen (int mode) 1336rxvt_term::scr_erase_screen (int mode) noexcept
1189{ 1337{
1190 int num; 1338 int num;
1191 int32_t row, row_offset; 1339 int32_t row;
1192 rend_t ren; 1340 rend_t ren;
1193 XGCValues gcvalue; 1341 XGCValues gcvalue;
1194 1342
1195 want_refresh = 1; 1343 want_refresh = 1;
1196 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1197 ZERO_SCROLLBACK (); 1344 ZERO_SCROLLBACK ();
1198 row_offset = (int32_t)TermWin.saveLines;
1199 1345
1200 switch (mode) 1346 switch (mode)
1201 { 1347 {
1202 case 0: /* erase to end of screen */ 1348 case 0: /* erase to end of screen */
1203 selection_check (1);
1204 scr_erase_line (0); 1349 scr_erase_line (0);
1205 row = screen.cur.row + 1; /* possible OOB */ 1350 row = screen.cur.row + 1; /* possible OOB */
1206 num = TermWin.nrow - row; 1351 num = nrow - row;
1207 break; 1352 break;
1208 case 1: /* erase to beginning of screen */ 1353 case 1: /* erase to beginning of screen */
1209 selection_check (3);
1210 scr_erase_line (1); 1354 scr_erase_line (1);
1211 row = 0; 1355 row = 0;
1212 num = screen.cur.row; 1356 num = screen.cur.row;
1213 break; 1357 break;
1214 case 2: /* erase whole screen */ 1358 case 2: /* erase whole screen */
1215 selection_check (3);
1216 row = 0; 1359 row = 0;
1217 num = TermWin.nrow; 1360 num = nrow;
1218 break; 1361 break;
1219 default: 1362 default:
1220 return; 1363 return;
1221 } 1364 }
1222 refresh_type |= REFRESH_BOUNDS; 1365
1223 if (selection.op && current_screen == selection.screen 1366 if (selection.op && current_screen == selection.screen
1224 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1367 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1225 || (selection.end.row >= row 1368 || (selection.end.row >= row
1226 && selection.end.row <= row + num))) 1369 && selection.end.row <= row + num)))
1227 CLEAR_SELECTION (); 1370 CLEAR_SELECTION ();
1371
1228 if (row >= TermWin.nrow) /* Out Of Bounds */ 1372 if (row >= nrow) /* Out Of Bounds */
1229 return; 1373 return;
1230 MIN_IT (num, (TermWin.nrow - row)); 1374
1375 min_it (num, nrow - row);
1376
1231 if (rstyle & (RS_RVid | RS_Uline)) 1377 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1232 ren = (rend_t) ~RS_None; 1378 ren = (rend_t) ~RS_None;
1233 else if (GET_BASEBG (rstyle) == Color_bg) 1379 else if (GET_BASEBG (rstyle) == Color_bg)
1234 { 1380 {
1235 ren = DEFAULT_RSTYLE; 1381 ren = DEFAULT_RSTYLE;
1236 CLEAR_ROWS (row, num); 1382
1383 if (mapped)
1384 XClearArea (dpy, vt, 0,
1385 Row2Pixel (row - view_start), (unsigned int)vt_width,
1386 (unsigned int)Height2Pixel (num), False);
1237 } 1387 }
1238 else 1388 else
1239 { 1389 {
1240 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1390 ren = rstyle & (RS_fgMask | RS_bgMask);
1391
1392 if (mapped)
1393 {
1241 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1394 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1242 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1395 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1243 ERASE_ROWS (row, num); 1396 XFillRectangle (dpy, vt, gc,
1397 0, Row2Pixel (row - view_start),
1398 (unsigned int)vt_width,
1399 (unsigned int)Height2Pixel (num));
1244 gcvalue.foreground = PixColors[Color_fg]; 1400 gcvalue.foreground = pix_colors[Color_fg];
1245 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1401 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1402 }
1246 } 1403 }
1404
1247 for (; num--; row++) 1405 for (; num--; row++)
1248 { 1406 {
1249 scr_blank_screen_mem (screen.text, screen.rend, 1407 scr_blank_screen_mem (ROW(row), rstyle);
1250 (unsigned int) (row + row_offset), rstyle); 1408
1251 screen.tlen[row + row_offset] = 0; 1409 if (row - view_start < nrow)
1252 scr_blank_line (drawn_text[row], drawn_rend[row], 1410 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1253 (unsigned int)TermWin.ncol, ren);
1254 } 1411 }
1255} 1412}
1413
1414#if !ENABLE_MINIMAL
1415void
1416rxvt_term::scr_erase_savelines () noexcept
1417{
1418 want_refresh = 1;
1419 ZERO_SCROLLBACK ();
1420
1421 top_row = 0;
1422}
1423#endif
1256 1424
1257/* ------------------------------------------------------------------------- */ 1425/* ------------------------------------------------------------------------- */
1258/* 1426/*
1259 * Fill the screen with `E's 1427 * Fill the screen with `E's
1260 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1428 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1261 */ 1429 */
1262void 1430void ecb_cold
1263rxvt_term::scr_E () 1431rxvt_term::scr_E () noexcept
1264{ 1432{
1265 int i, j, k; 1433 rend_t fs;
1266 rend_t *r1, fs;
1267 1434
1268 want_refresh = 1; 1435 want_refresh = 1;
1436 ZERO_SCROLLBACK ();
1437
1269 num_scr_allow = 0; 1438 num_scr_allow = 0;
1270 ZERO_SCROLLBACK ();
1271 selection_check (3);
1272 1439
1440 row_col_t pos;
1441 pos.row = pos.col = 0;
1442 if (ROWCOL_IS_AFTER (selection.end, pos))
1443 CLEAR_SELECTION ();
1444
1273 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1445 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1274 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1446 for (int row = nrow; row--; )
1275 { 1447 {
1276 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1448 line_t &line = ROW(row);
1449
1277 fill_text (screen.text[k], 'E', TermWin.ncol); 1450 fill_text (line.t, 'E', ncol);
1278 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1451 rend_t *r1 = line.r;
1452
1453 for (int j = ncol; j--; )
1279 *r1++ = fs; 1454 *r1++ = fs;
1455
1456 line.is_longer (0);
1457 line.touch (ncol);
1280 } 1458 }
1281} 1459}
1282 1460
1283/* ------------------------------------------------------------------------- */ 1461/* ------------------------------------------------------------------------- */
1284/* 1462/*
1285 * Insert/Delete <count> lines 1463 * Insert/Delete <count> lines
1286 */ 1464 */
1287void 1465void
1288rxvt_term::scr_insdel_lines (int count, int insdel) 1466rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1289{ 1467{
1290 int end; 1468 int end;
1291 1469
1292 ZERO_SCROLLBACK (); 1470 ZERO_SCROLLBACK ();
1293 1471
1294 selection_check (1); 1472 selection_check (1);
1295 1473
… …
1302 if (insdel == DELETE) 1480 if (insdel == DELETE)
1303 return; 1481 return;
1304 else if (insdel == INSERT) 1482 else if (insdel == INSERT)
1305 count = end; 1483 count = end;
1306 } 1484 }
1307 screen.flags &= ~Screen_WrapNext;
1308 1485
1486 scr_do_wrap ();
1487
1309 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1488 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1310} 1489}
1311 1490
1312/* ------------------------------------------------------------------------- */ 1491/* ------------------------------------------------------------------------- */
1313/* 1492/*
1314 * Insert/Delete <count> characters from the current position 1493 * Insert/Delete <count> characters from the current position
1315 */ 1494 */
1316void 1495void
1317rxvt_term::scr_insdel_chars (int count, int insdel) 1496rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1318{ 1497{
1319 int col, row;
1320 rend_t tr;
1321 text_t *stp;
1322 rend_t *srp;
1323 int16_t *slp;
1324
1325 want_refresh = 1; 1498 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1499 ZERO_SCROLLBACK ();
1327 1500
1328 if (count <= 0) 1501 if (count <= 0)
1329 return; 1502 return;
1330 1503
1504 scr_do_wrap ();
1505
1331 selection_check (1); 1506 selection_check (1);
1332 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1507 min_it (count, ncol - screen.cur.col);
1333 1508
1334 row = screen.cur.row + TermWin.saveLines; 1509 int row = screen.cur.row;
1335 screen.flags &= ~Screen_WrapNext;
1336 1510
1337 stp = screen.text[row]; 1511 line_t *line = &ROW(row);
1338 srp = screen.rend[row]; 1512
1339 slp = & (screen.tlen[row]); 1513 line->touch ();
1514 line->is_longer (0);
1515
1516 // nuke wide spanning the start
1517 if (line->t[screen.cur.col] == NOCHAR)
1518 scr_kill_char (*line, screen.cur.col);
1519
1340 switch (insdel) 1520 switch (insdel)
1341 { 1521 {
1342 case INSERT: 1522 case INSERT:
1343 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1523 line->l = min (line->l + count, ncol);
1344 col--) 1524
1525 if (line->t[screen.cur.col] == NOCHAR)
1526 scr_kill_char (*line, screen.cur.col);
1527
1528 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1345 { 1529 {
1346 stp[col] = stp[col - count]; 1530 line->t[col] = line->t[col - count];
1347 srp[col] = srp[col - count]; 1531 line->r[col] = line->r[col - count];
1348 } 1532 }
1349 if (*slp != -1) 1533
1350 {
1351 *slp += count;
1352 MIN_IT (*slp, TermWin.ncol);
1353 }
1354 if (selection.op && current_screen == selection.screen 1534 if (selection.op && current_screen == selection.screen
1355 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1535 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1356 { 1536 {
1357 if (selection.end.row != screen.cur.row 1537 if (selection.end.row != screen.cur.row
1358 || (selection.end.col + count >= TermWin.ncol)) 1538 || (selection.end.col + count >= ncol))
1359 CLEAR_SELECTION (); 1539 CLEAR_SELECTION ();
1360 else 1540 else
1541 {
1361 { /* shift selection */ 1542 /* shift selection */
1362 selection.beg.col += count; 1543 selection.beg.col += count;
1363 selection.mark.col += count; /* XXX: yes? */ 1544 selection.mark.col += count; /* XXX: yes? */
1364 selection.end.col += count; 1545 selection.end.col += count;
1365 } 1546 }
1366 } 1547 }
1367 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1548
1368 (unsigned int)count, rstyle); 1549 scr_blank_line (*line, screen.cur.col, count, rstyle);
1369 break; 1550 break;
1551
1370 case ERASE: 1552 case ERASE:
1371 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1553 screen.cur.col += count; /* don't worry if > ncol */
1372 selection_check (1); 1554 selection_check (1);
1373 screen.cur.col -= count; 1555 screen.cur.col -= count;
1374 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1556
1375 (unsigned int)count, rstyle); 1557 // nuke wide char after the end
1558 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1559 scr_kill_char (*line, screen.cur.col + count);
1560
1561 scr_blank_line (*line, screen.cur.col, count, rstyle);
1376 break; 1562 break;
1563
1377 case DELETE: 1564 case DELETE:
1378 tr = srp[TermWin.ncol - 1] 1565 line->l = max (line->l - count, 0);
1379 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1566
1567 // nuke wide char spanning the end
1568 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1569 scr_kill_char (*line, screen.cur.col + count);
1570
1380 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1571 for (int col = screen.cur.col; (col + count) < ncol; col++)
1381 { 1572 {
1382 stp[col] = stp[col + count]; 1573 line->t[col] = line->t[col + count];
1383 srp[col] = srp[col + count]; 1574 line->r[col] = line->r[col + count];
1384 } 1575 }
1385 scr_blank_line (& (stp[TermWin.ncol - count]), 1576
1386 & (srp[TermWin.ncol - count]), 1577 scr_blank_line (*line, ncol - count, count, rstyle);
1387 (unsigned int)count, tr); 1578
1388 if (*slp == -1) /* break line continuation */
1389 *slp = TermWin.ncol;
1390 *slp -= count;
1391 MAX_IT (*slp, 0);
1392 if (selection.op && current_screen == selection.screen 1579 if (selection.op && current_screen == selection.screen
1393 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1580 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1394 { 1581 {
1395 if (selection.end.row != screen.cur.row 1582 if (selection.end.row != screen.cur.row
1396 || (screen.cur.col >= selection.beg.col - count) 1583 || (screen.cur.col >= selection.beg.col - count)
1397 || selection.end.col >= TermWin.ncol) 1584 || selection.end.col >= ncol)
1398 CLEAR_SELECTION (); 1585 CLEAR_SELECTION ();
1399 else 1586 else
1400 { 1587 {
1401 /* shift selection */ 1588 /* shift selection */
1402 selection.beg.col -= count; 1589 selection.beg.col -= count;
1403 selection.mark.col -= count; /* XXX: yes? */ 1590 selection.mark.col -= count; /* XXX: yes? */
1404 selection.end.col -= count; 1591 selection.end.col -= count;
1405 } 1592 }
1406 } 1593 }
1594
1407 break; 1595 break;
1408 } 1596 }
1409} 1597}
1410 1598
1411/* ------------------------------------------------------------------------- */ 1599/* ------------------------------------------------------------------------- */
1412/* 1600/*
1413 * Set the scrolling region 1601 * Set the scrolling region
1414 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1602 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1415 */ 1603 */
1416void 1604void ecb_cold
1417rxvt_term::scr_scroll_region (int top, int bot) 1605rxvt_term::scr_scroll_region (int top, int bot) noexcept
1418{ 1606{
1419 MAX_IT (top, 0); 1607 max_it (top, 0);
1420 MIN_IT (bot, (int)TermWin.nrow - 1); 1608 min_it (bot, nrow - 1);
1609
1421 if (top > bot) 1610 if (top > bot)
1422 return; 1611 return;
1612
1423 screen.tscroll = top; 1613 screen.tscroll = top;
1424 screen.bscroll = bot; 1614 screen.bscroll = bot;
1425 scr_gotorc (0, 0, 0); 1615 scr_gotorc (0, 0, 0);
1426} 1616}
1427 1617
… …
1429/* 1619/*
1430 * Make the cursor visible/invisible 1620 * Make the cursor visible/invisible
1431 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1621 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1432 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1622 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1433 */ 1623 */
1434void 1624void ecb_cold
1435rxvt_term::scr_cursor_visible (int mode) 1625rxvt_term::scr_cursor_visible (int mode) noexcept
1436{ 1626{
1437 want_refresh = 1; 1627 want_refresh = 1;
1628
1438 if (mode) 1629 if (mode)
1439 screen.flags |= Screen_VisibleCursor; 1630 screen.flags |= Screen_VisibleCursor;
1440 else 1631 else
1441 screen.flags &= ~Screen_VisibleCursor; 1632 screen.flags &= ~Screen_VisibleCursor;
1442} 1633}
… …
1445/* 1636/*
1446 * Set/unset automatic wrapping 1637 * Set/unset automatic wrapping
1447 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1638 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1448 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1639 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1449 */ 1640 */
1450void 1641void ecb_cold
1451rxvt_term::scr_autowrap (int mode) 1642rxvt_term::scr_autowrap (int mode) noexcept
1452{ 1643{
1453 if (mode) 1644 if (mode)
1454 screen.flags |= Screen_Autowrap; 1645 screen.flags |= Screen_Autowrap;
1455 else 1646 else
1456 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1647 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1457} 1648}
1458 1649
1459/* ------------------------------------------------------------------------- */ 1650/* ------------------------------------------------------------------------- */
1460/* 1651/*
1461 * Set/unset margin origin mode 1652 * Set/unset margin origin mode
… …
1464 * Relative mode: line numbers are relative to top margin of scrolling region 1655 * Relative mode: line numbers are relative to top margin of scrolling region
1465 * and the cursor cannot be moved outside. 1656 * and the cursor cannot be moved outside.
1466 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1657 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1467 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1658 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1468 */ 1659 */
1469void 1660void ecb_cold
1470rxvt_term::scr_relative_origin (int mode) 1661rxvt_term::scr_relative_origin (int mode) noexcept
1471{ 1662{
1472 if (mode) 1663 if (mode)
1473 screen.flags |= Screen_Relative; 1664 screen.flags |= Screen_Relative;
1474 else 1665 else
1475 screen.flags &= ~Screen_Relative; 1666 screen.flags &= ~Screen_Relative;
1667
1476 scr_gotorc (0, 0, 0); 1668 scr_gotorc (0, 0, 0);
1477} 1669}
1478 1670
1479/* ------------------------------------------------------------------------- */ 1671/* ------------------------------------------------------------------------- */
1480/* 1672/*
1481 * Set insert/replace mode 1673 * Set insert/replace mode
1482 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1674 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1483 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1675 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1484 */ 1676 */
1485void 1677void ecb_cold
1486rxvt_term::scr_insert_mode (int mode) 1678rxvt_term::scr_insert_mode (int mode) noexcept
1487{ 1679{
1488 if (mode) 1680 if (mode)
1489 screen.flags |= Screen_Insert; 1681 screen.flags |= Screen_Insert;
1490 else 1682 else
1491 screen.flags &= ~Screen_Insert; 1683 screen.flags &= ~Screen_Insert;
… …
1496 * Set/Unset tabs 1688 * Set/Unset tabs
1497 * XTERM_SEQ: Set tab at current column : ESC H 1689 * XTERM_SEQ: Set tab at current column : ESC H
1498 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1690 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1499 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1691 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1500 */ 1692 */
1501void 1693void ecb_cold
1502rxvt_term::scr_set_tab (int mode) 1694rxvt_term::scr_set_tab (int mode) noexcept
1503{ 1695{
1504 if (mode < 0) 1696 if (mode < 0)
1505 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1697 memset (tabs, 0, ncol);
1506 else if (screen.cur.col < TermWin.ncol) 1698 else if (screen.cur.col < ncol)
1507 tabs[screen.cur.col] = (mode ? 1 : 0); 1699 tabs [screen.cur.col] = !!mode;
1508} 1700}
1509 1701
1510/* ------------------------------------------------------------------------- */ 1702/* ------------------------------------------------------------------------- */
1511/* 1703/*
1512 * Set reverse/normal video 1704 * Set reverse/normal video
1513 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1705 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1514 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1706 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1515 */ 1707 */
1516void 1708void
1517rxvt_term::scr_rvideo_mode (int mode) 1709rxvt_term::scr_rvideo_mode (bool on) noexcept
1518{ 1710{
1711 rvideo_mode = on;
1712
1713#ifndef NO_BELL
1714 on ^= rvideo_bell;
1715#endif
1716
1717 if (rvideo_state != on)
1718 {
1719 rvideo_state = on;
1720
1721#if OFF_FOCUS_FADING
1722 if (rs[Rs_fade])
1723 {
1724 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1725 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1726 }
1727 else
1728#endif
1729 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1730#ifdef HAVE_IMG
1731 if (bg_img == 0)
1732#endif
1733 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1734
1519 XGCValues gcvalue; 1735 XGCValues gcvalue;
1520
1521 if (rvideo != mode)
1522 {
1523 rvideo = mode;
1524 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color);
1525#if defined(XPM_BACKGROUND)
1526 if (bgPixmap.pixmap == None)
1527#endif
1528#if defined(TRANSPARENT)
1529 if (! (Options & Opt_transparent) || am_transparent == 0)
1530#endif
1531 XSetWindowBackground (display->display, TermWin.vt,
1532 PixColors[Color_bg]);
1533
1534 gcvalue.foreground = PixColors[Color_fg]; 1736 gcvalue.foreground = pix_colors[Color_fg];
1535 gcvalue.background = PixColors[Color_bg]; 1737 gcvalue.background = pix_colors[Color_bg];
1536 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1738 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1537 &gcvalue); 1739
1538 scr_clear (); 1740 scr_clear ();
1539 scr_touch (true); 1741 scr_touch (true);
1540 } 1742 }
1541} 1743}
1542 1744
1543/* ------------------------------------------------------------------------- */ 1745/* ------------------------------------------------------------------------- */
1544/* 1746/*
1545 * Report current cursor position 1747 * Report current cursor position
1546 * XTERM_SEQ: Report position: ESC [ 6 n 1748 * XTERM_SEQ: Report position: ESC [ 6 n
1547 */ 1749 */
1548void 1750void ecb_cold
1549rxvt_term::scr_report_position () 1751rxvt_term::scr_report_position () noexcept
1550{ 1752{
1551 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1753 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1552} 1754}
1553 1755
1554/* ------------------------------------------------------------------------- * 1756/* ------------------------------------------------------------------------- *
… …
1556 * ------------------------------------------------------------------------- */ 1758 * ------------------------------------------------------------------------- */
1557 1759
1558/* 1760/*
1559 * Set font style 1761 * Set font style
1560 */ 1762 */
1561void 1763void ecb_cold
1562rxvt_term::set_font_style () 1764rxvt_term::set_font_style () noexcept
1563{ 1765{
1766#if 0
1564 switch (charsets[screen.charset]) 1767 switch (charsets [screen.charset])
1565 { 1768 {
1566 case '0': /* DEC Special Character & Line Drawing Set */ 1769 case '0': /* DEC Special Character & Line Drawing Set */
1567 break; 1770 break;
1568 case 'A': /* United Kingdom (UK) */ 1771 case 'A': /* United Kingdom (UK) */
1569 break; 1772 break;
… …
1576 case 'C': /* Finnish character set */ 1779 case 'C': /* Finnish character set */
1577 break; 1780 break;
1578 case 'K': /* German character set */ 1781 case 'K': /* German character set */
1579 break; 1782 break;
1580 } 1783 }
1784#endif
1581} 1785}
1582 1786
1583/* ------------------------------------------------------------------------- */ 1787/* ------------------------------------------------------------------------- */
1584/* 1788/*
1585 * Choose a font 1789 * Choose a font
1586 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1790 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1587 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1791 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1588 * XTERM_SEQ: Invoke G2 character set: ESC N 1792 * XTERM_SEQ: Invoke G2 character set: ESC N
1589 * XTERM_SEQ: Invoke G3 character set: ESC O 1793 * XTERM_SEQ: Invoke G3 character set: ESC O
1590 */ 1794 */
1591void 1795void ecb_cold
1592rxvt_term::scr_charset_choose (int set) 1796rxvt_term::scr_charset_choose (int set) noexcept
1593 { 1797{
1594 screen.charset = set; 1798 screen.charset = set;
1595 set_font_style (); 1799 set_font_style ();
1596 } 1800}
1597 1801
1598/* ------------------------------------------------------------------------- */ 1802/* ------------------------------------------------------------------------- */
1599/* 1803/*
1600 * Set a font 1804 * Set a font
1601 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1805 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1603 * XTERM_SEQ: Set G2 character set: ESC * <C> 1807 * XTERM_SEQ: Set G2 character set: ESC * <C>
1604 * XTERM_SEQ: Set G3 character set: ESC + <C> 1808 * XTERM_SEQ: Set G3 character set: ESC + <C>
1605 * See set_font_style for possible values for <C> 1809 * See set_font_style for possible values for <C>
1606 */ 1810 */
1607void 1811void
1608rxvt_term::scr_charset_set (int set, unsigned int ch) 1812rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1609 { 1813{
1610 charsets[set] = (unsigned char)ch; 1814 charsets[set] = (unsigned char)ch;
1611 set_font_style (); 1815 set_font_style ();
1612 } 1816}
1613 1817
1614 1818
1615/* ------------------------------------------------------------------------- * 1819/* ------------------------------------------------------------------------- *
1616 * MAJOR SCREEN MANIPULATION * 1820 * MAJOR SCREEN MANIPULATION *
1617 * ------------------------------------------------------------------------- */ 1821 * ------------------------------------------------------------------------- */
1618 1822
1619/* 1823/*
1620 * refresh matching text. 1824 * refresh matching text.
1621 */ 1825 */
1622bool 1826bool ecb_cold
1623rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1827rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1624{ 1828{
1625 bool found = false; 1829 bool found = false;
1626 1830
1627 for (int i = 0; i < TermWin.nrow; i++) 1831 for (int i = 0; i < nrow; i++)
1628 { 1832 {
1629 int col = 0;
1630 rend_t *drp = drawn_rend [i]; 1833 rend_t *drp = drawn_buf[i].r;
1631 1834
1632 for (; col < TermWin.ncol; col++, drp++) 1835 for (int col = 0; col < ncol; col++, drp++)
1633 if ((*drp & mask) == value) 1836 if ((*drp & mask) == value)
1634 { 1837 {
1635 found = true; 1838 found = true;
1636 *drp = ~value; 1839 *drp = ~value;
1637 } 1840 }
… …
1647 PART_BEG = 0, 1850 PART_BEG = 0,
1648 PART_END, 1851 PART_END,
1649 RC_COUNT 1852 RC_COUNT
1650}; 1853};
1651 1854
1652void 1855void ecb_hot
1653rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1856rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1654{ 1857{
1655 int i; 1858 int i;
1656 row_col_t rc[RC_COUNT]; 1859 row_col_t rc[RC_COUNT];
1657 1860
1658 if (drawn_text == NULL) /* sanity check */ 1861 if (!drawn_buf) /* sanity check */
1659 return; 1862 return;
1660 1863
1661#ifdef DEBUG_STRICT 1864#ifndef NO_SLOW_LINK_SUPPORT
1662 x = max (x, (int)TermWin.int_bwidth); 1865 if (refresh_type == FAST_REFRESH && !display->is_local)
1663 x = min (x, (int)TermWin.width); 1866 {
1664 y = max (y, (int)TermWin.int_bwidth); 1867 y = 0;
1665 y = min (y, (int)TermWin.height); 1868 eheight = height;
1869 }
1666#endif 1870#endif
1667 1871
1668 /* round down */ 1872 /* round down */
1669 rc[PART_BEG].col = Pixel2Col (x); 1873 rc[PART_BEG].col = Pixel2Col (x);
1670 rc[PART_BEG].row = Pixel2Row (y); 1874 rc[PART_BEG].row = Pixel2Row (y);
1671 /* round up */ 1875 /* round up */
1672 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1876 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1673 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1877 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1674 1878
1675 /* sanity checks */ 1879 /* sanity checks */
1676 for (i = PART_BEG; i < RC_COUNT; i++) 1880 for (i = PART_BEG; i < RC_COUNT; i++)
1677 { 1881 {
1678 MIN_IT (rc[i].col, TermWin.ncol - 1); 1882 min_it (rc[i].col, ncol - 1);
1679 MIN_IT (rc[i].row, TermWin.nrow - 1); 1883 min_it (rc[i].row, nrow - 1);
1680 } 1884 }
1681
1682 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1683 1885
1684 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1886 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1685 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1887 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1686 (rc[PART_END].col - rc[PART_BEG].col + 1)); 1888
1889 num_scr_allow = 0;
1687 1890
1688 if (refresh) 1891 if (refresh)
1689 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1892 scr_refresh ();
1690} 1893}
1691 1894
1692/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1693/* 1896/*
1694 * Refresh the entire screen 1897 * Refresh the entire screen
1695 */ 1898 */
1696void 1899void
1697rxvt_term::scr_touch (bool refresh) 1900rxvt_term::scr_touch (bool refresh) noexcept
1698{ 1901{
1699 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1902 scr_expose (0, 0, vt_width, vt_height, refresh);
1700} 1903}
1701 1904
1702/* ------------------------------------------------------------------------- */ 1905/* ------------------------------------------------------------------------- */
1703/* 1906/*
1704 * Move the display so that the line represented by scrollbar value Y is at 1907 * Move the display so that the line represented by scrollbar value Y is at
1705 * the top of the screen 1908 * the top of the screen
1706 */ 1909 */
1707int 1910void
1708rxvt_term::scr_move_to (int y, int len) 1911rxvt_term::scr_move_to (int y, int len) noexcept
1709{ 1912{
1710 long p = 0; 1913 // lerp (y, 0, len, top_row, nrow - 1)
1711 uint16_t oldviewstart; 1914 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1712
1713 oldviewstart = TermWin.view_start;
1714 if (y < len)
1715 {
1716 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1717 p -= (long) (TermWin.nrow - 1);
1718 p = max (p, 0);
1719 }
1720 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1721 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1722
1723 return scr_changeview (oldviewstart);
1724} 1915}
1725 1916
1726/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1727/* 1918/*
1728 * Page the screen up/down nlines 1919 * Page the screen up/down nlines
1729 * direction should be UP or DN 1920 * direction should be UP or DN
1730 */ 1921 */
1731int 1922bool
1732rxvt_term::scr_page (enum page_dirn direction, int nlines) 1923rxvt_term::scr_page (int nlines) noexcept
1733{ 1924{
1734 int n;
1735 uint16_t oldviewstart;
1736
1737 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1738#ifdef DEBUG_STRICT
1739 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1740#endif
1741 oldviewstart = TermWin.view_start;
1742 if (direction == UP)
1743 {
1744 n = TermWin.view_start + nlines;
1745 TermWin.view_start = min (n, TermWin.nscrolled);
1746 }
1747 else
1748 {
1749 n = TermWin.view_start - nlines;
1750 TermWin.view_start = max (n, 0);
1751 }
1752 return scr_changeview (oldviewstart); 1925 return scr_changeview (view_start - nlines);
1753} 1926}
1754 1927
1755int 1928bool
1756rxvt_term::scr_changeview (uint16_t oldviewstart) 1929rxvt_term::scr_changeview (int new_view_start) noexcept
1757{ 1930{
1931 clamp_it (new_view_start, top_row, 0);
1932
1758 if (TermWin.view_start != oldviewstart) 1933 if (new_view_start == view_start)
1759 { 1934 return false;
1935
1936 num_scr += new_view_start - view_start;
1937 view_start = new_view_start;
1760 want_refresh = 1; 1938 want_refresh = 1;
1761 num_scr -= (TermWin.view_start - oldviewstart);
1762 }
1763 return (int) (TermWin.view_start - oldviewstart);
1764}
1765 1939
1766/* ------------------------------------------------------------------------- */ 1940 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1767void 1941
1768rxvt_term::scr_bell () 1942 return true;
1769{ 1943}
1944
1770#ifndef NO_BELL 1945#ifndef NO_BELL
1946void
1947rxvt_term::bell_cb (ev::timer &w, int revents)
1948{
1949 rvideo_bell = false;
1950 scr_rvideo_mode (rvideo_mode);
1951 refresh_check ();
1952}
1953#endif
1954
1955/* ------------------------------------------------------------------------- */
1956void
1957rxvt_term::scr_bell () noexcept
1958{
1959#ifndef NO_BELL
1960
1771# ifndef NO_MAPALERT 1961# ifndef NO_MAPALERT
1772# ifdef MAPALERT_OPTION 1962# ifdef MAPALERT_OPTION
1773 if (Options & Opt_mapAlert) 1963 if (option (Opt_mapAlert))
1774# endif 1964# endif
1775 XMapWindow (display->display, TermWin.parent[0]); 1965 XMapWindow (dpy, parent);
1776# endif 1966# endif
1967
1968# if ENABLE_FRILLS
1969 if (option (Opt_urgentOnBell))
1970 set_urgency (1);
1971# endif
1972
1777 if (Options & Opt_visualBell) 1973 if (option (Opt_visualBell))
1778 { 1974 {
1779 scr_rvideo_mode (!rvideo); /* refresh also done */ 1975 rvideo_bell = true;
1780 scr_rvideo_mode (!rvideo); /* refresh also done */ 1976 scr_rvideo_mode (rvideo_mode);
1977 flush ();
1978
1979 bell_ev.start (VISUAL_BELL_DURATION);
1781 } 1980 }
1782 else 1981 else
1783 XBell (display->display, 0); 1982 XBell (dpy, 0);
1983 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1784#endif 1984#endif
1785} 1985}
1786 1986
1787/* ------------------------------------------------------------------------- */ 1987/* ------------------------------------------------------------------------- */
1788/* ARGSUSED */ 1988void ecb_cold
1789void
1790rxvt_term::scr_printscreen (int fullhist) 1989rxvt_term::scr_printscreen (int fullhist) noexcept
1791{ 1990{
1792#ifdef PRINTPIPE 1991#ifdef PRINTPIPE
1793 int i, r1, nrows, row_offset; 1992 int nrows, row_start;
1794 text_t *t; 1993 FILE *fd = popen_printer ();
1795 FILE *fd;
1796 1994
1797 if ((fd = popen_printer ()) == NULL) 1995 if (!fd)
1798 return; 1996 return;
1799 nrows = TermWin.nrow; 1997
1800 row_offset = TermWin.saveLines;
1801 if (!fullhist) 1998 if (fullhist)
1802 row_offset -= TermWin.view_start; 1999 {
2000 nrows = nrow - top_row;
2001 row_start = top_row;
2002 }
1803 else 2003 else
1804 { 2004 {
1805 nrows += TermWin.nscrolled; 2005 nrows = nrow;
1806 row_offset -= TermWin.nscrolled; 2006 row_start = view_start;
1807 }
1808
1809 for (r1 = 0; r1 < nrows; r1++)
1810 { 2007 }
1811 t = screen.text[r1 + row_offset]; 2008
1812 for (i = TermWin.ncol - 1; i >= 0; i--) 2009 wctomb (0, 0);
1813 if (!isspace (t[i])) 2010
1814 break; 2011 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1815 fprintf (fd, "%.*s\n", (i + 1), t);
1816 } 2012 {
2013 text_t *tp = ROW(r1).t;
2014 int len = ROW(r1).l;
2015
2016 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
2017 {
2018 char mb[MB_LEN_MAX];
2019 text_t t = *tp++;
2020 if (t == NOCHAR)
2021 continue;
2022
2023 len = wctomb (mb, t);
2024
2025 if (len <= 0)
2026 {
2027 mb[0] = ' ';
2028 len = 1;
2029 }
2030
2031 fwrite (mb, 1, len, fd);
2032 }
2033
2034 fputc ('\n', fd);
2035 }
2036
1817 pclose_printer (fd); 2037 pclose_printer (fd);
1818#endif 2038#endif
1819} 2039}
1820 2040
1821/* ------------------------------------------------------------------------- */ 2041/* ------------------------------------------------------------------------- */
1822/* 2042/*
1823 * Refresh the screen 2043 * Refresh the screen
1824 * drawn_text/drawn_rend contain the screen information before the update. 2044 * drawn_text/drawn_rend contain the screen information before the update.
1825 * screen.text/screen.rend contain what the screen will change to. 2045 * screen.text/screen.rend contain what the screen will change to.
1826 */ 2046 */
1827 2047void ecb_hot
1828#define FONT_WIDTH(X, Y) \ 2048rxvt_term::scr_refresh () noexcept
1829 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1830#define FONT_RBEAR(X, Y) \
1831 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1832#define FONT_LBEAR(X, Y) \
1833 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1834#define IS_FONT_CHAR(X, Y) \
1835 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1836
1837void
1838rxvt_term::scr_refresh (unsigned char refresh_type)
1839{ 2049{
1840 unsigned char clearfirst, /* first character writes before cell */
1841 clearlast, /* last character writes beyond cell */
1842 must_clear, /* use draw_string not draw_image_string */
1843 rvid, /* reverse video this position */
1844 showcursor; /* show the cursor */
1845 int16_t col, row, /* column/row we're processing */ 2050 int16_t col, row, /* column/row we're processing */
1846 ocrow; /* old cursor row */ 2051 ocrow; /* old cursor row */
1847 int cursorwidth;
1848 int i, /* tmp */ 2052 int i; /* tmp */
1849 row_offset; /* basic offset in screen structure */ 2053 rend_t ccol1, /* Cursor colour */
1850#ifndef NO_CURSORCOLOR 2054 ccol2; /* Cursor colour2 */
1851 rend_t cc1; /* store colours at cursor position (s) */ 2055 rend_t cur_rend;
1852#endif 2056 int cur_col;
1853 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2057 int cursorwidth;
1854 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1855 2058
2059 want_refresh = 0; /* screen is current */
2060
1856 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2061 if (refresh_type == NO_REFRESH || !mapped)
1857 return; 2062 return;
1858 2063
1859 /* 2064 /*
1860 * A: set up vars 2065 * A: set up vars
1861 */ 2066 */
1862 clearfirst = clearlast = must_clear = 0;
1863
1864 refresh_count = 0; 2067 refresh_count = 0;
1865 2068
1866 row_offset = TermWin.saveLines - TermWin.view_start; 2069 unsigned int old_screen_flags = screen.flags;
1867 2070 bool have_bg = 0;
1868 if ((refresh_type & REFRESH_BOUNDS)) 2071#ifdef HAVE_IMG
1869 { 2072 have_bg = bg_img != 0;
1870 clearfirst = clearlast = 1;
1871 refresh_type &= ~REFRESH_BOUNDS;
1872 }
1873
1874#ifdef XPM_BACKGROUND
1875 must_clear |= (bgPixmap.pixmap != None);
1876#endif
1877#ifdef TRANSPARENT
1878 must_clear |= ((Options & Opt_transparent) && am_transparent);
1879#endif 2073#endif
1880 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2074 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1881 2075
1882 /* 2076 /*
1883 * B: reverse any characters which are selected 2077 * B: reverse any characters which are selected
1884 */ 2078 */
1885 scr_reverse_selection (); 2079 scr_reverse_selection ();
1886 2080
2081 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2082#if ENABLE_OVERLAY
2083 scr_swap_overlay ();
2084#endif
2085
2086 bool showcursor = screen.flags & Screen_VisibleCursor;
2087
1887 /* 2088 /*
1888 * C: set the cursor character (s) 2089 * C: set the cursor character (s)
1889 */ 2090 */
1890 { 2091 {
1891 unsigned char setoldcursor;
1892 rend_t ccol1, /* Cursor colour */
1893 ccol2; /* Cursor colour2 */
1894
1895 showcursor = (screen.flags & Screen_VisibleCursor);
1896 cursorwidth = 0;
1897#ifdef CURSOR_BLINK 2092#ifdef CURSOR_BLINK
1898 if (hidden_cursor) 2093 if (hidden_cursor)
1899 showcursor = 0; 2094 showcursor = 0;
1900#endif 2095#endif
1901 2096
1902 cursorwidth = 0;
1903
1904 if (showcursor) 2097 if (showcursor)
1905 { 2098 {
2099 int col = screen.cur.col;
2100
2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2102 col--;
2103
2104 cursorwidth = 1;
2105 while (col + cursorwidth < ncol
2106 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
1906 cursorwidth++; 2107 cursorwidth++;
1907 2108
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2109 cur_rend = ROW(screen.cur.row).r[col];
1909 [screen.cur.col]); 2110 cur_col = col;
1910 2111
1911 if (showcursor && TermWin.focus) 2112#ifndef NO_CURSORCOLOR
2113 if (ISSET_PIXCOLOR (Color_cursor))
2114 ccol1 = Color_cursor;
2115 else
2116#endif
2117#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2118 ccol1 = fgcolor_of (rstyle);
2119#else
2120 ccol1 = Color_fg;
2121#endif
2122
2123#ifndef NO_CURSORCOLOR
2124 if (ISSET_PIXCOLOR (Color_cursor2))
2125 ccol2 = Color_cursor2;
2126 else
2127#endif
2128#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2129 ccol2 = bgcolor_of (rstyle);
2130#else
2131 ccol2 = Color_bg;
2132#endif
2133
2134 if (focus && cursor_type == 0)
1912 { 2135 {
2136 rend_t rend = cur_rend;
2137
1913 *srp ^= RS_RVid; 2138 rend ^= RS_RVid;
1914#ifndef NO_CURSORCOLOR
1915 cc1 = *srp & (RS_fgMask | RS_bgMask);
1916 if (ISSET_PIXCOLOR (Color_cursor))
1917 ccol1 = Color_cursor;
1918 else
1919#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1920 ccol1 = GET_FGCOLOR (rstyle);
1921#else
1922 ccol1 = Color_fg;
1923#endif
1924 if (ISSET_PIXCOLOR (Color_cursor2))
1925 ccol2 = Color_cursor2;
1926 else
1927#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1928 ccol2 = GET_BGCOLOR (rstyle);
1929#else
1930 ccol2 = Color_bg;
1931#endif
1932 *srp = SET_FGCOLOR (*srp, ccol1); 2139 rend = SET_FGCOLOR (rend, ccol1);
1933 *srp = SET_BGCOLOR (*srp, ccol2); 2140 rend = SET_BGCOLOR (rend, ccol2);
1934#endif
1935 2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
1936 } 2143 }
1937 } 2144 }
1938 2145
1939 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
1940 setoldcursor = 0; 2147 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
1941 if (ocrow != -1) 2148 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2149
2150 // save the current cursor coordinates if the cursor is visible
2151 // and either the window is unfocused or the cursor style is
2152 // underline or vertical bar, so as to clear the outline cursor in
2153 // the next refresh if the cursor moves or becomes invisible
2154 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
1942 { 2155 {
1943 if (screen.cur.row + TermWin.view_start != ocrow 2156 oldcursor.row = screen.cur.row - view_start;
1944 || screen.cur.col != oldcursor.col) 2157 oldcursor.col = screen.cur.col;
1945 {
1946 if (ocrow < TermWin.nrow
1947 && oldcursor.col < TermWin.ncol)
1948 {
1949 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1950 }
1951 if (TermWin.focus || !showcursor)
1952 oldcursor.row = -1;
1953 else
1954 setoldcursor = 1;
1955 }
1956 } 2158 }
1957 else if (!TermWin.focus) 2159 else
1958 setoldcursor = 1;
1959 if (setoldcursor)
1960 {
1961 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1962 oldcursor.row = -1; 2160 oldcursor.row = -1;
1963 else
1964 {
1965 oldcursor.row = screen.cur.row + TermWin.view_start;
1966 oldcursor.col = screen.cur.col;
1967 }
1968 }
1969 } 2161 }
1970 2162
1971#ifndef NO_SLOW_LINK_SUPPORT 2163#ifndef NO_SLOW_LINK_SUPPORT
1972 /* 2164 /*
1973 * D: CopyArea pass - very useful for slower links 2165 * D: CopyArea pass - very useful for slower links
1974 * This has been deliberately kept simple. 2166 * This has been deliberately kept simple.
1975 */ 2167 */
1976 i = num_scr; 2168 if (!display->is_local
1977 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2169 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
1978 && abs (i) < TermWin.nrow && !must_clear) 2170 && abs (num_scr) < nrow && !have_bg)
1979 { 2171 {
1980 int16_t nits; 2172 int16_t nits;
1981 int j; 2173 int i = num_scr;
1982 rend_t *drp2; 2174 int j;
1983 text_t *dtp2;
1984 int len, wlen; 2175 int len, wlen;
1985 2176
1986 j = TermWin.nrow; 2177 j = nrow;
1987 wlen = len = -1; 2178 wlen = len = -1;
1988 row = i > 0 ? 0 : j - 1; 2179 row = i > 0 ? 0 : j - 1;
2180
1989 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2181 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1990 { 2182 {
1991 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2183 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
1992 { 2184 {
1993 stp = screen.text[row + row_offset]; 2185 line_t s = ROW(view_start + row);
1994 srp = screen.rend[row + row_offset];
1995 dtp = drawn_text[row]; 2186 line_t d = drawn_buf[row];
1996 dtp2 = drawn_text[row + i]; 2187 line_t d2 = drawn_buf[row + i];
1997 drp = drawn_rend[row];
1998 drp2 = drawn_rend[row + i];
1999 2188
2000 for (nits = 0, col = TermWin.ncol; col--; ) 2189 for (nits = 0, col = ncol; col--; )
2001 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2190 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2002 nits--; 2191 nits--;
2003 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2192 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2004 nits++; 2193 nits++;
2005 2194
2006 if (nits > 8) /* XXX: arbitrary choice */ 2195 if (nits > 8) /* XXX: arbitrary choice */
2007 { 2196 {
2008 for (col = TermWin.ncol; col--; ) 2197 for (col = ncol; col--; )
2009 { 2198 {
2010 *dtp++ = *dtp2++; 2199 *d.t++ = *d2.t++;
2011 *drp++ = *drp2++; 2200 *d.r++ = *d2.r++;
2012 } 2201 }
2013 2202
2014 if (len == -1) 2203 if (len == -1)
2015 len = row; 2204 len = row;
2016 2205
2017 wlen = row; 2206 wlen = row;
2018 continue; 2207 continue;
2019 } 2208 }
2020 } 2209 }
2021 2210
2022 if (len != -1) 2211 if (len >= 0)
2023 { 2212 {
2024 /* also comes here at end if needed because of >= above */ 2213 /* also comes here at end if needed because of >= above */
2025 if (wlen < len) 2214 if (wlen < len)
2026 SWAP_IT (wlen, len, int); 2215 ::swap (wlen, len);
2027 2216
2028 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); 2217 XGCValues gcv;
2029 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2218
2219 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2220 XCopyArea (dpy, vt, vt,
2030 TermWin.gc, 0, Row2Pixel (len + i), 2221 gc, 0, Row2Pixel (len + i),
2031 (unsigned int)TermWin_TotalWidth (), 2222 (unsigned int)this->width,
2032 (unsigned int)Height2Pixel (wlen - len + 1), 2223 (unsigned int)Height2Pixel (wlen - len + 1),
2033 0, Row2Pixel (len)); 2224 0, Row2Pixel (len));
2225 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2226
2034 len = -1; 2227 len = -1;
2035 } 2228 }
2036 } 2229 }
2037 } 2230 }
2038#endif 2231#endif
2039 2232
2040 /* 2233 /*
2041 * E: main pass across every character 2234 * E: main pass across every character
2042 */ 2235 */
2043 for (row = 0; row < TermWin.nrow; row++) 2236 for (row = 0; row < nrow; row++)
2044 { 2237 {
2045 stp = screen.text[row + row_offset]; 2238 text_t *stp = ROW(view_start + row).t;
2046 srp = screen.rend[row + row_offset]; 2239 rend_t *srp = ROW(view_start + row).r;
2047 dtp = drawn_text[row]; 2240 text_t *dtp = drawn_buf[row].t;
2048 drp = drawn_rend[row]; 2241 rend_t *drp = drawn_buf[row].r;
2049 2242
2050 /* 2243 /*
2051 * E2: OK, now the real pass 2244 * E2: OK, now the real pass
2052 */ 2245 */
2053 int ypixel = (int)Row2Pixel (row); 2246 int ypixel = (int)Row2Pixel (row);
2054 2247
2055 for (col = 0; col < TermWin.ncol; col++) 2248 for (col = 0; col < ncol; col++)
2056 { 2249 {
2057 /* compare new text with old - if exactly the same then continue */ 2250 /* compare new text with old - if exactly the same then continue */
2058 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2251 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2059
2060 if (stp[col] == dtp[col] /* Must match characters to skip. */
2061 && (rend == drp[col] /* Either rendition the same or */
2062 || (stp[col] == ' ' /* space w/ no background change */
2063 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2064 continue; 2252 continue;
2065 2253
2254 // redraw one or more characters
2255
2256 // seek to the beginning of wide characters
2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2258 --col;
2259
2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2066 text_t *text = stp + col; 2261 text_t *text = stp + col;
2067 int count = 1; 2262 int count = 1;
2068 2263
2069 /* redraw one or more characters */
2070
2071 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2072 drp[col] = rend; 2265 drp[col] = rend;
2073 2266
2074 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2075 continue;
2076
2077 int xpixel = Col2Pixel (col); 2267 int xpixel = Col2Pixel (col);
2078 2268
2079 // this loop looks very messy, it can probably be optimized
2080 // and cleaned a bit by you?
2081 for (i = 0; ++col < TermWin.ncol; ) 2269 for (i = 0; ++col < ncol; )
2082 { 2270 {
2083 if (stp[col] == NOCHAR) 2271 if (stp[col] == NOCHAR)
2084 { 2272 {
2085 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2086 drp[col] = rend; 2274 drp[col] = srp[col];
2275
2087 count++; 2276 count++;
2088
2089 if (i) // only possible skip if char unchanged
2090 i++; 2277 i++;
2091 2278
2092 continue; 2279 continue;
2093 } 2280 }
2094 2281
2095 if (rend != srp[col]) 2282 if (!RS_SAME (rend, srp[col]))
2096 break; 2283 break;
2097 2284
2098 count++; 2285 count++;
2099 2286
2100 if (stp[col] != dtp[col] 2287 if (stp[col] != dtp[col]
2101 || srp[col] != drp[col]) 2288 || !RS_SAME (srp[col], drp[col]))
2102 { 2289 {
2103 if (must_clear && (i++ > (count / 2))) 2290 if (have_bg && (i++ > count / 2))
2104 break; 2291 break;
2105 2292
2106 dtp[col] = stp[col]; 2293 dtp[col] = stp[col];
2107 drp[col] = rend; 2294 drp[col] = rend;
2108 i = 0; 2295 i = 0;
2109 } 2296 }
2110 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2297 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2111 break; 2298 break;
2112 } 2299 }
2113 2300
2114 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2115 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2303
2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2306 count++, i--;
2116 2307
2117 /* 2308 /*
2118 * Determine the attributes for the string 2309 * Determine the attributes for the string
2119 */ 2310 */
2120 int fid = GET_FONT (rend);
2121 int fore = GET_FGCOLOR (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2122 int back = GET_BGCOLOR (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2123 2313
2124 rend = GET_ATTR (rend); 2314 // only do special processing if any attributes are set, which is unlikely
2125 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2126 rvid = !! (rend & RS_RVid);
2127 if (rvid)
2128 { 2316 {
2129 SWAP_IT (fore, back, int); 2317 bool invert = rend & RS_RVid;
2130 2318
2131#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2320 if (rend & RS_Bold && fore == Color_fg)
2321 {
2132 if (ISSET_PIXCOLOR (Color_RV) 2322 if (ISSET_PIXCOLOR (Color_BD))
2133# ifndef NO_CURSORCOLOR 2323 fore = Color_BD;
2134 && !ISSET_PIXCOLOR (Color_cursor) 2324# if !ENABLE_STYLES
2325 else
2326 invert = !invert;
2135# endif 2327# endif
2136 ) 2328 }
2329
2330 if (rend & RS_Italic && fore == Color_fg)
2331 {
2332 if (ISSET_PIXCOLOR (Color_IT))
2137 back = Color_RV; 2333 fore = Color_IT;
2334# if !ENABLE_STYLES
2335 else
2336 invert = !invert;
2138#endif 2337# endif
2338 }
2139 2339
2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2341 fore = Color_UL;
2342#endif
2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2362#endif
2363
2364 if (invert)
2365 {
2366 ::swap (fore, back);
2367
2368#ifndef NO_BOLD_UNDERLINE_REVERSE
2369 if (fore == back)
2370 {
2371 fore = Color_bg;
2372 back = Color_fg;
2373 }
2374#endif
2375 }
2376
2377#ifdef TEXT_BLINK
2378 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2379 {
2380 if (!text_blink_ev.is_active ())
2381 {
2382 text_blink_ev.again ();
2383 hidden_text = 0;
2384 }
2385 else if (hidden_text)
2386 fore = back;
2387 }
2388#endif
2389
2390#if ENABLE_STYLES
2391 // "careful" (too wide) character handling
2392
2393 // include previous careful character(s) if possible, looks nicer (best effort...)
2394 while (text > stp
2395 && srp[text - stp - 1] & RS_Careful
2396 && RS_SAME (rend, srp[text - stp - 1]))
2397 text--, count++, xpixel -= fwidth;
2398
2399 // force redraw after "careful" characters to avoid pixel droppings
2400 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2401 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2402
2403 // force redraw before "careful" characters to avoid pixel droppings
2404 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2405 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2406#endif
2140 } 2407 }
2141#ifdef TEXT_BLINK
2142 if (rend & RS_Blink)
2143 {
2144 if (!text_blink_ev.active)
2145 {
2146 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2147 hidden_text = 0;
2148 }
2149 else if (hidden_text)
2150 fore = back;
2151 }
2152#endif
2153#ifndef NO_BOLD_UNDERLINE_REVERSE
2154 else if (rend & RS_Bold)
2155 {
2156 if (ISSET_PIXCOLOR (Color_BD))
2157 fore = Color_BD;
2158 else if (fore == Color_fg)
2159 fore = Color_White;
2160 }
2161 else if (rend & RS_Uline)
2162 {
2163 if (ISSET_PIXCOLOR (Color_UL))
2164 fore = Color_UL;
2165 }
2166#endif
2167 2408
2168 /* 2409 /*
2169 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2170 */ 2411 */
2171 rxvt_font *font = (*TermWin.fontset)[fid]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2172 2413
2173 if (back == fore) 2414 if (ecb_likely (have_bg && back == Color_bg))
2174 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2175 TermWin.fwidth * count, TermWin.fheight,
2176 back);
2177 else if (back == Color_bg)
2178 { 2415 {
2179 if (must_clear) 2416 // this is very ugly, maybe push it into ->draw?
2180 {
2181 CLEAR_CHARS (xpixel, ypixel, count);
2182 2417
2183 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2184 if (text[i] != ' ') 2419 if (text[i] != ' ')
2185 { 2420 {
2186 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2421 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2187 break; 2422 goto did_clear;
2188 }
2189 } 2423 }
2190 else 2424
2191 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2425 CLEAR_CHARS (xpixel, ypixel, count);
2426 did_clear: ;
2192 } 2427 }
2193 else 2428 else
2194 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2195 2430
2196 if ((rend & RS_Uline) && (font->descent > 1)) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2197 XDrawLine (display->display, drawBuffer, TermWin.gc, 2432 {
2433 if (showcursor && focus && row == screen.cur.row
2434 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2436 else
2437#if ENABLE_FRILLS
2438 if (ISSET_PIXCOLOR (Color_underline))
2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2440 else
2441#endif
2442 XSetForeground (dpy, gc, pix_colors[fore]);
2443
2444 XDrawLine (dpy, vt, gc,
2198 xpixel, ypixel + font->ascent + 1, 2445 xpixel, ypixel + font->ascent + 1,
2199 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2446 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2447 }
2200 } /* for (col....) */ 2448 } /* for (col....) */
2201 } /* for (row....) */ 2449 } /* for (row....) */
2202 2450
2203 /* 2451 /*
2204 * G: cleanup cursor and display outline cursor if necessary 2452 * G: cleanup cursor and display outline cursor if necessary
2205 */ 2453 */
2206 if (showcursor) 2454 if (showcursor)
2207 { 2455 {
2208 if (TermWin.focus) 2456 if (focus)
2457 {
2458 if (cursor_type == 0)
2459 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2460 else if (oldcursor.row >= 0)
2209 { 2461 {
2210 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2211 [screen.cur.col]); 2463 if (cursor_type == 1)
2212 *srp ^= RS_RVid; 2464 XFillRectangle (dpy, vt, gc,
2213#ifndef NO_CURSORCOLOR 2465 Col2Pixel (cur_col),
2214 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2466 Row2Pixel (oldcursor.row + 1) - 2,
2215#endif 2467 Width2Pixel (1),
2216 2468 2);
2469 else
2470 XFillRectangle (dpy, vt, gc,
2471 Col2Pixel (cur_col),
2472 Row2Pixel (oldcursor.row),
2473 2,
2474 Height2Pixel (1));
2475 }
2217 } 2476 }
2218 else if (oldcursor.row >= 0) 2477 else if (oldcursor.row >= 0)
2219 { 2478 {
2220#ifndef NO_CURSORCOLOR 2479 XSetForeground (dpy, gc, pix_colors[ccol1]);
2221 if (ISSET_PIXCOLOR (Color_cursor)) 2480
2222 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2481 XDrawRectangle (dpy, vt, gc,
2223#endif
2224 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2225 Col2Pixel (oldcursor.col), 2482 Col2Pixel (cur_col),
2226 Row2Pixel (oldcursor.row), 2483 Row2Pixel (oldcursor.row),
2227 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2484 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2228 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2485 (unsigned int) (Height2Pixel (1) - 1));
2229 } 2486 }
2230 } 2487 }
2231 2488
2232 /* 2489 /*
2233 * H: cleanup selection 2490 * H: cleanup selection
2234 */ 2491 */
2492#if ENABLE_OVERLAY
2493 scr_swap_overlay ();
2494#endif
2495 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2496
2235 scr_reverse_selection (); 2497 scr_reverse_selection ();
2236 2498
2237 /* 2499 screen.flags = old_screen_flags;
2238 * I: other general cleanup
2239 */
2240 if (clearfirst && TermWin.int_bwidth)
2241 /*
2242 * clear the whole screen height, note that width == 0 is treated
2243 * specially by XClearArea
2244 */
2245 XClearArea (display->display, TermWin.vt, 0, 0,
2246 (unsigned int)TermWin.int_bwidth,
2247 (unsigned int)TermWin_TotalHeight (), False);
2248 if (clearlast && TermWin.int_bwidth)
2249 /*
2250 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea
2252 */
2253 XClearArea (display->display, TermWin.vt,
2254 TermWin.width + TermWin.int_bwidth, 0,
2255 (unsigned int)TermWin.int_bwidth,
2256 (unsigned int)TermWin_TotalHeight (), False);
2257 if (refresh_type & SMOOTH_REFRESH)
2258 XSync (display->display, False);
2259
2260 num_scr = 0; 2500 num_scr = 0;
2261 num_scr_allow = 1; 2501 num_scr_allow = 1;
2262 want_refresh = 0; /* screen is current */
2263} 2502}
2264 2503
2265void 2504void ecb_cold
2266rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2505rxvt_term::scr_remap_chars (line_t &l) noexcept
2267{ 2506{
2268 if (!rp || !tp) 2507 if (!l.valid ())
2269 return; 2508 return;
2270 2509
2271 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2510 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2272 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2273}
2274 2511
2275void 2512 for (int i = ncol; i--; )
2513 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2514}
2515
2516void ecb_cold
2276rxvt_term::scr_remap_chars () 2517rxvt_term::scr_remap_chars () noexcept
2277{ 2518{
2278 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2519 for (int i = total_rows; i--; )
2279 scr_remap_chars (screen.text[i], screen.rend[i]); 2520 scr_remap_chars (row_buf [i]);
2280 2521
2281 for (int i = TermWin.nrow; i--; ) 2522 for (int i = nrow; i--; )
2282 {
2283 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2284 scr_remap_chars (swap.text[i], swap.rend[i]);
2285 } 2523 {
2524 scr_remap_chars (drawn_buf [i]);
2525 scr_remap_chars (swap_buf [i]);
2526 }
2286} 2527}
2287 2528
2288/* ------------------------------------------------------------------------- */ 2529void ecb_cold
2289void 2530rxvt_term::scr_recolor (bool refresh) noexcept
2290rxvt_term::scr_clear ()
2291{ 2531{
2532 bool transparent = false;
2533
2534#ifdef HAVE_IMG
2535 if (bg_img != 0)
2536 {
2537# if ENABLE_TRANSPARENCY
2538 if (bg_flags & BG_IS_TRANSPARENT)
2539 {
2540 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2541 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2542
2543 transparent = true;
2544 }
2545 else
2546# endif
2547 {
2548 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2549 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2550 }
2551 }
2552 else
2553#endif
2554 {
2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2556 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2557 }
2558
2559 XClearWindow (dpy, parent);
2560
2561 if (scrollBar.state && scrollBar.win)
2562 {
2563 if (transparent)
2564 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2565 else
2566 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2567 scrollBar.state = SB_STATE_IDLE;
2568 scrollBar.show (0);
2569 }
2570
2571 if (refresh)
2572 {
2573 scr_clear ();
2574 scr_touch (true);
2575 }
2576 want_refresh = 1;
2577}
2578
2579/* ------------------------------------------------------------------------- */
2580void
2581rxvt_term::scr_clear (bool really) noexcept
2582{
2292 if (!TermWin.mapped) 2583 if (!mapped)
2293 return; 2584 return;
2294 2585
2295 num_scr_allow = 0; 2586 num_scr_allow = 0;
2296 want_refresh = 1; 2587 want_refresh = 1;
2297#ifdef TRANSPARENT 2588
2298 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2589 if (really)
2590 XClearWindow (dpy, vt);
2591}
2592
2593void
2594rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2595{
2596 int view_end = view_start + nrow;
2597 int row, col;
2598
2599 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2600 {
2601 text_t *stp = ROW(row).t;
2602 rend_t *srp = ROW(row).r;
2603
2604 for (col = beg_col; col < end_col; col++)
2605 srp[col] ^= rstyle1;
2606
2607 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2608 srp[col] ^= rstyle2;
2609
2610 if (++col < end_col)
2611 srp[col] ^= rstyle2;
2299 { 2612 }
2300 int i; 2613}
2301 2614
2302 if (! (Options & Opt_transparent_all)) 2615void
2616rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2617{
2618 int view_end = view_start + nrow;
2619 int row, col;
2620
2621 if (beg_row >= view_start)
2622 {
2623 col = beg_col;
2624 row = beg_row;
2625 }
2626 else
2627 {
2303 i = 0; 2628 col = 0;
2629 row = view_start;
2630 }
2631
2632 for (; row < min (end_row, view_end); row++, col = 0)
2633 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2634 srp[col] ^= rstyle;
2635
2636 if (row == end_row)
2637 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2638 srp[col] ^= rstyle;
2639}
2640
2641/* ------------------------------------------------------------------------- */
2642void ecb_hot
2643rxvt_term::scr_reverse_selection () noexcept
2644{
2645 if (selection.op
2646 && current_screen == selection.screen
2647 && selection.end.row >= view_start)
2648 {
2649#if !ENABLE_MINIMAL
2650 if (selection.rect)
2651 scr_xor_rect (selection.beg.row, selection.beg.col,
2652 selection.end.row, selection.end.col,
2653 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2304 else 2654 else
2305 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2306
2307 while (i--)
2308 if (TermWin.parent[i] != None)
2309 XClearWindow (display->display, TermWin.parent[i]);
2310 }
2311#endif 2655#endif
2312 2656 scr_xor_span (selection.beg.row, selection.beg.col,
2313 XClearWindow (display->display, TermWin.vt); 2657 selection.end.row, selection.end.col,
2314} 2658 RS_Sel | RS_RVid);
2315
2316/* ------------------------------------------------------------------------- */
2317void
2318rxvt_term::scr_reverse_selection ()
2319{
2320 int i, col, row, end_row;
2321 rend_t *srp;
2322
2323 if (selection.op && current_screen == selection.screen)
2324 {
2325 end_row = TermWin.saveLines - TermWin.view_start;
2326 i = selection.beg.row + TermWin.saveLines;
2327 row = selection.end.row + TermWin.saveLines;
2328 if (i >= end_row)
2329 col = selection.beg.col;
2330 else
2331 {
2332 col = 0;
2333 i = end_row;
2334 }
2335 end_row += TermWin.nrow;
2336 for (; i < row && i < end_row; i++, col = 0)
2337 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2338 srp[col] ^= RS_RVid;
2339 if (i == row && i < end_row)
2340 for (srp = screen.rend[i]; col < selection.end.col; col++)
2341 srp[col] ^= RS_RVid;
2342 } 2659 }
2343} 2660}
2344 2661
2345/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2346/* 2663/*
2347 * Dump the whole scrollback and screen to the passed filedescriptor. The 2664 * Dump the whole scrollback and screen to the passed filedescriptor. The
2348 * invoking routine must close the fd. 2665 * invoking routine must close the fd.
2349 */ 2666 */
2350#if 0 2667#if 0
2351void 2668void
2352rxvt_term::scr_dump (int fd) 2669rxvt_term::scr_dump (int fd) noexcept
2353{ 2670{
2354 int row, wrote; 2671 // if this method is needed, it can be implemented by factoring the
2355 unsigned int width, towrite; 2672 // relevant code in scr_printscreen
2356 char r1[] = "\n";
2357
2358 for (row = TermWin.saveLines - TermWin.nscrolled;
2359 row < TermWin.saveLines + TermWin.nrow - 1; row++)
2360 {
2361 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2362 : TermWin.ncol;
2363 for (towrite = width; towrite; towrite -= wrote)
2364 {
2365 wrote = write (fd, & (screen.text[row][width - towrite]),
2366 towrite);
2367 if (wrote < 0)
2368 return; /* XXX: death, no report */
2369 }
2370 if (screen.tlen[row] >= 0)
2371 if (write (fd, r1, 1) <= 0)
2372 return; /* XXX: death, no report */
2373 }
2374} 2673}
2375#endif 2674#endif
2376 2675
2377/* ------------------------------------------------------------------------- * 2676/* ------------------------------------------------------------------------- *
2378 * CHARACTER SELECTION * 2677 * CHARACTER SELECTION *
2379 * ------------------------------------------------------------------------- */ 2678 * ------------------------------------------------------------------------- */
2380
2381/*
2382 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2383 */
2384void 2679void
2385rxvt_term::selection_check (int check_more) 2680rxvt_term::selection_check (int check_more) noexcept
2386{ 2681{
2387 row_col_t pos;
2388
2389 if (!selection.op) 2682 if (!selection.op)
2390 return; 2683 return;
2391 2684
2392 pos.row = pos.col = 0; 2685 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2393 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2686 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2394 || (selection.beg.row >= TermWin.nrow) 2687 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2395 || (selection.mark.row < - (int32_t)TermWin.nscrolled)
2396 || (selection.mark.row >= TermWin.nrow)
2397 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2398 || (selection.end.row >= TermWin.nrow)
2399 || (check_more == 1 2688 || (check_more == 1
2400 && current_screen == selection.screen 2689 && current_screen == selection.screen
2401 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2690 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2402 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2691 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2403 || (check_more == 2
2404 && ROWCOL_IS_BEFORE (selection.beg, pos)
2405 && ROWCOL_IS_AFTER (selection.end, pos))
2406 || (check_more == 3
2407 && ROWCOL_IS_AFTER (selection.end, pos))
2408 || (check_more == 4 /* screen width change */
2409 && (selection.beg.row != selection.end.row
2410 || selection.end.col > TermWin.ncol)))
2411 CLEAR_SELECTION (); 2692 CLEAR_ALL_SELECTION ();
2693}
2694
2695void
2696rxvt_term::selection_changed () noexcept
2697{
2698 line_t &r1 = ROW (selection.beg.row);
2699 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2700 ++selection.beg.col;
2701
2702 line_t &r2 = ROW (selection.end.row);
2703 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2704 ++selection.end.col;
2705
2706 want_refresh = 1;
2412} 2707}
2413 2708
2414/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2415/* 2710/*
2416 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2417 */ 2712 */
2418void 2713void
2419rxvt_term::paste (const unsigned char *data, unsigned int len) 2714rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2420{ 2715{
2421 unsigned int i, j, n;
2422 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2423
2424#if 0
2425 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2426 ZERO_SCROLLBACK (r);
2427#endif
2428
2429 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2430 for (i = 0; i < len; i += PROP_SIZE) 2717 for (unsigned int i = 0; i < len; i++)
2431 { 2718 if (data[i] == C0_LF)
2432 n = min (len - i, PROP_SIZE); 2719 data[i] = C0_CR;
2433 MEMCPY (ds, data + i, n);
2434 2720
2435 for (j = 0; j < n; j++) 2721 #if ENABLE_FRILLS
2436 if (ds[j] == '\n') 2722 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2437 ds[j] = '\r'; 2723 tt_printf ("\x1b[200~");
2724 #endif
2438 2725
2439 tt_write (ds, (int)n); 2726 tt_write (data, len);
2440 }
2441 2727
2442 free (ds); 2728 #if ENABLE_FRILLS
2729 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2730 tt_printf ("\x1b[201~");
2731 #endif
2443} 2732}
2444 2733
2445/* ------------------------------------------------------------------------- */
2446/*
2447 * Respond to a notification that a primary selection has been sent
2448 * EXT: SelectionNotify
2449 */
2450int
2451rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2452{
2453 long nread = 0;
2454 unsigned long bytes_after;
2455 XTextProperty ct;
2456
2457 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2458
2459 if (prop == None) /* check for failed XConvertSelection */
2460 {
2461 if ((selection_type & Sel_CompoundText))
2462 {
2463 int selnum = selection_type & Sel_whereMask;
2464
2465 selection_type = 0;
2466 if (selnum != Sel_direct)
2467 selection_request_other (XA_STRING, selnum);
2468 }
2469
2470 if ((selection_type & Sel_UTF8String))
2471 {
2472 int selnum = selection_type & Sel_whereMask;
2473
2474 selection_type = Sel_CompoundText;
2475 if (selnum != Sel_direct)
2476 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2477 else
2478 selection_type = 0;
2479 }
2480
2481 return 0;
2482 }
2483
2484 for (;;)
2485 {
2486 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2487 (long) (PROP_SIZE / 4), delete_prop,
2488 AnyPropertyType, &ct.encoding, &ct.format,
2489 &ct.nitems, &bytes_after,
2490 &ct.value) != Success)
2491 break;
2492
2493 if (ct.encoding == 0)
2494 {
2495 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2496 break;
2497 }
2498
2499 if (ct.value == NULL)
2500 {
2501 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2502 continue;
2503 }
2504
2505 if (ct.nitems == 0)
2506 {
2507 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2508 if (selection_wait == Sel_normal && nread == 0)
2509 {
2510 /*
2511 * pass through again trying CUT_BUFFER0 if we've come from
2512 * XConvertSelection () but nothing was presented
2513 */
2514 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2515 selection_paste (display->root, XA_CUT_BUFFER0, False);
2516 }
2517
2518 nread = -1; /* discount any previous stuff */
2519 break;
2520 }
2521
2522 nread += ct.nitems;
2523
2524 char **cl;
2525 int cr;
2526 if (XmbTextPropertyToTextList (display->display, &ct, &cl,
2527 &cr) >= 0 && cl)
2528 {
2529 for (int i = 0; i < cr; i++)
2530 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2531
2532 XFreeStringList (cl);
2533 }
2534 else
2535 paste (ct.value, ct.nitems);
2536
2537 if (bytes_after == 0)
2538 break;
2539
2540 XFree (ct.value);
2541 }
2542
2543 if (ct.value)
2544 XFree (ct.value);
2545
2546 if (selection_wait == Sel_normal)
2547 selection_wait = Sel_none;
2548
2549 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2550 return (int)nread;
2551}
2552
2553void 2734void
2554rxvt_term::incr_cb (time_watcher &w) 2735rxvt_term::paste (char *data, unsigned int len) noexcept
2555{ 2736{
2556 selection_wait = Sel_none; 2737 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2557
2558 rxvt_print_error ("data loss: timeout on INCR selection paste");
2559}
2560
2561/*
2562 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2563 */
2564void
2565rxvt_term::selection_property (Window win, Atom prop)
2566{
2567 int reget_time = 0;
2568
2569 if (prop == None)
2570 return; 2738 return;
2571 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2572 if (selection_wait == Sel_normal)
2573 {
2574 int a, afmt;
2575 Atom atype;
2576 unsigned long bytes_after, nitems;
2577 unsigned char *s = NULL;
2578 2739
2579 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2740 tt_paste (data, len);
2580 xa[XA_INCR], &atype, &afmt, &nitems,
2581 &bytes_after, &s);
2582 if (s)
2583 XFree (s);
2584 if (a != Success)
2585 return;
2586#ifndef __CYGWIN32__
2587 if (atype == xa[XA_INCR])
2588 { /* start an INCR transfer */
2589 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2590 XDeleteProperty (display->display, win, prop);
2591 XFlush (display->display);
2592 reget_time = 1;
2593 selection_wait = Sel_incr;
2594 }
2595#endif
2596
2597 }
2598 else if (selection_wait == Sel_incr)
2599 {
2600 reget_time = 1;
2601 if (selection_paste (win, prop, True) == -1)
2602 {
2603 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2604 selection_wait = Sel_none;
2605 incr_ev.stop ();
2606 }
2607 }
2608 if (reget_time) /* received more data so reget time */
2609 incr_ev.start (NOW + 10);
2610} 2741}
2742
2611/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2612/* 2744/*
2613 * Request the current selection: 2745 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2614 * Order: > internal selection if available 2746 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2615 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2747 * as fallback
2616 * > CUT_BUFFER0
2617 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2618 * will auto fallback to CUT_BUFFER0
2619 * EXT: button 2 release 2748 * EXT: button 2 release
2620 */ 2749 */
2621void 2750void
2622rxvt_term::selection_request (Time tm, int x, int y) 2751rxvt_term::selection_request (Time tm, int selnum) noexcept
2623{ 2752{
2624 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2753 if (!selection_req)
2625 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2626 return; /* outside window */
2627
2628 if (selection.text != NULL)
2629 { /* internal selection */
2630 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2631 paste (selection.text, selection.len);
2632 return;
2633 } 2754 {
2634 else 2755 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2756 selection_req->run ();
2635 { 2757 }
2636 int i;
2637
2638 selection_request_time = tm;
2639 selection_wait = Sel_normal;
2640 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2641 {
2642#if X_HAVE_UTF8_STRING
2643 selection_type = Sel_UTF8String;
2644 if (selection_request_other (xa[XA_UTF8_STRING], i))
2645 return;
2646#else
2647 selection_type = Sel_CompoundText;
2648 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2649 return;
2650#endif
2651
2652 }
2653 }
2654 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2655 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2656 selection_paste (display->root, XA_CUT_BUFFER0, False);
2657}
2658
2659int
2660rxvt_term::selection_request_other (Atom target, int selnum)
2661{
2662 Atom sel;
2663#ifdef DEBUG_SELECT
2664 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2665#endif
2666
2667 selection_type |= selnum;
2668 if (selnum == Sel_Primary)
2669 sel = XA_PRIMARY;
2670 else if (selnum == Sel_Secondary)
2671 sel = XA_SECONDARY;
2672 else
2673 sel = xa[XA_CLIPBOARD];
2674 if (XGetSelectionOwner (display->display, sel) != None)
2675 {
2676 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2677 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2678 TermWin.vt, selection_request_time);
2679 return 1;
2680 }
2681 return 0;
2682} 2758}
2683 2759
2684/* ------------------------------------------------------------------------- */ 2760/* ------------------------------------------------------------------------- */
2685/* 2761/*
2686 * Clear all selected text 2762 * Clear all selected text
2687 * EXT: SelectionClear 2763 * EXT: SelectionClear
2688 */ 2764 */
2689void 2765void
2690rxvt_term::selection_clear () 2766rxvt_term::selection_clear (bool clipboard) noexcept
2691{ 2767{
2692 D_SELECT ((stderr, "rxvt_selection_clear ()")); 2768 if (!clipboard)
2693 2769 {
2694 want_refresh = 1; 2770 want_refresh = 1;
2695 free (selection.text); 2771 free (selection.text);
2696 selection.text = NULL; 2772 selection.text = NULL;
2697 selection.len = 0; 2773 selection.len = 0;
2698 CLEAR_SELECTION (); 2774 CLEAR_SELECTION ();
2775
2776 if (display->selection_owner == this)
2777 display->selection_owner = 0;
2778 }
2779 else
2780 {
2781 free (selection.clip_text);
2782 selection.clip_text = NULL;
2783 selection.clip_len = 0;
2784
2785 if (display->clipboard_owner == this)
2786 display->clipboard_owner = 0;
2787 }
2699} 2788}
2700 2789
2701/* ------------------------------------------------------------------------- */ 2790/* ------------------------------------------------------------------------- */
2702/* 2791/*
2703 * Copy a selection into the cut buffer 2792 * Copy a selection into the cut buffer
2704 * EXT: button 1 or 3 release 2793 * EXT: button 1 or 3 release
2705 */ 2794 */
2706void 2795void
2707rxvt_term::selection_make (Time tm) 2796rxvt_term::selection_make (Time tm)
2708{ 2797{
2709 int i, col, end_col, row, end_row; 2798 int size;
2710 unsigned char *new_selection_text; 2799 wchar_t *new_selection_text;
2711 char *str;
2712 text_t *t; 2800 text_t *t;
2713#ifdef ACS_ASCII
2714 rend_t *re;
2715#endif
2716 2801
2717 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2718 switch (selection.op) 2802 switch (selection.op)
2719 { 2803 {
2720 case SELECTION_CONT: 2804 case SELECTION_CONT:
2721 break; 2805 break;
2722 case SELECTION_INIT: 2806 case SELECTION_INIT:
… …
2726 selection.op = SELECTION_DONE; 2810 selection.op = SELECTION_DONE;
2727 /* FALLTHROUGH */ 2811 /* FALLTHROUGH */
2728 default: 2812 default:
2729 return; 2813 return;
2730 } 2814 }
2815
2731 selection.op = SELECTION_DONE; 2816 selection.op = SELECTION_DONE;
2732 2817
2733 if (selection.clicks == 4) 2818 if (selection.clicks == 4)
2734 return; /* nothing selected, go away */ 2819 return; /* nothing selected, go away */
2735 2820
2821 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2822 return;
2823
2736 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2824 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2737 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2825 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2738 2826
2739 new_selection_text = (unsigned char *)str; 2827 int ofs = 0;
2828 int extra = 0;
2740 2829
2741 col = selection.beg.col; 2830 int col = selection.beg.col;
2742 MAX_IT (col, 0); 2831 int row = selection.beg.row;
2743 row = selection.beg.row + TermWin.saveLines;
2744 end_row = selection.end.row + TermWin.saveLines;
2745 2832
2833 int end_col;
2834
2746 for (; row <= end_row; row++, col = 0) 2835 for (; row <= selection.end.row; row++, col = 0)
2747 { 2836 {
2748 t = & (screen.text[row][col]); 2837#if !ENABLE_MINIMAL
2749 2838 if (selection.rect)
2750 end_col = screen.tlen[row]; 2839 {
2751 2840 col = selection.beg.col;
2752 if (end_col == -1)
2753 end_col = TermWin.ncol; 2841 end_col = selection.end.col;
2842 }
2843 else
2844#endif
2845 end_col = ROW(row).l;
2754 2846
2847 col = max (col, 0);
2848
2755 if (row == end_row) 2849 if (row == selection.end.row)
2756 MIN_IT (end_col, selection.end.col); 2850 min_it (end_col, selection.end.col);
2851
2852 t = ROW(row).t + col;
2757 2853
2758 for (; col < end_col; col++) 2854 for (; col < end_col; col++)
2855 {
2759 if (*t == NOCHAR) 2856 if (*t == NOCHAR)
2760 t++; 2857 t++;
2858#if ENABLE_COMBINING
2859 else if (IS_COMPOSE (*t))
2860 {
2861 int len = rxvt_composite.expand (*t);
2862
2863 extra -= (len - 1);
2864
2865 if (extra < 0)
2866 {
2867 extra += size;
2868 size += size;
2869 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2870 }
2871
2872 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2873 }
2874#endif
2761 else 2875 else
2762 { 2876 new_selection_text[ofs++] = *t++;
2763 int len = wctomb (str, *t++);
2764 if (len > 0)
2765 str += len;
2766 } 2877 }
2767 2878
2768 if (screen.tlen[row] != -1 && row != end_row) 2879#if !ENABLE_MINIMAL
2769 *str++ = '\n'; 2880 if (selection.rect)
2770 } 2881 {
2882 while (ofs
2883 && new_selection_text[ofs - 1] != C0_LF
2884 && unicode::is_space (new_selection_text[ofs - 1]))
2885 --ofs;
2771 2886
2772#ifndef NO_OLD_SELECTION 2887 new_selection_text[ofs++] = C0_LF;
2773 if (selection_style == OLD_SELECT) 2888 }
2774 if (end_col == TermWin.ncol) 2889 else
2775 *str++ = '\n';
2776#endif 2890#endif
2777#ifndef NO_NEW_SELECTION 2891 if (!ROW(row).is_longer ()
2778 if (selection_style != OLD_SELECT) 2892 && (row != selection.end.row || end_col != selection.end.col)
2779 if (end_col != selection.end.col) 2893 && (row != selection.beg.row || selection.beg.col < ncol))
2780 *str++ = '\n'; 2894 new_selection_text[ofs++] = C0_LF;
2781#endif 2895 }
2782 *str = '\0';
2783 2896
2784 i = str - (char *)new_selection_text; 2897 new_selection_text[ofs] = 0;
2898
2785 if (i == 0) 2899 if (ofs == 0)
2786 { 2900 {
2787 free (new_selection_text); 2901 free (new_selection_text);
2788 return; 2902 return;
2789 } 2903 }
2790 2904
2791 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2792 if (str - (char *)new_selection_text > 1024)
2793 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2794
2795 selection.len = i;
2796
2797 if (selection.text)
2798 free (selection.text); 2905 free (selection.text);
2799 2906
2800 selection.text = new_selection_text; 2907 // we usually allocate much more than necessary, so realloc it smaller again
2908 selection.len = ofs;
2909 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2801 2910
2802 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2911 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2803 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2912 return;
2804 display->set_selection_owner (this); 2913
2914 selection_grab (tm);
2915}
2916
2917bool
2918rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
2919{
2920 Atom sel;
2921
2922 if (!clipboard)
2923 {
2924 selection_time = tm;
2925 sel = XA_PRIMARY;
2926 }
2805 else 2927 else
2806 rxvt_print_error ("can't get primary selection");
2807
2808 { 2928 {
2929 clipboard_time = tm;
2930 sel = xa[XA_CLIPBOARD];
2931 }
2932
2933 XSetSelectionOwner (dpy, sel, vt, tm);
2934 if (XGetSelectionOwner (dpy, sel) == vt)
2935 {
2936 display->set_selection_owner (this, clipboard);
2937 return true;
2938 }
2939 else
2940 {
2941 selection_clear (clipboard);
2942 return false;
2943 }
2944
2945#if 0
2809 XTextProperty ct; 2946 XTextProperty ct;
2810 char *cl = (char *)selection.text;
2811 2947
2812 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2948 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
2813 { 2949 {
2814 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2950 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2815 PropModeReplace, ct.value, ct.nitems);
2816 XFree (ct.value); 2951 XFree (ct.value);
2817 } 2952 }
2818 else 2953#endif
2819 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2820 PropModeReplace, selection.text, (int)selection.len);
2821 }
2822
2823 selection_time = tm;
2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2825} 2954}
2826 2955
2827/* ------------------------------------------------------------------------- */ 2956/* ------------------------------------------------------------------------- */
2828/* 2957/*
2829 * Mark or select text based upon number of clicks: 1, 2, or 3 2958 * Mark or select text based upon number of clicks: 1, 2, or 3
2830 * EXT: button 1 press 2959 * EXT: button 1 press
2831 */ 2960 */
2832void 2961void ecb_cold
2833rxvt_term::selection_click (int clicks, int x, int y) 2962rxvt_term::selection_click (int clicks, int x, int y) noexcept
2834{ 2963{
2835 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2836
2837 clicks = ((clicks - 1) % 3) + 1; 2964 clicks = ((clicks - 1) % 3) + 1;
2838 selection.clicks = clicks; /* save clicks so extend will work */ 2965 selection.clicks = clicks; /* save clicks so extend will work */
2839 2966
2967 if (clicks == 2 && !selection.rect
2968 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
2969 {
2970 MEvent.clicks = 1; // what a mess
2971 selection.screen = current_screen;
2972 selection.op = SELECTION_CONT;
2973 return;
2974 }
2975
2840 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2976 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2841 2977
2842 if (clicks == 2 || clicks == 3) 2978 if (clicks == 2 || clicks == 3)
2843 selection_extend_colrow (selection.mark.col, 2979 selection_extend_colrow (selection.mark.col,
2844 selection.mark.row + TermWin.view_start, 2980 selection.mark.row - view_start,
2845 0, /* button 3 */ 2981 0, /* button 3 */
2846 1, /* button press */ 2982 1, /* button press */
2847 0); /* click change */ 2983 0); /* click change */
2848} 2984}
2849 2985
2850/* ------------------------------------------------------------------------- */ 2986/* ------------------------------------------------------------------------- */
2851/* 2987/*
2852 * Mark a selection at the specified col/row 2988 * Mark a selection at the specified col/row
2853 */ 2989 */
2854void 2990void ecb_cold
2855rxvt_term::selection_start_colrow (int col, int row) 2991rxvt_term::selection_start_colrow (int col, int row) noexcept
2856{ 2992{
2857 want_refresh = 1; 2993 want_refresh = 1;
2994
2995 selection.mark.row = row + view_start;
2858 selection.mark.col = col; 2996 selection.mark.col = col;
2859 selection.mark.row = row - TermWin.view_start; 2997
2860 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2998 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2861 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2999 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3000
2862 MAX_IT (selection.mark.col, 0); 3001 while (selection.mark.col > 0
2863 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 3002 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3003 --selection.mark.col;
2864 3004
2865 if (selection.op) 3005 if (selection.op)
3006 {
2866 { /* clear the old selection */ 3007 /* clear the old selection */
2867 selection.beg.row = selection.end.row = selection.mark.row; 3008 selection.beg.row = selection.end.row = selection.mark.row;
2868 selection.beg.col = selection.end.col = selection.mark.col; 3009 selection.beg.col = selection.end.col = selection.mark.col;
2869 } 3010 }
3011
2870 selection.op = SELECTION_INIT; 3012 selection.op = SELECTION_INIT;
2871 selection.screen = current_screen; 3013 selection.screen = current_screen;
2872} 3014}
2873 3015
2874/* ------------------------------------------------------------------------- */ 3016/* ------------------------------------------------------------------------- */
… …
2876 * Word select: select text for 2 clicks 3018 * Word select: select text for 2 clicks
2877 * We now only find out the boundary in one direction 3019 * We now only find out the boundary in one direction
2878 */ 3020 */
2879 3021
2880/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3022/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2881#define DELIMIT_TEXT(x) \ 3023#define DELIMIT_TEXT(x) \
2882 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 3024 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2883#define DELIMIT_REND(x) 1 3025#define DELIMIT_REND(x) 1
2884 3026
2885void 3027void ecb_cold
2886rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3028rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
2887{ 3029{
2888 int col, row, dirnadd, tcol, trow, w1, w2; 3030 int col, row, dirnadd, tcol, trow, w1, w2;
2889 row_col_t bound; 3031 row_col_t bound;
2890 text_t *stp; 3032 text_t *stp;
2891 rend_t *srp; 3033 rend_t *srp;
2892 3034
2893 if (dirn == UP) 3035 if (dirn == UP)
2894 { 3036 {
2895 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3037 bound.row = top_row - 1;
2896 bound.col = 0; 3038 bound.col = 0;
2897 dirnadd = -1; 3039 dirnadd = -1;
2898 } 3040 }
2899 else 3041 else
2900 { 3042 {
2901 bound.row = TermWin.saveLines + TermWin.nrow; 3043 bound.row = nrow;
2902 bound.col = TermWin.ncol - 1; 3044 bound.col = ncol - 1;
2903 dirnadd = 1; 3045 dirnadd = 1;
2904 } 3046 }
2905 row = mark->row + TermWin.saveLines; 3047
3048 row = mark->row;
2906 col = mark->col; 3049 col = max (mark->col, 0);
2907 MAX_IT (col, 0); 3050
2908 /* find the edge of a word */ 3051 /* find the edge of a word */
2909 stp = & (screen.text[row][col]); 3052 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
2910 w1 = DELIMIT_TEXT (*stp); 3053 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
2911 3054
2912 if (selection_style != NEW_SELECT) 3055 for (;;)
2913 { 3056 {
2914 if (w1 == 1) 3057 for (; col != bound.col; col += dirnadd)
2915 { 3058 {
2916 stp += dirnadd; 3059 stp += dirnadd;
2917 if (DELIMIT_TEXT (*stp) == 1)
2918 goto Old_Word_Selection_You_Die;
2919 col += dirnadd;
2920 }
2921 w1 = 0;
2922 }
2923 srp = (&screen.rend[row][col]);
2924 w2 = DELIMIT_REND (*srp);
2925
2926 for (;;)
2927 {
2928 for (; col != bound.col; col += dirnadd)
2929 {
2930 stp += dirnadd; 3060 srp += dirnadd;
3061
3062 if (*stp == NOCHAR)
3063 continue;
3064
2931 if (DELIMIT_TEXT (*stp) != w1) 3065 if (DELIMIT_TEXT (*stp) != w1)
2932 break; 3066 break;
2933 srp += dirnadd;
2934 if (DELIMIT_REND (*srp) != w2) 3067 if (DELIMIT_REND (*srp) != w2)
2935 break; 3068 break;
2936 } 3069 }
3070
2937 if ((col == bound.col) && (row != bound.row)) 3071 if ((col == bound.col) && (row != bound.row))
2938 { 3072 {
2939 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3073 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
2940 { 3074 {
2941 trow = row + dirnadd; 3075 trow = row + dirnadd;
2942 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3076 tcol = dirn == UP ? ncol - 1 : 0;
2943 if (screen.text[trow] == NULL) 3077
3078 if (!ROW(trow).t)
2944 break; 3079 break;
2945 stp = & (screen.text[trow][tcol]); 3080
2946 srp = & (screen.rend[trow][tcol]); 3081 stp = ROW(trow).t + tcol;
3082 srp = ROW(trow).r + tcol;
3083
2947 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3084 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2948 break; 3085 break;
3086
2949 row = trow; 3087 row = trow;
2950 col = tcol; 3088 col = tcol;
2951 continue; 3089 continue;
2952 } 3090 }
2953 } 3091 }
2954 break; 3092 break;
2955 } 3093 }
2956Old_Word_Selection_You_Die:
2957 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2958 3094
2959 if (dirn == DN) 3095 if (dirn == DN)
2960 col++; /* put us on one past the end */ 3096 col++; /* put us on one past the end */
2961 3097
2962 /* Poke the values back in */ 3098 /* Poke the values back in */
2963 ret->row = row - TermWin.saveLines; 3099 ret->row = row;
2964 ret->col = col; 3100 ret->col = col;
2965} 3101}
2966 3102
2967/* ------------------------------------------------------------------------- */ 3103/* ------------------------------------------------------------------------- */
2968/* 3104/*
… …
2970 * EXT: button 3 press; button 1 or 3 drag 3106 * EXT: button 3 press; button 1 or 3 drag
2971 * flag == 0 ==> button 1 3107 * flag == 0 ==> button 1
2972 * flag == 1 ==> button 3 press 3108 * flag == 1 ==> button 3 press
2973 * flag == 2 ==> button 3 motion 3109 * flag == 2 ==> button 3 motion
2974 */ 3110 */
2975void 3111void ecb_cold
2976rxvt_term::selection_extend (int x, int y, int flag) 3112rxvt_term::selection_extend (int x, int y, int flag) noexcept
2977{ 3113{
2978 int col, row; 3114 int col = clamp (Pixel2Col (x), 0, ncol);
3115 int row = clamp (Pixel2Row (y), 0, nrow - 1);
2979 3116
2980 col = Pixel2Col (x);
2981 row = Pixel2Row (y);
2982 MAX_IT (row, 0);
2983 MIN_IT (row, (int)TermWin.nrow - 1);
2984 MAX_IT (col, 0);
2985 MIN_IT (col, (int)TermWin.ncol);
2986
2987#ifndef NO_NEW_SELECTION
2988 /* 3117 /*
2989 * If we're selecting characters (single click) then we must check first 3118 * If we're selecting characters (single click) then we must check first
2990 * if we are at the same place as the original mark. If we are then 3119 * if we are at the same place as the original mark. If we are then
2991 * select nothing. Otherwise, if we're to the right of the mark, you have to 3120 * select nothing. Otherwise, if we're to the right of the mark, you have to
2992 * be _past_ a character for it to be selected. 3121 * be _past_ a character for it to be selected.
2993 */ 3122 */
2994 if (selection_style != OLD_SELECT)
2995 {
2996 if (((selection.clicks % 3) == 1) && !flag 3123 if (((selection.clicks % 3) == 1) && !flag
2997 && (col == selection.mark.col 3124 && (col == selection.mark.col
2998 && (row == selection.mark.row + TermWin.view_start))) 3125 && (row == selection.mark.row - view_start)))
2999 { 3126 {
3000 /* select nothing */ 3127 /* select nothing */
3001 selection.beg.row = selection.end.row = 0; 3128 selection.beg.row = selection.end.row = 0;
3002 selection.beg.col = selection.end.col = 0; 3129 selection.beg.col = selection.end.col = 0;
3003 selection.clicks = 4; 3130 selection.clicks = 4;
3004 want_refresh = 1; 3131 want_refresh = 1;
3005 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3006 return; 3132 return;
3007 }
3008 } 3133 }
3009#endif 3134
3010 if (selection.clicks == 4) 3135 if (selection.clicks == 4)
3011 selection.clicks = 1; 3136 selection.clicks = 1;
3012 3137
3013 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3138 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3014 flag == 1 ? 1 : 0, /* ? button press */ 3139 flag == 1 ? 1 : 0, /* ? button press */
… …
3017 3142
3018/* ------------------------------------------------------------------------- */ 3143/* ------------------------------------------------------------------------- */
3019/* 3144/*
3020 * Extend the selection to the specified col/row 3145 * Extend the selection to the specified col/row
3021 */ 3146 */
3022void 3147void ecb_cold
3023rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3148rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3024{ 3149{
3025 int16_t ncol = TermWin.ncol;
3026 int end_col;
3027 row_col_t pos; 3150 row_col_t pos;
3028 enum { 3151 enum {
3029 LEFT, RIGHT 3152 LEFT, RIGHT
3030 } closeto = RIGHT; 3153 } closeto = RIGHT;
3031 3154
3032 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3033 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3034
3035 want_refresh = 1;
3036 switch (selection.op) 3155 switch (selection.op)
3037 { 3156 {
3038 case SELECTION_INIT: 3157 case SELECTION_INIT:
3039 CLEAR_SELECTION (); 3158 CLEAR_SELECTION ();
3040 selection.op = SELECTION_BEGIN; 3159 selection.op = SELECTION_BEGIN;
… …
3053 selection_start_colrow (col, row); 3172 selection_start_colrow (col, row);
3054 /* FALLTHROUGH */ 3173 /* FALLTHROUGH */
3055 default: 3174 default:
3056 return; 3175 return;
3057 } 3176 }
3177
3058 if (selection.beg.col == selection.end.col 3178 if (selection.beg.col == selection.end.col
3059 && selection.beg.col != selection.mark.col 3179 && selection.beg.col != selection.mark.col
3060 && selection.beg.row == selection.end.row 3180 && selection.beg.row == selection.end.row
3061 && selection.beg.row != selection.mark.row) 3181 && selection.beg.row != selection.mark.row)
3062 { 3182 {
3063 selection.beg.col = selection.end.col = selection.mark.col; 3183 selection.beg.col = selection.end.col = selection.mark.col;
3064 selection.beg.row = selection.end.row = selection.mark.row; 3184 selection.beg.row = selection.end.row = selection.mark.row;
3065 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3066 } 3185 }
3067 3186
3068 pos.col = col; 3187 pos.col = col;
3069 pos.row = row; 3188 pos.row = view_start + row;
3070 3189
3071 pos.row -= TermWin.view_start; /* adjust for scroll */
3072
3073#ifndef NO_OLD_SELECTION
3074 /*
3075 * This mimics some of the selection behaviour of version 2.20 and before.
3076 * There are no ``selection modes'', button3 is always character extension.
3077 * Note: button3 drag is always available, c.f. v2.20
3078 * Selection always terminates (left or right as appropriate) at the mark.
3079 */
3080 if (selection_style == OLD_SELECT)
3081 {
3082 if (selection.clicks == 1 || button3)
3083 {
3084 if (hate_those_clicks)
3085 {
3086 hate_those_clicks = 0;
3087 if (selection.clicks == 1)
3088 {
3089 selection.beg.row = selection.mark.row;
3090 selection.beg.col = selection.mark.col;
3091 }
3092 else
3093 {
3094 selection.mark.row = selection.beg.row;
3095 selection.mark.col = selection.beg.col;
3096 }
3097 }
3098 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3099 {
3100 selection.end.row = selection.mark.row;
3101 selection.end.col = selection.mark.col + 1;
3102 selection.beg.row = pos.row;
3103 selection.beg.col = pos.col;
3104 }
3105 else
3106 {
3107 selection.beg.row = selection.mark.row;
3108 selection.beg.col = selection.mark.col;
3109 selection.end.row = pos.row;
3110 selection.end.col = pos.col + 1;
3111 }
3112 }
3113 else if (selection.clicks == 2)
3114 {
3115 selection_delimit_word (UP, & (selection.mark),
3116 & (selection.beg));
3117 selection_delimit_word (DN, & (selection.mark),
3118 & (selection.end));
3119 hate_those_clicks = 1;
3120 }
3121 else if (selection.clicks == 3)
3122 {
3123 selection.beg.row = selection.end.row = selection.mark.row;
3124 selection.beg.col = 0;
3125 selection.end.col = ncol;
3126 hate_those_clicks = 1;
3127 }
3128 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3129 return;
3130 }
3131#endif /* ! NO_OLD_SELECTION */
3132#ifndef NO_NEW_SELECTION
3133 /* selection_style must not be OLD_SELECT to get here */
3134 /* 3190 /*
3135 * This is mainly xterm style selection with a couple of differences, mainly 3191 * This is mainly xterm style selection with a couple of differences, mainly
3136 * in the way button3 drag extension works. 3192 * in the way button3 drag extension works.
3137 * We're either doing: button1 drag; button3 press; or button3 drag 3193 * We're either doing: button1 drag; button3 press; or button3 drag
3138 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3194 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3143 * a point/word/line which is either the start or end of the selection 3199 * a point/word/line which is either the start or end of the selection
3144 * and it was decided by whichever point/word/line was `fixed' at the 3200 * and it was decided by whichever point/word/line was `fixed' at the
3145 * time of the most recent button3 press 3201 * time of the most recent button3 press
3146 */ 3202 */
3147 if (button3 && buttonpress) 3203 if (button3 && buttonpress)
3204 {
3148 { /* button3 press */ 3205 /* button3 press */
3149 /* 3206 /*
3150 * first determine which edge of the selection we are closest to 3207 * first determine which edge of the selection we are closest to
3151 */ 3208 */
3152 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3209 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3153 || (!ROWCOL_IS_AFTER (pos, selection.end) 3210 || (!ROWCOL_IS_AFTER (pos, selection.end)
3154 && (((pos.col - selection.beg.col) 3211 && (((pos.col - selection.beg.col)
3155 + ((pos.row - selection.beg.row) * ncol)) 3212 + ((pos.row - selection.beg.row) * ncol))
3156 < ((selection.end.col - pos.col) 3213 < ((selection.end.col - pos.col)
3157 + ((selection.end.row - pos.row) * ncol))))) 3214 + ((selection.end.row - pos.row) * ncol)))))
3158 closeto = LEFT; 3215 closeto = LEFT;
3216
3159 if (closeto == LEFT) 3217 if (closeto == LEFT)
3160 { 3218 {
3161 selection.beg.row = pos.row; 3219 selection.beg.row = pos.row;
3162 selection.beg.col = pos.col; 3220 selection.beg.col = pos.col;
3163 selection.mark.row = selection.end.row; 3221 selection.mark.row = selection.end.row;
3164 selection.mark.col = selection.end.col 3222 selection.mark.col = selection.end.col - (selection.clicks == 2);
3165 - (selection.clicks == 2);
3166 } 3223 }
3167 else 3224 else
3168 { 3225 {
3169 selection.end.row = pos.row; 3226 selection.end.row = pos.row;
3170 selection.end.col = pos.col; 3227 selection.end.col = pos.col;
3171 selection.mark.row = selection.beg.row; 3228 selection.mark.row = selection.beg.row;
3172 selection.mark.col = selection.beg.col; 3229 selection.mark.col = selection.beg.col;
3173 } 3230 }
3174 } 3231 }
3175 else 3232 else
3233 {
3176 { /* button1 drag or button3 drag */ 3234 /* button1 drag or button3 drag */
3177 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3235 if (ROWCOL_IS_AFTER (selection.mark, pos))
3178 { 3236 {
3179 if ((selection.mark.row == selection.end.row) 3237 if (selection.mark.row == selection.end.row
3180 && (selection.mark.col == selection.end.col) 3238 && selection.mark.col == selection.end.col
3239 && clickchange
3181 && clickchange && selection.clicks == 2) 3240 && selection.clicks == 2)
3182 selection.mark.col--; 3241 selection.mark.col--;
3242
3183 selection.beg.row = pos.row; 3243 selection.beg.row = pos.row;
3184 selection.beg.col = pos.col; 3244 selection.beg.col = pos.col;
3185 selection.end.row = selection.mark.row; 3245 selection.end.row = selection.mark.row;
3186 selection.end.col = selection.mark.col 3246 selection.end.col = selection.mark.col + (selection.clicks == 2);
3187 + (selection.clicks == 2);
3188 } 3247 }
3189 else 3248 else
3190 { 3249 {
3191 selection.beg.row = selection.mark.row; 3250 selection.beg.row = selection.mark.row;
3192 selection.beg.col = selection.mark.col; 3251 selection.beg.col = selection.mark.col;
… …
3195 } 3254 }
3196 } 3255 }
3197 3256
3198 if (selection.clicks == 1) 3257 if (selection.clicks == 1)
3199 { 3258 {
3200 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3259 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3201 if (end_col != -1 && selection.beg.col > end_col) 3260 && !ROW(selection.beg.row).is_longer ()
3261#if !ENABLE_MINIMAL
3262 && !selection.rect
3263#endif
3202 { 3264 )
3203#if 1
3204 selection.beg.col = ncol; 3265 selection.beg.col = ncol;
3205#else
3206 if (selection.beg.row != selection.end.row)
3207 selection.beg.col = ncol;
3208 else
3209 selection.beg.col = selection.mark.col;
3210#endif
3211 3266
3267 if (
3268 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3269 && !ROW(selection.end.row).is_longer ()
3270#if !ENABLE_MINIMAL
3271 && !selection.rect
3272#endif
3212 } 3273 )
3213 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3214 if (end_col != -1 && selection.end.col > end_col)
3215 selection.end.col = ncol; 3274 selection.end.col = ncol;
3216
3217 } 3275 }
3218 else if (selection.clicks == 2) 3276 else if (selection.clicks == 2)
3219 { 3277 {
3220 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3278 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3221 selection.end.col--; 3279 selection.end.col--;
3280
3222 selection_delimit_word (UP, & (selection.beg), 3281 selection_delimit_word (UP, &selection.beg, &selection.beg);
3223 & (selection.beg));
3224 selection_delimit_word (DN, & (selection.end), 3282 selection_delimit_word (DN, &selection.end, &selection.end);
3225 & (selection.end));
3226 } 3283 }
3227 else if (selection.clicks == 3) 3284 else if (selection.clicks == 3)
3228 { 3285 {
3229#ifndef NO_FRILLS 3286#if ENABLE_FRILLS
3230 if ((Options & Opt_tripleclickwords)) 3287 if (option (Opt_tripleclickwords))
3231 { 3288 {
3232 int end_row;
3233
3234 selection_delimit_word (UP, & (selection.beg), 3289 selection_delimit_word (UP, &selection.beg, &selection.beg);
3235 & (selection.beg)); 3290
3236 end_row = screen.tlen[selection.mark.row
3237 + TermWin.saveLines];
3238 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3291 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3239 end_row++)
3240 { 3292 {
3241 end_col = screen.tlen[end_row + TermWin.saveLines]; 3293 if (!ROW(end_row).is_longer ())
3242 if (end_col != -1)
3243 { 3294 {
3244 selection.end.row = end_row; 3295 selection.end.row = end_row;
3245 selection.end.col = end_col; 3296 selection.end.col = ROW(end_row).l;
3297# if !ENABLE_MINIMAL
3246 selection_remove_trailing_spaces (); 3298 selection_remove_trailing_spaces ();
3299# endif
3247 break; 3300 break;
3248 } 3301 }
3249 } 3302 }
3250 } 3303 }
3251 else 3304 else
3252#endif 3305#endif
3253
3254 { 3306 {
3255 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3307 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3256 selection.mark.col++; 3308 selection.mark.col++;
3309
3257 selection.beg.col = 0; 3310 selection.beg.col = 0;
3258 selection.end.col = ncol; 3311 selection.end.col = ncol;
3312
3313 // select a complete logical line
3314 while (selection.beg.row > -saveLines
3315 && ROW(selection.beg.row - 1).is_longer ())
3316 selection.beg.row--;
3317
3318 while (selection.end.row < nrow
3319 && ROW(selection.end.row).is_longer ())
3320 selection.end.row++;
3259 } 3321 }
3260 } 3322 }
3323
3261 if (button3 && buttonpress) 3324 if (button3 && buttonpress)
3325 {
3262 { /* mark may need to be changed */ 3326 /* mark may need to be changed */
3263 if (closeto == LEFT) 3327 if (closeto == LEFT)
3264 { 3328 {
3265 selection.mark.row = selection.end.row; 3329 selection.mark.row = selection.end.row;
3266 selection.mark.col = selection.end.col 3330 selection.mark.col = selection.end.col - (selection.clicks == 2);
3267 - (selection.clicks == 2);
3268 } 3331 }
3269 else 3332 else
3270 { 3333 {
3271 selection.mark.row = selection.beg.row; 3334 selection.mark.row = selection.beg.row;
3272 selection.mark.col = selection.beg.col; 3335 selection.mark.col = selection.beg.col;
3273 } 3336 }
3274 } 3337 }
3275 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3276#endif /* ! NO_NEW_SELECTION */
3277}
3278 3338
3279#ifndef NO_FRILLS 3339#if !ENABLE_MINIMAL
3280void 3340 if (selection.rect && selection.beg.col > selection.end.col)
3341 ::swap (selection.beg.col, selection.end.col);
3342#endif
3343
3344 selection_changed ();
3345}
3346
3347#if !ENABLE_MINIMAL
3348void ecb_cold
3281rxvt_term::selection_remove_trailing_spaces () 3349rxvt_term::selection_remove_trailing_spaces () noexcept
3282{ 3350{
3283 int32_t end_col, end_row; 3351 int32_t end_col, end_row;
3284 text_t *stp; 3352 text_t *stp;
3285 3353
3286 end_col = selection.end.col; 3354 end_col = selection.end.col;
3287 end_row = selection.end.row; 3355 end_row = selection.end.row;
3356
3288 for ( ; end_row >= selection.beg.row; ) 3357 for (; end_row >= selection.beg.row; )
3289 { 3358 {
3290 stp = screen.text[end_row + TermWin.saveLines]; 3359 stp = ROW(end_row).t;
3360
3291 while (--end_col >= 0) 3361 while (--end_col >= 0)
3292 { 3362 {
3293 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3363 if (stp[end_col] != NOCHAR
3364 && !unicode::is_space (stp[end_col]))
3294 break; 3365 break;
3295 } 3366 }
3367
3296 if (end_col >= 0 3368 if (end_col >= 0
3297 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3369 || !ROW(end_row - 1).is_longer ())
3298 { 3370 {
3299 selection.end.col = end_col + 1; 3371 selection.end.col = end_col + 1;
3300 selection.end.row = end_row; 3372 selection.end.row = end_row;
3301 break; 3373 break;
3302 } 3374 }
3375
3303 end_row--; 3376 end_row--;
3304 end_col = TermWin.ncol; 3377 end_col = ncol;
3305 } 3378 }
3379
3306 if (selection.mark.row > selection.end.row) 3380 if (selection.mark.row > selection.end.row)
3307 { 3381 {
3308 selection.mark.row = selection.end.row; 3382 selection.mark.row = selection.end.row;
3309 selection.mark.col = selection.end.col; 3383 selection.mark.col = selection.end.col;
3310 } 3384 }
… …
3317/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3318/* 3392/*
3319 * Double click on button 3 when already selected 3393 * Double click on button 3 when already selected
3320 * EXT: button 3 double click 3394 * EXT: button 3 double click
3321 */ 3395 */
3322void 3396void ecb_cold
3323rxvt_term::selection_rotate (int x, int y) 3397rxvt_term::selection_rotate (int x, int y) noexcept
3324{ 3398{
3325 selection.clicks = selection.clicks % 3 + 1; 3399 selection.clicks = selection.clicks % 3 + 1;
3326 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3400 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3327} 3401}
3328 3402
3329/* ------------------------------------------------------------------------- */ 3403/* ------------------------------------------------------------------------- */
3330/* 3404/*
3331 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3332 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3333 * the X11 protocol.
3334 */
3335typedef CARD32 Atom32;
3336
3337/* ------------------------------------------------------------------------- */
3338/*
3339 * Respond to a request for our current selection 3405 * Respond to a request for our current selection
3340 * EXT: SelectionRequest 3406 * EXT: SelectionRequest
3341 */ 3407 */
3342void 3408void ecb_cold
3343rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3409rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3344{ 3410{
3411 Atom property = rq.property == None ? rq.target : rq.property;
3345 XSelectionEvent ev; 3412 XSelectionEvent ev;
3346 XTextProperty ct;
3347 XICCEncodingStyle style;
3348 Atom target;
3349 3413
3350 ev.type = SelectionNotify; 3414 ev.type = SelectionNotify;
3351 ev.property = None; 3415 ev.property = None;
3352 ev.display = rq.display; 3416 ev.display = rq.display;
3353 ev.requestor = rq.requestor; 3417 ev.requestor = rq.requestor;
… …
3355 ev.target = rq.target; 3419 ev.target = rq.target;
3356 ev.time = rq.time; 3420 ev.time = rq.time;
3357 3421
3358 if (rq.target == xa[XA_TARGETS]) 3422 if (rq.target == xa[XA_TARGETS])
3359 { 3423 {
3360 Atom32 target_list[5]; 3424 Atom target_list[6];
3361 Atom32 *target = target_list; 3425 Atom *target = target_list;
3362 3426
3363 *target++ = (Atom32) xa[XA_TARGETS]; 3427 *target++ = xa[XA_TARGETS];
3428 *target++ = xa[XA_TIMESTAMP];
3364 *target++ = (Atom32) XA_STRING; 3429 *target++ = XA_STRING;
3365 *target++ = (Atom32) xa[XA_TEXT]; 3430 *target++ = xa[XA_TEXT];
3366 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3431 *target++ = xa[XA_COMPOUND_TEXT];
3367#if X_HAVE_UTF8_STRING 3432#if X_HAVE_UTF8_STRING
3368 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3433 *target++ = xa[XA_UTF8_STRING];
3369#endif 3434#endif
3435
3370 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3436 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3371 (8 * sizeof (target_list[0])), PropModeReplace, 3437 32, PropModeReplace,
3372 (unsigned char *)target_list, 3438 (unsigned char *)target_list, target - target_list);
3373 target - target_list);
3374 ev.property = rq.property; 3439 ev.property = property;
3375 } 3440 }
3441#if TODO // TODO
3376 else if (rq.target == xa[XA_MULTIPLE]) 3442 else if (rq.target == xa[XA_MULTIPLE])
3377 { 3443 {
3378 /* TODO: Handle MULTIPLE */ 3444 /* TODO: Handle MULTIPLE */
3379 } 3445 }
3446#endif
3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3381 { 3448 {
3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3449 XChangeProperty (dpy, rq.requestor, property, rq.target,
3383 (8 * sizeof (Time)), PropModeReplace,
3384 (unsigned char *)&selection_time, 1); 3450 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3385 ev.property = rq.property; 3451 ev.property = property;
3452 }
3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3454 {
3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3456 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3457 ev.property = property;
3386 } 3458 }
3387 else if (rq.target == XA_STRING 3459 else if (rq.target == XA_STRING
3388 || rq.target == xa[XA_TEXT] 3460 || rq.target == xa[XA_TEXT]
3389 || rq.target == xa[XA_COMPOUND_TEXT] 3461 || rq.target == xa[XA_COMPOUND_TEXT]
3390 || rq.target == xa[XA_UTF8_STRING] 3462 || rq.target == xa[XA_UTF8_STRING]
3391 ) 3463 )
3392 { 3464 {
3465 XTextProperty ct;
3466 Atom target = rq.target;
3393 short freect = 0; 3467 short freect = 0;
3394 int selectlen; 3468 int selectlen;
3395 char *cl; 3469 wchar_t *cl;
3396 3470 enum {
3397 target = rq.target; 3471 enc_string = XStringStyle,
3472 enc_text = XStdICCTextStyle,
3473 enc_compound_text = XCompoundTextStyle,
3474#ifdef X_HAVE_UTF8_STRING
3475 enc_utf8 = XUTF8StringStyle,
3476#else
3477 enc_utf8 = -1,
3478#endif
3479 } style;
3398 3480
3399 if (target == XA_STRING) 3481 if (target == XA_STRING)
3400 // we actually don't do XA_STRING, but who cares, as i18n clients 3482 // we actually don't do XA_STRING, but who cares, as i18n clients
3401 // will ask for another format anyways. 3483 // will ask for another format anyways.
3402 style = XStringStyle; 3484 style = enc_string;
3403 else if (target == xa[XA_TEXT]) 3485 else if (target == xa[XA_TEXT])
3404 style = XTextStyle; 3486 style = enc_text;
3405 else if (target == xa[XA_COMPOUND_TEXT]) 3487 else if (target == xa[XA_COMPOUND_TEXT])
3406 style = XCompoundTextStyle; 3488 style = enc_compound_text;
3407#if X_HAVE_UTF8_STRING 3489#if !ENABLE_MINIMAL
3408 else if (target == xa[XA_UTF8_STRING]) 3490 else if (target == xa[XA_UTF8_STRING])
3409 style = XUTF8StringStyle; 3491 style = enc_utf8;
3410#endif 3492#endif
3411 else 3493 else
3412 { 3494 {
3413 target = xa[XA_COMPOUND_TEXT]; 3495 target = xa[XA_COMPOUND_TEXT];
3414 style = XCompoundTextStyle; 3496 style = enc_compound_text;
3415 }
3416
3417 if (selection.text)
3418 { 3497 }
3498
3499 if (rq.selection == XA_PRIMARY && selection.text)
3500 {
3419 cl = (char *)selection.text; 3501 cl = selection.text;
3420 selectlen = selection.len; 3502 selectlen = selection.len;
3421 } 3503 }
3504 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3505 {
3506 cl = selection.clip_text;
3507 selectlen = selection.clip_len;
3508 }
3422 else 3509 else
3423 { 3510 {
3424 cl = ""; 3511 cl = (wchar_t *)L"";
3425 selectlen = 0; 3512 selectlen = 0;
3426 } 3513 }
3427 3514
3515#if !ENABLE_MINIMAL
3516 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3517 // so recode it manually
3518 if (style == enc_utf8)
3519 {
3520 freect = 1;
3521 ct.encoding = target;
3522 ct.format = 8;
3523 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3524 ct.nitems = strlen ((char *)ct.value);
3525 }
3526 else
3527#endif
3428 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3528 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3429 freect = 1; 3529 freect = 1;
3430 else 3530 else
3431 { 3531 {
3432 /* if we failed to convert then send it raw */ 3532 /* if we failed to convert then send it raw */
3433 ct.value = (unsigned char *)cl; 3533 ct.value = (unsigned char *)cl;
3434 ct.nitems = selectlen; 3534 ct.nitems = selectlen;
3535 ct.encoding = target;
3435 } 3536 }
3436 3537
3437 XChangeProperty (display->display, rq.requestor, rq.property, 3538 XChangeProperty (dpy, rq.requestor, property,
3438 target, 8, PropModeReplace, 3539 ct.encoding, 8, PropModeReplace,
3439 ct.value, (int)ct.nitems); 3540 ct.value, (int)ct.nitems);
3440 ev.property = rq.property; 3541 ev.property = property;
3441 3542
3442 if (freect) 3543 if (freect)
3443 XFree (ct.value); 3544 XFree (ct.value);
3444 } 3545 }
3546
3445 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3547 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3446} 3548}
3447 3549
3448/* ------------------------------------------------------------------------- * 3550/* ------------------------------------------------------------------------- */
3449 * MOUSE ROUTINES *
3450 * ------------------------------------------------------------------------- */
3451
3452/*
3453 * return col/row values corresponding to x/y pixel values
3454 */
3455void
3456rxvt_term::pixel_position (int *x, int *y)
3457{
3458 *x = Pixel2Col (*x);
3459 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3460 *y = Pixel2Row (*y);
3461 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3462}
3463
3464/* ------------------------------------------------------------------------- */
3465#ifdef USE_XIM 3551#if USE_XIM
3466void 3552void ecb_cold
3467rxvt_term::im_set_position (XPoint *pos) 3553rxvt_term::im_set_position (XPoint &pos) noexcept
3468{ 3554{
3469 XWindowAttributes xwa; 3555 XWindowAttributes xwa;
3470 3556
3471 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3557 XGetWindowAttributes (dpy, vt, &xwa);
3558
3472 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3559 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3473 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3560 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3474} 3561}
3475
3476#endif 3562#endif
3477/* ------------------------------------------------------------------------- */ 3563
3478 3564#if ENABLE_OVERLAY
3565void
3566rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3567{
3568 if (nrow < 1 || ncol < 1)
3569 return;
3570
3571 want_refresh = 1;
3572
3573 scr_overlay_off ();
3574
3575 if (x < 0) x = ncol - w;
3576 if (y < 0) y = nrow - h;
3577
3578 // make space for border
3579 w += 2; min_it (w, ncol);
3580 h += 2; min_it (h, nrow);
3581
3582 x -= 1; clamp_it (x, 0, ncol - w);
3583 y -= 1; clamp_it (y, 0, nrow - h);
3584
3585 ov.x = x; ov.y = y;
3586 ov.w = w; ov.h = h;
3587
3588 ov.text = new text_t *[h];
3589 ov.rend = new rend_t *[h];
3590
3591 for (y = 0; y < h; y++)
3592 {
3593 text_t *tp = ov.text[y] = new text_t[w];
3594 rend_t *rp = ov.rend[y] = new rend_t[w];
3595
3596 text_t t0, t1, t2;
3597 rend_t r = OVERLAY_RSTYLE;
3598
3599 if (y == 0)
3600 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3601 else if (y < h - 1)
3602 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3603 else
3604 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3605
3606 *tp++ = t0;
3607 *rp++ = r;
3608
3609 for (x = w - 2; x > 0; --x)
3610 {
3611 *tp++ = t1;
3612 *rp++ = r;
3613 }
3614
3615 *tp = t2;
3616 *rp = r;
3617 }
3618}
3619
3620void
3621rxvt_term::scr_overlay_off () noexcept
3622{
3623 if (!ov.text)
3624 return;
3625
3626 want_refresh = 1;
3627
3628 for (int y = 0; y < ov.h; y++)
3629 {
3630 delete [] ov.text[y];
3631 delete [] ov.rend[y];
3632 }
3633
3634 delete [] ov.text; ov.text = 0;
3635 delete [] ov.rend; ov.rend = 0;
3636}
3637
3638void
3639rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3640{
3641 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3642 return;
3643
3644 x++, y++;
3645
3646 ov.text[y][x] = text;
3647 ov.rend[y][x] = rend;
3648}
3649
3650void
3651rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3652{
3653 while (*s)
3654 scr_overlay_set (x++, y, *s++);
3655}
3656
3657void
3658rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3659{
3660 while (*s)
3661 {
3662 text_t t = *s++;
3663 int width = WCWIDTH (t);
3664
3665 while (width--)
3666 {
3667 scr_overlay_set (x++, y, t);
3668 t = NOCHAR;
3669 }
3670 }
3671}
3672
3673void
3674rxvt_term::scr_swap_overlay () noexcept
3675{
3676 if (!ov.text)
3677 return;
3678
3679 // hide cursor if it is within the overlay area
3680 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3681 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3682 screen.flags &= ~Screen_VisibleCursor;
3683
3684 // swap screen mem with overlay
3685 for (int y = ov.h; y--; )
3686 {
3687 text_t *t1 = ov.text[y];
3688 rend_t *r1 = ov.rend[y];
3689
3690 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3691 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3692
3693 for (int x = ov.w; x--; )
3694 {
3695 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3696 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3697 }
3698 }
3699}
3700
3701#endif
3479/* ------------------------------------------------------------------------- * 3702/* ------------------------------------------------------------------------- */
3480 * DEBUG ROUTINES *
3481 * ------------------------------------------------------------------------- */
3482#if 0
3483void
3484rxvt_debug_colors (void)
3485{
3486 int color;
3487 const char *name[] =
3488 {
3489 "fg", "bg",
3490 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3491 };
3492 3703
3493 fprintf (stderr, "Color ( ");
3494 if (rstyle & RS_RVid)
3495 fprintf (stderr, "rvid ");
3496 if (rstyle & RS_Bold)
3497 fprintf (stderr, "bold ");
3498 if (rstyle & RS_Blink)
3499 fprintf (stderr, "blink ");
3500 if (rstyle & RS_Uline)
3501 fprintf (stderr, "uline ");
3502 fprintf (stderr, "): ");
3503
3504 color = GET_FGCOLOR (rstyle);
3505#ifndef NO_BRIGHTCOLOR
3506 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3507 {
3508 color -= (minBrightCOLOR - minCOLOR);
3509 fprintf (stderr, "bright ");
3510 }
3511#endif
3512 fprintf (stderr, "%s on ", name[color]);
3513
3514 color = GET_BGCOLOR (rstyle);
3515#ifndef NO_BRIGHTCOLOR
3516 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3517 {
3518 color -= (minBrightCOLOR - minCOLOR);
3519 fprintf (stderr, "bright ");
3520 }
3521#endif
3522 fprintf (stderr, "%s\n", name[color]);
3523}
3524#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines