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

Diff Legend

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