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

Diff Legend

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