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.472 by root, Mon Aug 8 10:33:14 2022 UTC

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

Diff Legend

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