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.276 by ayin, Sun Aug 26 17:56:19 2007 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 2022 UTC

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

Diff Legend

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