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

Diff Legend

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