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

Diff Legend

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