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.276 by ayin, Sun Aug 26 17:56:19 2007 UTC vs.
Revision 1.467 by root, Mon Aug 8 09:45:06 2022 UTC

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

Diff Legend

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