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.305 by ayin, Thu Feb 21 10:30:24 2008 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 2022 UTC

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

Diff Legend

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