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

Diff Legend

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