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

Diff Legend

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