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.312 by root, Tue Nov 4 13:30:41 2008 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * 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 9 * 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 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
130{ 127{
131 scr_blank_line (l, 0, ncol, efs); 128 scr_blank_line (l, 0, ncol, efs);
132 129
133 l.l = 0; 130 l.l = 0;
134 l.f = 0; 131 l.f = 0;
132}
133
134// nuke a single wide character at the given column
135void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
137{
138 // find begin
139 while (col > 0 && l.t[col] == NOCHAR)
140 col--;
141
142 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
146
147 // found start, nuke
148 do {
149 l.t[col] = ' ';
150 l.r[col] = rend;
151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR);
135} 153}
136 154
137/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
140 158
141void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
142rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
143{ 195{
144#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
145 scr_overlay_off (); 197 scr_overlay_off ();
146#endif 198#endif
147 199
148 rvideo_mode = false;
149 view_start = 0; 200 view_start = 0;
150 num_scr = 0; 201 num_scr = 0;
151 202
152 if (ncol == 0) 203 if (ncol == 0)
153 ncol = 80; 204 ncol = 80;
… …
155 if (nrow == 0) 206 if (nrow == 0)
156 nrow = 24; 207 nrow = 24;
157 208
158 if (ncol == prev_ncol && nrow == prev_nrow) 209 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 210 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 211
164 // we need at least two lines for wrapping to work correctly 212 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 213 while (nrow + saveLines < 2)
166 { 214 {
167 //TODO//FIXME 215 //TODO//FIXME
… …
176 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
177 225
178 screen.tscroll = 0; 226 screen.tscroll = 0;
179 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
180 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
181 if (!row_buf) 239 if (!prev_row_buf)
182 { 240 {
183 /* 241 /*
184 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
185 */ 243 */
186 top_row = 0; 244 top_row = 0;
187 term_start = 0; 245 term_start = 0;
188
189 talloc = new rxvt_salloc (ncol * sizeof (text_t));
190 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
191
192 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
193 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
194 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
195
196 for (int row = nrow; row--; )
197 {
198 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
199 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
200 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
201 }
202 246
203 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
204 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
205 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
206 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
220 selection.text = NULL; 264 selection.text = NULL;
221 selection.len = 0; 265 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 266 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 267 selection.screen = PRIMARY;
224 selection.clicks = 0; 268 selection.clicks = 0;
269 selection.clip_text = NULL;
270 selection.clip_len = 0;
225 } 271 }
226 else 272 else
227 { 273 {
228 /* 274 /*
229 * add or delete rows as appropriate 275 * add or delete rows as appropriate
230 */ 276 */
231 277
232 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
233 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
234
235#if 0
236 if (nrow < prev_nrow)
237 {
238 for (int row = nrow; row < prev_nrow; row++)
239 {
240 lfree (swap_buf [row]);
241 lfree (drawn_buf[row]);
242 }
243 }
244#endif
245
246 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
247 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
248
249 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
250 { 279 {
251 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
252 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
253 }
254 282
255 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f;
256 { 290 }
257 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
259 }
260
261 line_t *old_buf = row_buf;
262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
263 291
264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
265 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
266 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
267 295
268 if (top_row) 296 if (top_row)
269 { 297 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 298 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 299 // to come up with a lean and mean algorithm.
300 // TODO: maybe optimise when width didn't change
272 301
273 row_col_t ocur = screen.cur; 302 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 303 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 304
276 do 305 do
277 { 306 {
278 p = MOD (p - 1, prev_total_rows); 307 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 308 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 309 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 310 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
284 311
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 312 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 313 {
287 p = MOD (p - 1, prev_total_rows); 314 p = MOD (p - 1, prev_total_rows);
288 315
289 plines++; 316 plines++;
290 llen += prev_ncol; 317 llen += prev_ncol;
… …
303 330
304 // re-assemble the full line by destination lines 331 // re-assemble the full line by destination lines
305 for (int qrow = q; qlines--; qrow++) 332 for (int qrow = q; qlines--; qrow++)
306 { 333 {
307 qline = row_buf + qrow; 334 qline = row_buf + qrow;
308 lalloc (*qline); 335 qline->alloc (); // redundant with next line
309 qline->l = ncol; 336 qline->l = ncol;
310 qline->is_longer (1); 337 qline->is_longer (1);
311 338
312 int qcol = 0; 339 int qcol = 0;
313 340
… …
328 // this seems to upset applications/shells/readline 355 // this seems to upset applications/shells/readline
329 // least. 356 // least.
330 if (prow == ocur.row) 357 if (prow == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 358 screen.cur.row = q - (total_rows - nrow);
332 359
333 line_t &pline = old_buf [prow]; 360 line_t &pline = prev_row_buf [prow];
334 361
335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 362 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
336 363
337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 364 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 365 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
359 { 386 {
360 // if no scrollback exists (yet), wing, instead of wrap 387 // if no scrollback exists (yet), wing, instead of wrap
361 388
362 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
363 { 390 {
364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
365 line_t &qline = row_buf [row]; 392 line_t &dst = row_buf [row];
366 393
367 qline = pline; 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
368 lresize (qline); 395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = common_col;
369 } 399 }
370 400
371 for (int row = prev_nrow; row < nrow; row++) 401 for (int row = prev_nrow; row < nrow; row++)
372 {
373 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 402 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
374 }
375 403
376 term_start = 0; 404 term_start = 0;
377 } 405 }
378
379 free (old_buf);
380 delete old_ta;
381 delete old_ra;
382 406
383 clamp_it (screen.cur.row, 0, nrow - 1); 407 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 408 clamp_it (screen.cur.col, 0, ncol - 1);
409 }
385 410
411 for (int row = nrow; row--; )
412 {
413 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
414 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
415 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
416 }
417
418 chunk_free (prev_chunk, prev_chunk_size);
419
386 free (tabs); 420 free (tabs);
387 } 421 tabs = (char *)rxvt_malloc (ncol);
422
423 for (int col = ncol; col--; )
424 tabs [col] = col % TABSIZE == 0;
388 425
389 CLEAR_ALL_SELECTION (); 426 CLEAR_ALL_SELECTION ();
390 427
391 prev_nrow = nrow; 428 prev_nrow = nrow;
392 prev_ncol = ncol; 429 prev_ncol = ncol;
393 430
394 tabs = (char *)rxvt_malloc (ncol); 431 tt_winch ();
395 432
396 for (int col = ncol; --col; ) 433 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
397 tabs [col] = col % TABSIZE == 0; 434}
435
436void ecb_cold
437rxvt_term::scr_release () NOTHROW
438{
439 chunk_free (chunk, chunk_size);
440 chunk = 0;
441 row_buf = 0;
442
443 free (tabs);
444 tabs = 0;
445}
446
447/* ------------------------------------------------------------------------- */
448/*
449 * Hard/Soft reset
450 */
451void ecb_cold
452rxvt_term::scr_poweron ()
453{
454 scr_release ();
455
456 prev_nrow = prev_ncol = 0;
457 rvideo_mode = false;
458 scr_soft_reset ();
459 scr_reset ();
460
461 scr_clear (true);
462 scr_refresh ();
463}
464
465void ecb_cold
466rxvt_term::scr_soft_reset () NOTHROW
467{
468 /* only affects modes, nothing drastic such as clearing the screen */
469#if ENABLE_OVERLAY
470 scr_overlay_off ();
471#endif
398 472
399 if (current_screen != PRIMARY) 473 if (current_screen != PRIMARY)
400 scr_swap_screen (); 474 scr_swap_screen ();
401 475
402 tt_winch (); 476 scr_scroll_region (0, MAX_ROWS - 1);
403 477 scr_rendition (0, ~RS_None);
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 478 scr_insert_mode (0);
405}
406
407/* ------------------------------------------------------------------------- */
408/*
409 * Free everything. That way malloc debugging can find leakage.
410 */
411void
412rxvt_term::scr_release () NOTHROW
413{
414 if (row_buf)
415 {
416 delete talloc; talloc = 0;
417 delete ralloc; ralloc = 0;
418
419 free (row_buf);
420 free (swap_buf);
421 free (drawn_buf);
422 free (tabs);
423
424 row_buf = 0; // signal that we freed all the arrays
425 }
426}
427
428/* ------------------------------------------------------------------------- */
429/*
430 * Hard reset
431 */
432void
433rxvt_term::scr_poweron ()
434{
435 scr_release ();
436 prev_nrow = prev_ncol = 0;
437 scr_reset ();
438
439 scr_clear (true);
440 scr_refresh ();
441} 479}
442 480
443/* ------------------------------------------------------------------------- * 481/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 482 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 483 * ------------------------------------------------------------------------- */
… …
483 } 521 }
484 522
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 523 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 524 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 525 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 526 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 527 assert (s->cur.col >= 0);
491#endif
492} 528}
493 529
494void 530void
495rxvt_term::scr_swap_screen () 531rxvt_term::scr_swap_screen () NOTHROW
496{ 532{
497 if (!option (Opt_secondaryScreen)) 533 if (!option (Opt_secondaryScreen))
498 return; 534 return;
499 535
500 for (int i = prev_nrow; i--; ) 536 for (int i = prev_nrow; i--; )
… …
519 return; 555 return;
520 556
521 want_refresh = 1; 557 want_refresh = 1;
522 view_start = 0; 558 view_start = 0;
523 559
524 selection_check (2); /* check for boundary cross */ 560 /* check for boundary cross */
561 row_col_t pos;
562 pos.row = pos.col = 0;
563 if (ROWCOL_IS_BEFORE (selection.beg, pos)
564 && ROWCOL_IS_AFTER (selection.end, pos))
565 CLEAR_SELECTION ();
525 566
526 int i = current_screen; current_screen = scrn; scrn = i; 567 current_screen = scrn;
527 568
528#if NSCREENS 569#if NSCREENS
529 if (option (Opt_secondaryScreen)) 570 if (option (Opt_secondaryScreen))
530 { 571 {
531 num_scr = 0; 572 num_scr = 0;
… …
595/* 636/*
596 * Scroll text between <row1> and <row2> inclusive, by <count> lines 637 * Scroll text between <row1> and <row2> inclusive, by <count> lines
597 * count positive ==> scroll up 638 * count positive ==> scroll up
598 * count negative ==> scroll down 639 * count negative ==> scroll down
599 */ 640 */
600int 641int ecb_hot
601rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 642rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
602{ 643{
603 if (count == 0 || (row1 > row2)) 644 if (count == 0 || (row1 > row2))
604 return 0; 645 return 0;
605 646
… …
608 649
609 if (count > 0 650 if (count > 0
610 && row1 == 0 651 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 652 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 653 {
654 min_it (count, total_rows - (nrow - (row2 + 1)));
655
613 top_row = max (top_row - count, -saveLines); 656 top_row = max (top_row - count, -saveLines);
614
615 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows;
617 657
618 // sever bottommost line 658 // sever bottommost line
619 { 659 {
620 line_t &l = ROW(row2 - count); 660 line_t &l = ROW(row2);
621 l.is_longer (0); 661 l.is_longer (0);
622 l.touch (); 662 l.touch ();
623 } 663 }
624 664
665 // scroll everything up 'count' lines
666 term_start = (term_start + count) % total_rows;
667
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
625 // erase newly scrolled-in lines 680 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 681 for (int i = count; i--; )
627 { 682 {
628 line_t &l = ROW(nrow - 1 - i); 683 line_t &l = ROW(row2 - i);
629 684
630 // optimize if already cleared, can be significant on slow machines 685 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 686 // could be rolled into scr_blank_screen_mem
632 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 687 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 688 {
634 scr_blank_line (l, 0, l.l, rstyle); 689 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 690 l.l = 0;
… …
637 } 692 }
638 else 693 else
639 scr_blank_screen_mem (l, rstyle); 694 scr_blank_screen_mem (l, rstyle);
640 } 695 }
641 696
642 // now copy lines below the scroll region bottom to the
643 // bottom of the screen again, so they look as if they
644 // hadn't moved.
645 for (int i = nrow; --i > row2; )
646 {
647 line_t &l1 = ROW(i - count);
648 line_t &l2 = ROW(i);
649
650 ::swap (l1, l2);
651 l2.touch ();
652 }
653
654 // move and/or clear selection, if any 697 // move and/or clear selection, if any
655 if (selection.op && current_screen == selection.screen) 698 if (selection.op && current_screen == selection.screen
699 && selection.beg.row <= row2)
656 { 700 {
657 selection.beg.row -= count; 701 selection.beg.row -= count;
658 selection.end.row -= count; 702 selection.end.row -= count;
659 selection.mark.row -= count; 703 selection.mark.row -= count;
660 704
661 if (selection.beg.row < top_row 705 selection_check (0);
662 || selection.end.row < top_row
663 || selection.mark.row < top_row)
664 {
665 CLEAR_ALL_SELECTION ();
666 selection.op = SELECTION_CLEAR;
667 }
668 } 706 }
669 707
670 // finally move the view window, if desired 708 // finally move the view window, if desired
671 if (option (Opt_scrollWithBuffer) 709 if (option (Opt_scrollWithBuffer)
672 && view_start != 0 710 && view_start != 0
… …
702 } 740 }
703 741
704 // use a simple and robust scrolling algorithm, this 742 // use a simple and robust scrolling algorithm, this
705 // part of scr_scroll_text is not time-critical. 743 // part of scr_scroll_text is not time-critical.
706 744
745 // sever line above scroll region
746 if (row1)
747 {
748 line_t &l = ROW(row1 - 1);
749 l.is_longer (0);
750 l.touch ();
751 }
752
707 int rows = row2 - row1 + 1; 753 int rows = row2 - row1 + 1;
708 754
709 min_it (count, rows); 755 min_it (count, rows);
710 756
711 line_t *temp_buf = row_buf + total_rows; 757 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712 758
713 for (int row = 0; row < rows; row++) 759 for (int row = 0; row < rows; row++)
714 { 760 {
715 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 761 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 762
… …
718 scr_blank_screen_mem (temp_buf [row], rstyle); 764 scr_blank_screen_mem (temp_buf [row], rstyle);
719 } 765 }
720 766
721 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
722 ROW(row1 + row) = temp_buf [row]; 768 ROW(row1 + row) = temp_buf [row];
769
770 // sever bottommost line
771 {
772 line_t &l = ROW(row2);
773 l.is_longer (0);
774 l.touch ();
775 }
723 } 776 }
724 777
725 return count; 778 return count;
726} 779}
727 780
728/* ------------------------------------------------------------------------- */ 781/* ------------------------------------------------------------------------- */
729/* 782/*
730 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
731 */ 784 */
732void 785void ecb_hot
733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 786rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
734{ 787{
735 if (len <= 0) /* sanity */ 788 if (len <= 0) /* sanity */
736 return; 789 return;
737 790
738 unsigned char checksel; 791 bool checksel;
739 unicode_t c; 792 unicode_t c;
740 int ncol = this->ncol; 793 int ncol = this->ncol;
741 const wchar_t *strend = str + len; 794 const wchar_t *strend = str + len;
742 795
743 want_refresh = 1; 796 want_refresh = 1;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 809 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 810 screen.cur.row -= minlines;
758 } 811 }
759 } 812 }
760 813
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 814 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 815 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 816 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 817 int row = screen.cur.row;
767 818
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 819 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 820
770 line_t *line = &ROW(row); 821 line_t *line = &ROW(row);
771 822
772 while (str < strend) 823 while (str < strend)
773 { 824 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 825 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 826
776 if (expect_false (c < 0x20)) 827 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 828 if (c == C0_LF)
778 { 829 {
779 max_it (line->l, screen.cur.col); 830 max_it (line->l, screen.cur.col);
780 831
781 screen.flags &= ~Screen_WrapNext; 832 screen.flags &= ~Screen_WrapNext;
… …
800 { 851 {
801 scr_tab (1, true); 852 scr_tab (1, true);
802 continue; 853 continue;
803 } 854 }
804 855
805 if (expect_false ( 856 if (ecb_unlikely (
806 checksel /* see if we're writing within selection */ 857 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 )) 860 ))
810 { 861 {
… …
815 * should be a similar check. 866 * should be a similar check.
816 */ 867 */
817 CLEAR_SELECTION (); 868 CLEAR_SELECTION ();
818 } 869 }
819 870
820 if (expect_false (screen.flags & Screen_WrapNext)) 871 if (ecb_unlikely (screen.flags & Screen_WrapNext))
821 { 872 {
822 scr_do_wrap (); 873 scr_do_wrap ();
823 874
824 line->l = ncol; 875 line->l = ncol;
825 line->is_longer (1); 876 line->is_longer (1);
… …
827 row = screen.cur.row; 878 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 879 line = &ROW(row); /* _must_ refresh */
829 } 880 }
830 881
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 882 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 883 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 884 c = 0xfffd;
834 885
835 // rely on wcwidth to tell us the character width, do wcwidth before 886 // rely on wcwidth to tell us the character width, do wcwidth before
836 // further replacements, as wcwidth might return -1 for the line 887 // further replacements, as wcwidth might return -1 for the line
837 // drawing characters below as they might be invalid in the current 888 // drawing characters below as they might be invalid in the current
838 // locale. 889 // locale.
839 int width = WCWIDTH (c); 890 int width = WCWIDTH (c);
840 891
841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 892 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 893 {
843 // vt100 special graphics and line drawing 894 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 895 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 896 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 897 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 910 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 911 width = 1; // vt100 line drawing characters are always single-width
861 } 912 }
862 } 913 }
863 914
864 if (expect_false (screen.flags & Screen_Insert)) 915 if (ecb_unlikely (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 916 scr_insdel_chars (width, INSERT);
866 917
867 if (width != 0) 918 if (width != 0)
868 { 919 {
869#if !UNICODE_3 920#if !UNICODE_3
… …
874# else 925# else
875 c = 0xfffd; 926 c = 0xfffd;
876# endif 927# endif
877#endif 928#endif
878 929
930 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
931
932 // if the character doesn't fit into the remaining columns...
933 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
934 {
935 if (screen.flags & Screen_Autowrap)
936 {
937 // ... artificially enlargen the previous one
938 c = NOCHAR;
939 // and try the same character next loop iteration
940 --str;
941 }
942 else
943 screen.cur.col = ncol - width;
944 }
945
879 // nuke the character at this position, if required 946 // nuke the character at this position, if required
880 if (expect_false ( 947 // due to wonderful coincidences everywhere else in this loop
948 // we never have to check for overwriting a wide char itself,
949 // only its tail.
881 line->t[screen.cur.col] == NOCHAR 950 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 951 scr_kill_char (*line, screen.cur.col);
883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
885 {
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 {
907 // ...output spaces
908 c = ' ';
909 // and try the same character next loop iteration
910 --str;
911 }
912 952
913 line->touch (); 953 line->touch ();
914 954
915 do 955 do
916 { 956 {
917 line->t[screen.cur.col] = c; 957 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 958 line->r[screen.cur.col] = rend;
919 959
920 if (expect_true (screen.cur.col < ncol - 1)) 960 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 961 screen.cur.col++;
922 else 962 else
923 { 963 {
924 line->l = ncol; 964 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 965 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 966 screen.flags |= Screen_WrapNext;
927 break; 967
968 goto end_of_line;
928 } 969 }
929 970
930 c = NOCHAR; 971 c = NOCHAR;
931 } 972 }
932 while (expect_false (--width > 0)); 973 while (ecb_unlikely (--width > 0));
933 974
934 // pad with spaces when overwriting wide character with smaller one 975 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 976 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 977 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 978 line->t[c] = ' ';
942 line->r[c] = rend; 979 line->r[c] = rend;
943 }
944 } 980 }
981
982end_of_line:
983 ;
945 } 984 }
946#if ENABLE_COMBINING 985#if ENABLE_COMBINING
947 else // width == 0 986 else // width == 0
948 { 987 {
949 if (c != 0xfeff) // ignore BOM 988 if (c != 0xfeff) // ignore BOM
… …
989#endif 1028#endif
990 } 1029 }
991 1030
992 max_it (line->l, screen.cur.col); 1031 max_it (line->l, screen.cur.col);
993 1032
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1033 assert (screen.cur.row >= 0);
996#endif
997} 1034}
998 1035
999/* ------------------------------------------------------------------------- */ 1036/* ------------------------------------------------------------------------- */
1000/* 1037/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1038 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1014 1051
1015 want_refresh = 1; 1052 want_refresh = 1;
1016#endif 1053#endif
1017 } 1054 }
1018 } 1055 }
1056 else if (screen.flags & Screen_WrapNext)
1057 screen.flags &= ~Screen_WrapNext;
1019 else 1058 else
1020 scr_gotorc (0, -1, RELATIVE); 1059 scr_gotorc (0, -1, RELATIVE);
1021} 1060}
1022 1061
1023/* ------------------------------------------------------------------------- */ 1062/* ------------------------------------------------------------------------- */
… …
1101 * XTERM_SEQ: ESC 6 1140 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1141 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1142 * in that row right. Clear left column.
1104 */ 1143 */
1105#if !ENABLE_MINIMAL 1144#if !ENABLE_MINIMAL
1106void 1145void ecb_cold
1107rxvt_term::scr_backindex () NOTHROW 1146rxvt_term::scr_backindex () NOTHROW
1108{ 1147{
1109 if (screen.cur.col > 0) 1148 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1149 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1111 else 1150 else
… …
1118 * XTERM_SEQ: ESC 9 1157 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1158 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1159 * in that row left. Clear right column.
1121 */ 1160 */
1122#if !ENABLE_MINIMAL 1161#if !ENABLE_MINIMAL
1123void 1162void ecb_cold
1124rxvt_term::scr_forwardindex () NOTHROW 1163rxvt_term::scr_forwardindex () NOTHROW
1125{ 1164{
1126 if (screen.cur.col < ncol - 1) 1165 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1166 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1128 else 1167 else
… …
1279 scr_blank_line (line, col, num, rstyle); 1318 scr_blank_line (line, col, num, rstyle);
1280} 1319}
1281 1320
1282/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
1283/* 1322/*
1284 * Erase part of whole of the screen 1323 * Erase part or whole of the screen
1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1324 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1325 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1326 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1288 */ 1327 */
1289void 1328void
… …
1298 ZERO_SCROLLBACK (); 1337 ZERO_SCROLLBACK ();
1299 1338
1300 switch (mode) 1339 switch (mode)
1301 { 1340 {
1302 case 0: /* erase to end of screen */ 1341 case 0: /* erase to end of screen */
1303 selection_check (1);
1304 scr_erase_line (0); 1342 scr_erase_line (0);
1305 row = screen.cur.row + 1; /* possible OOB */ 1343 row = screen.cur.row + 1; /* possible OOB */
1306 num = nrow - row; 1344 num = nrow - row;
1307 break; 1345 break;
1308 case 1: /* erase to beginning of screen */ 1346 case 1: /* erase to beginning of screen */
1309 selection_check (3);
1310 scr_erase_line (1); 1347 scr_erase_line (1);
1311 row = 0; 1348 row = 0;
1312 num = screen.cur.row; 1349 num = screen.cur.row;
1313 break; 1350 break;
1314 case 2: /* erase whole screen */ 1351 case 2: /* erase whole screen */
1315 selection_check (3);
1316 row = 0; 1352 row = 0;
1317 num = nrow; 1353 num = nrow;
1318 break; 1354 break;
1319 default: 1355 default:
1320 return; 1356 return;
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1365 if (row >= nrow) /* Out Of Bounds */
1330 return; 1366 return;
1331 1367
1332 min_it (num, nrow - row); 1368 min_it (num, nrow - row);
1333 1369
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1370 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1371 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1372 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1373 {
1339 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1340 1375
1341 if (mapped) 1376 if (mapped)
1342 XClearArea (dpy, vt, 0, 1377 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1378 Row2Pixel (row - view_start), (unsigned int)vt_width,
1344 (unsigned int)Height2Pixel (num), False); 1379 (unsigned int)Height2Pixel (num), False);
1345 } 1380 }
1346 else 1381 else
1347 { 1382 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1383 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1384
1385 if (mapped)
1386 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1387 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1389 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1390 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1391 (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num)); 1392 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1395 }
1358 } 1396 }
1359 1397
1360 for (; num--; row++) 1398 for (; num--; row++)
1361 { 1399 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1400 scr_blank_screen_mem (ROW(row), rstyle);
1401
1402 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1403 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1404 }
1365} 1405}
1366 1406
1367#if !ENABLE_MINIMAL 1407#if !ENABLE_MINIMAL
1368void 1408void
… …
1378/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1379/* 1419/*
1380 * Fill the screen with `E's 1420 * Fill the screen with `E's
1381 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1382 */ 1422 */
1383void 1423void ecb_cold
1384rxvt_term::scr_E () NOTHROW 1424rxvt_term::scr_E () NOTHROW
1385{ 1425{
1386 rend_t fs; 1426 rend_t fs;
1387 1427
1388 want_refresh = 1; 1428 want_refresh = 1;
1389 ZERO_SCROLLBACK (); 1429 ZERO_SCROLLBACK ();
1390 1430
1391 num_scr_allow = 0; 1431 num_scr_allow = 0;
1392 selection_check (3); 1432
1433 row_col_t pos;
1434 pos.row = pos.col = 0;
1435 if (ROWCOL_IS_AFTER (selection.end, pos))
1436 CLEAR_SELECTION ();
1393 1437
1394 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1438 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1395 for (int row = nrow; row--; ) 1439 for (int row = nrow; row--; )
1396 { 1440 {
1397 line_t &line = ROW(row); 1441 line_t &line = ROW(row);
… …
1442 * Insert/Delete <count> characters from the current position 1486 * Insert/Delete <count> characters from the current position
1443 */ 1487 */
1444void 1488void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1489rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1490{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1491 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1492 ZERO_SCROLLBACK ();
1452 1493
1453 if (count <= 0) 1494 if (count <= 0)
1454 return; 1495 return;
… …
1456 scr_do_wrap (); 1497 scr_do_wrap ();
1457 1498
1458 selection_check (1); 1499 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1500 min_it (count, ncol - screen.cur.col);
1460 1501
1461 row = screen.cur.row; 1502 int row = screen.cur.row;
1462 1503
1463 line_t *line = &ROW(row); 1504 line_t *line = &ROW(row);
1464 1505
1465 line->touch (); 1506 line->touch ();
1466 line->is_longer (0); 1507 line->is_longer (0);
1467 1508
1509 // nuke wide spanning the start
1510 if (line->t[screen.cur.col] == NOCHAR)
1511 scr_kill_char (*line, screen.cur.col);
1512
1468 switch (insdel) 1513 switch (insdel)
1469 { 1514 {
1470 case INSERT: 1515 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1516 line->l = min (line->l + count, ncol);
1517
1518 if (line->t[screen.cur.col] == NOCHAR)
1519 scr_kill_char (*line, screen.cur.col);
1520
1521 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1522 {
1473 line->t[col] = line->t[col - count]; 1523 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1524 line->r[col] = line->r[col - count];
1475 } 1525 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1526
1479 if (selection.op && current_screen == selection.screen 1527 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1528 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1529 {
1482 if (selection.end.row != screen.cur.row 1530 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1545 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1546 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1547 selection_check (1);
1500 screen.cur.col -= count; 1548 screen.cur.col -= count;
1501 1549
1550 // nuke wide char after the end
1551 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1552 scr_kill_char (*line, screen.cur.col + count);
1553
1502 scr_blank_line (*line, screen.cur.col, count, rstyle); 1554 scr_blank_line (*line, screen.cur.col, count, rstyle);
1503 break; 1555 break;
1504 1556
1505 case DELETE: 1557 case DELETE:
1506 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1558 line->l = max (line->l - count, 0);
1507 1559
1560 // nuke wide char spanning the end
1561 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1562 scr_kill_char (*line, screen.cur.col + count);
1563
1508 for (col = screen.cur.col; (col + count) < ncol; col++) 1564 for (int col = screen.cur.col; (col + count) < ncol; col++)
1509 { 1565 {
1510 line->t[col] = line->t[col + count]; 1566 line->t[col] = line->t[col + count];
1511 line->r[col] = line->r[col + count]; 1567 line->r[col] = line->r[col + count];
1512 } 1568 }
1513 1569
1514 line->l = max (line->l - count, 0);
1515 scr_blank_line (*line, ncol - count, count, tr); 1570 scr_blank_line (*line, ncol - count, count, rstyle);
1516 1571
1517 if (selection.op && current_screen == selection.screen 1572 if (selection.op && current_screen == selection.screen
1518 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1573 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1519 { 1574 {
1520 if (selection.end.row != screen.cur.row 1575 if (selection.end.row != screen.cur.row
… …
1537/* ------------------------------------------------------------------------- */ 1592/* ------------------------------------------------------------------------- */
1538/* 1593/*
1539 * Set the scrolling region 1594 * Set the scrolling region
1540 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1595 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1541 */ 1596 */
1542void 1597void ecb_cold
1543rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1598rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1544{ 1599{
1545 max_it (top, 0); 1600 max_it (top, 0);
1546 min_it (bot, nrow - 1); 1601 min_it (bot, nrow - 1);
1547 1602
… …
1557/* 1612/*
1558 * Make the cursor visible/invisible 1613 * Make the cursor visible/invisible
1559 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1614 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1560 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1615 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1561 */ 1616 */
1562void 1617void ecb_cold
1563rxvt_term::scr_cursor_visible (int mode) NOTHROW 1618rxvt_term::scr_cursor_visible (int mode) NOTHROW
1564{ 1619{
1565 want_refresh = 1; 1620 want_refresh = 1;
1566 1621
1567 if (mode) 1622 if (mode)
… …
1574/* 1629/*
1575 * Set/unset automatic wrapping 1630 * Set/unset automatic wrapping
1576 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1631 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1577 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1632 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1578 */ 1633 */
1579void 1634void ecb_cold
1580rxvt_term::scr_autowrap (int mode) NOTHROW 1635rxvt_term::scr_autowrap (int mode) NOTHROW
1581{ 1636{
1582 if (mode) 1637 if (mode)
1583 screen.flags |= Screen_Autowrap; 1638 screen.flags |= Screen_Autowrap;
1584 else 1639 else
… …
1593 * Relative mode: line numbers are relative to top margin of scrolling region 1648 * Relative mode: line numbers are relative to top margin of scrolling region
1594 * and the cursor cannot be moved outside. 1649 * and the cursor cannot be moved outside.
1595 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1650 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1596 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1651 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1597 */ 1652 */
1598void 1653void ecb_cold
1599rxvt_term::scr_relative_origin (int mode) NOTHROW 1654rxvt_term::scr_relative_origin (int mode) NOTHROW
1600{ 1655{
1601 if (mode) 1656 if (mode)
1602 screen.flags |= Screen_Relative; 1657 screen.flags |= Screen_Relative;
1603 else 1658 else
… …
1610/* 1665/*
1611 * Set insert/replace mode 1666 * Set insert/replace mode
1612 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1667 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1613 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1668 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1614 */ 1669 */
1615void 1670void ecb_cold
1616rxvt_term::scr_insert_mode (int mode) NOTHROW 1671rxvt_term::scr_insert_mode (int mode) NOTHROW
1617{ 1672{
1618 if (mode) 1673 if (mode)
1619 screen.flags |= Screen_Insert; 1674 screen.flags |= Screen_Insert;
1620 else 1675 else
… …
1626 * Set/Unset tabs 1681 * Set/Unset tabs
1627 * XTERM_SEQ: Set tab at current column : ESC H 1682 * XTERM_SEQ: Set tab at current column : ESC H
1628 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1683 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1629 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1684 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1630 */ 1685 */
1631void 1686void ecb_cold
1632rxvt_term::scr_set_tab (int mode) NOTHROW 1687rxvt_term::scr_set_tab (int mode) NOTHROW
1633{ 1688{
1634 if (mode < 0) 1689 if (mode < 0)
1635 memset (tabs, 0, ncol); 1690 memset (tabs, 0, ncol);
1636 else if (screen.cur.col < ncol) 1691 else if (screen.cur.col < ncol)
… …
1655 if (rvideo_state != on) 1710 if (rvideo_state != on)
1656 { 1711 {
1657 rvideo_state = on; 1712 rvideo_state = on;
1658 1713
1659 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1714 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1660#ifdef HAVE_BG_PIXMAP 1715#ifdef HAVE_IMG
1661 if (bgPixmap.pixmap == None) 1716 if (bg_img == 0)
1662#endif 1717#endif
1663 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1718 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1664 1719
1665 XGCValues gcvalue; 1720 XGCValues gcvalue;
1666 gcvalue.foreground = pix_colors[Color_fg]; 1721 gcvalue.foreground = pix_colors[Color_fg];
… …
1675/* ------------------------------------------------------------------------- */ 1730/* ------------------------------------------------------------------------- */
1676/* 1731/*
1677 * Report current cursor position 1732 * Report current cursor position
1678 * XTERM_SEQ: Report position: ESC [ 6 n 1733 * XTERM_SEQ: Report position: ESC [ 6 n
1679 */ 1734 */
1680void 1735void ecb_cold
1681rxvt_term::scr_report_position () NOTHROW 1736rxvt_term::scr_report_position () NOTHROW
1682{ 1737{
1683 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1738 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1684} 1739}
1685 1740
… …
1688 * ------------------------------------------------------------------------- */ 1743 * ------------------------------------------------------------------------- */
1689 1744
1690/* 1745/*
1691 * Set font style 1746 * Set font style
1692 */ 1747 */
1693void 1748void ecb_cold
1694rxvt_term::set_font_style () NOTHROW 1749rxvt_term::set_font_style () NOTHROW
1695{ 1750{
1696#if 0 1751#if 0
1697 switch (charsets [screen.charset]) 1752 switch (charsets [screen.charset])
1698 { 1753 {
… …
1720 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1775 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1721 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1776 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1722 * XTERM_SEQ: Invoke G2 character set: ESC N 1777 * XTERM_SEQ: Invoke G2 character set: ESC N
1723 * XTERM_SEQ: Invoke G3 character set: ESC O 1778 * XTERM_SEQ: Invoke G3 character set: ESC O
1724 */ 1779 */
1725void 1780void ecb_cold
1726rxvt_term::scr_charset_choose (int set) NOTHROW 1781rxvt_term::scr_charset_choose (int set) NOTHROW
1727{ 1782{
1728 screen.charset = set; 1783 screen.charset = set;
1729 set_font_style (); 1784 set_font_style ();
1730} 1785}
… …
1751 * ------------------------------------------------------------------------- */ 1806 * ------------------------------------------------------------------------- */
1752 1807
1753/* 1808/*
1754 * refresh matching text. 1809 * refresh matching text.
1755 */ 1810 */
1756bool 1811bool ecb_cold
1757rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1812rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1758{ 1813{
1759 bool found = false; 1814 bool found = false;
1760 1815
1761 for (int i = 0; i < nrow; i++) 1816 for (int i = 0; i < nrow; i++)
… …
1780 PART_BEG = 0, 1835 PART_BEG = 0,
1781 PART_END, 1836 PART_END,
1782 RC_COUNT 1837 RC_COUNT
1783}; 1838};
1784 1839
1785void 1840void ecb_hot
1786rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1841rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1787{ 1842{
1788 int i; 1843 int i;
1789 row_col_t rc[RC_COUNT]; 1844 row_col_t rc[RC_COUNT];
1790 1845
… …
1810 for (i = PART_BEG; i < RC_COUNT; i++) 1865 for (i = PART_BEG; i < RC_COUNT; i++)
1811 { 1866 {
1812 min_it (rc[i].col, ncol - 1); 1867 min_it (rc[i].col, ncol - 1);
1813 min_it (rc[i].row, nrow - 1); 1868 min_it (rc[i].row, nrow - 1);
1814 } 1869 }
1815// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1870
1816 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1871 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1817 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1872 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1818 1873
1819 num_scr_allow = 0; 1874 num_scr_allow = 0;
1820 1875
… …
1827 * Refresh the entire screen 1882 * Refresh the entire screen
1828 */ 1883 */
1829void 1884void
1830rxvt_term::scr_touch (bool refresh) NOTHROW 1885rxvt_term::scr_touch (bool refresh) NOTHROW
1831{ 1886{
1832 scr_expose (0, 0, width, height, refresh); 1887 scr_expose (0, 0, vt_width, vt_height, refresh);
1833} 1888}
1834 1889
1835/* ------------------------------------------------------------------------- */ 1890/* ------------------------------------------------------------------------- */
1836/* 1891/*
1837 * Move the display so that the line represented by scrollbar value Y is at 1892 * Move the display so that the line represented by scrollbar value Y is at
… …
1893 1948
1894# ifndef NO_MAPALERT 1949# ifndef NO_MAPALERT
1895# ifdef MAPALERT_OPTION 1950# ifdef MAPALERT_OPTION
1896 if (option (Opt_mapAlert)) 1951 if (option (Opt_mapAlert))
1897# endif 1952# endif
1898 XMapWindow (dpy, parent[0]); 1953 XMapWindow (dpy, parent);
1899# endif 1954# endif
1900 1955
1901# if ENABLE_FRILLS 1956# if ENABLE_FRILLS
1902 if (option (Opt_urgentOnBell)) 1957 if (option (Opt_urgentOnBell))
1903 set_urgency (1); 1958 set_urgency (1);
… …
1911 1966
1912 bell_ev.start (VISUAL_BELL_DURATION); 1967 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1968 }
1914 else 1969 else
1915 XBell (dpy, 0); 1970 XBell (dpy, 0);
1971 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1972#endif
1917} 1973}
1918 1974
1919/* ------------------------------------------------------------------------- */ 1975/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */ 1976void ecb_cold
1921void
1922rxvt_term::scr_printscreen (int fullhist) NOTHROW 1977rxvt_term::scr_printscreen (int fullhist) NOTHROW
1923{ 1978{
1924#ifdef PRINTPIPE 1979#ifdef PRINTPIPE
1925 int nrows, row_start; 1980 int nrows, row_start;
1926 FILE *fd = popen_printer (); 1981 FILE *fd = popen_printer ();
… …
1939 row_start = view_start; 1994 row_start = view_start;
1940 } 1995 }
1941 1996
1942 wctomb (0, 0); 1997 wctomb (0, 0);
1943 1998
1944 for (int r1 = 0; r1 < nrows; r1++) 1999 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 2000 {
1946 text_t *tp = ROW(r1).t; 2001 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 2002 int len = ROW(r1).l;
1948 2003
1949 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2004 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1975/* 2030/*
1976 * Refresh the screen 2031 * Refresh the screen
1977 * drawn_text/drawn_rend contain the screen information before the update. 2032 * drawn_text/drawn_rend contain the screen information before the update.
1978 * screen.text/screen.rend contain what the screen will change to. 2033 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2034 */
1980void 2035void ecb_hot
1981rxvt_term::scr_refresh () NOTHROW 2036rxvt_term::scr_refresh () NOTHROW
1982{ 2037{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2038 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2039 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2040 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2041#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2042 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2053 /*
2001 * A: set up vars 2054 * A: set up vars
2002 */ 2055 */
2003 refresh_count = 0; 2056 refresh_count = 0;
2004 2057
2058 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2059 bool have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2007 have_bg = bgPixmap.pixmap != None; 2061 have_bg = bg_img != 0;
2008#endif 2062#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2064
2011 /* 2065 /*
2012 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
2013 */ 2067 */
2014 scr_reverse_selection (); 2068 scr_reverse_selection ();
2015 2069
2070 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2071#if ENABLE_OVERLAY
2072 scr_swap_overlay ();
2073#endif
2074
2075 bool showcursor = screen.flags & Screen_VisibleCursor;
2076
2016 /* 2077 /*
2017 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2018 */ 2079 */
2019 { 2080 {
2020 unsigned char setoldcursor; 2081 bool setoldcursor;
2021 2082
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2083#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2084 if (hidden_cursor)
2025 showcursor = 0; 2085 showcursor = 0;
2026#endif 2086#endif
2027 2087
… …
2055 ccol2 = bgcolor_of (rstyle); 2115 ccol2 = bgcolor_of (rstyle);
2056#else 2116#else
2057 ccol2 = Color_bg; 2117 ccol2 = Color_bg;
2058#endif 2118#endif
2059 2119
2060 if (showcursor && focus) 2120 if (focus)
2061 { 2121 {
2062 if (option (Opt_cursorUnderline)) 2122 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2123 *crp ^= RS_Uline;
2064 else 2124 else
2065 { 2125 {
… …
2100 oldcursor.col = screen.cur.col; 2160 oldcursor.col = screen.cur.col;
2101 } 2161 }
2102 } 2162 }
2103 } 2163 }
2104 2164
2105 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106#if ENABLE_OVERLAY
2107 scr_swap_overlay ();
2108#endif
2109
2110#ifndef NO_SLOW_LINK_SUPPORT 2165#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2166 /*
2112 * D: CopyArea pass - very useful for slower links 2167 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2168 * This has been deliberately kept simple.
2114 */ 2169 */
… …
2118 { 2173 {
2119 int16_t nits; 2174 int16_t nits;
2120 int i = num_scr; 2175 int i = num_scr;
2121 int j; 2176 int j;
2122 int len, wlen; 2177 int len, wlen;
2123 dLocal (int, num_scr);
2124 2178
2125 j = nrow; 2179 j = nrow;
2126 wlen = len = -1; 2180 wlen = len = -1;
2127 row = i > 0 ? 0 : j - 1; 2181 row = i > 0 ? 0 : j - 1;
2128 2182
… …
2203 continue; 2257 continue;
2204 2258
2205 // redraw one or more characters 2259 // redraw one or more characters
2206 2260
2207 // seek to the beginning of wide characters 2261 // seek to the beginning of wide characters
2208 while (expect_false (stp[col] == NOCHAR && col > 0)) 2262 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2209 --col; 2263 --col;
2210 2264
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2265 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2266 text_t *text = stp + col;
2213 int count = 1; 2267 int count = 1;
2214 2268
2215 dtp[col] = stp[col]; 2269 dtp[col] = stp[col];
2216 drp[col] = rend; 2270 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2274 for (i = 0; ++col < ncol; )
2221 { 2275 {
2222 if (stp[col] == NOCHAR) 2276 if (stp[col] == NOCHAR)
2223 { 2277 {
2224 dtp[col] = stp[col]; 2278 dtp[col] = stp[col];
2225 drp[col] = rend; 2279 drp[col] = srp[col];
2280
2226 count++; 2281 count++;
2227 i++; 2282 i++;
2228 2283
2229 continue; 2284 continue;
2230 } 2285 }
… …
2250 2305
2251 col--; /* went one too far. move back */ 2306 col--; /* went one too far. move back */
2252 count -= i; /* dump any matching trailing chars */ 2307 count -= i; /* dump any matching trailing chars */
2253 2308
2254 // sometimes we optimize away the trailing NOCHAR's, add them back 2309 // sometimes we optimize away the trailing NOCHAR's, add them back
2255 while (expect_false (i && text[count] == NOCHAR)) 2310 while (ecb_unlikely (i && text[count] == NOCHAR))
2256 count++, i--; 2311 count++, i--;
2257 2312
2258 /* 2313 /*
2259 * Determine the attributes for the string 2314 * Determine the attributes for the string
2260 */ 2315 */
2261 int fore = fgcolor_of (rend); // desired foreground 2316 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2317 int back = bgcolor_of (rend); // desired background
2263 2318
2264 // only do special processing if any attributes are set, which is unlikely 2319 // only do special processing if any attributes are set, which is unlikely
2265 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2320 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266 { 2321 {
2267 bool invert = rend & RS_RVid; 2322 bool invert = rend & RS_RVid;
2268 2323
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2325 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2344
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2345 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2346 fore = Color_UL;
2292#endif 2347#endif
2293 2348
2349#ifdef OPTION_HC
2350 if (rend & RS_Sel)
2351 {
2352 /* invert the column if no highlightColor is set or it is the
2353 * current cursor column */
2354 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2355 && ISSET_PIXCOLOR (Color_HC))
2356 {
2357 if (ISSET_PIXCOLOR (Color_HTC))
2358 fore = Color_HTC;
2359 // if invert is 0 reverse video is set so we use bg color as fg color
2360 else if (!invert)
2361 fore = back;
2362
2363 back = Color_HC;
2364 invert = 0;
2365 }
2366 }
2367#endif
2368
2294 if (invert) 2369 if (invert)
2295 { 2370 {
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); 2371 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2372
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2373#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) 2374 if (fore == back)
2314 { 2375 {
2315 fore = Color_bg; 2376 fore = Color_bg;
2316 back = Color_fg; 2377 back = Color_fg;
2317 } 2378 }
… …
2353 /* 2414 /*
2354 * Actually do the drawing of the string here 2415 * Actually do the drawing of the string here
2355 */ 2416 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2417 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2418
2358 if (expect_true (have_bg && back == Color_bg)) 2419 if (ecb_likely (have_bg && back == Color_bg))
2359 { 2420 {
2360 // this is very ugly, maybe push it into ->draw? 2421 // this is very ugly, maybe push it into ->draw?
2361 2422
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2423 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2424 if (text[i] != ' ')
… …
2370 did_clear: ; 2431 did_clear: ;
2371 } 2432 }
2372 else 2433 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2434 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2435
2375 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2436 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2437 {
2377#if ENABLE_FRILLS 2438#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2439 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2440 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2441 else
… …
2385 xpixel, ypixel + font->ascent + 1, 2446 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2447 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2448 }
2388 } /* for (col....) */ 2449 } /* for (col....) */
2389 } /* for (row....) */ 2450 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2451
2396 /* 2452 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2453 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2454 */
2399 if (showcursor) 2455 if (showcursor)
… …
2431 2487
2432 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2489 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2437 } 2493 }
2438 } 2494 }
2439 2495
2440 /* 2496 /*
2441 * H: cleanup selection 2497 * H: cleanup selection
2442 */ 2498 */
2499#if ENABLE_OVERLAY
2500 scr_swap_overlay ();
2501#endif
2502 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2503
2443 scr_reverse_selection (); 2504 scr_reverse_selection ();
2444 2505
2506 screen.flags = old_screen_flags;
2445 num_scr = 0; 2507 num_scr = 0;
2446 num_scr_allow = 1; 2508 num_scr_allow = 1;
2447} 2509}
2448 2510
2449void 2511void ecb_cold
2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2451{ 2513{
2452 if (!l.t) 2514 if (!l.valid ())
2453 return; 2515 return;
2454 2516
2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2456 2518
2457 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2458 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2459} 2521}
2460 2522
2461void 2523void ecb_cold
2462rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2463{ 2525{
2464 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2465 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2466 2528
… …
2469 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2470 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2471 } 2533 }
2472} 2534}
2473 2535
2474void 2536void ecb_cold
2475rxvt_term::scr_recolour () NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2476{ 2538{
2477#ifdef HAVE_BG_PIXMAP 2539 bool transparent = false;
2478 bgPixmap.apply ();
2479#else
2480 2540
2541#ifdef HAVE_IMG
2542 if (bg_img != 0)
2543 {
2544# if ENABLE_TRANSPARENCY
2545 if (bg_flags & BG_IS_TRANSPARENT)
2546 {
2547 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2548 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2549
2550 transparent = true;
2551 }
2552 else
2553# endif
2554 {
2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2556 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2557 }
2558 }
2559 else
2560#endif
2561 {
2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2482 XClearWindow (dpy, parent[0]);
2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2563 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2564 }
2565
2566 XClearWindow (dpy, parent);
2484 2567
2485 if (scrollBar.win) 2568 if (scrollBar.win)
2486 { 2569 {
2570 if (transparent)
2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2572 else
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2488 scrollBar.state = STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2489 scrollBar.show (0); 2575 scrollBar.show (0);
2490 } 2576 }
2491 2577
2492#endif 2578 if (refresh)
2493 2579 {
2494 /* bgPixmap.apply () does not do the following : */
2495 scr_clear (); 2580 scr_clear ();
2496 scr_touch (true); 2581 scr_touch (true);
2582 }
2497 want_refresh = 1; 2583 want_refresh = 1;
2498} 2584}
2499 2585
2500/* ------------------------------------------------------------------------- */ 2586/* ------------------------------------------------------------------------- */
2501void 2587void
… …
2558 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2559 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2560} 2646}
2561 2647
2562/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2563void 2649void ecb_hot
2564rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2565{ 2651{
2566 if (selection.op 2652 if (selection.op
2567 && current_screen == selection.screen 2653 && current_screen == selection.screen
2568 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
2569 { 2655 {
2570#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2571 if (selection.rect) 2657 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2658 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2660 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2661 else
2576#endif 2662#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2663 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2664 selection.end.row, selection.end.col,
2579 RS_RVid); 2665 RS_Sel | RS_RVid);
2580 } 2666 }
2581} 2667}
2582 2668
2583/* ------------------------------------------------------------------------- */ 2669/* ------------------------------------------------------------------------- */
2584/* 2670/*
… …
2587 */ 2673 */
2588#if 0 2674#if 0
2589void 2675void
2590rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2677{
2592 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2593 unsigned int width, towrite; 2679 // relevant code in scr_printscreen
2594 char r1[] = "\n";
2595
2596 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++)
2598 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote)
2602 {
2603 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2604 towrite);
2605 if (wrote < 0)
2606 return; /* XXX: death, no report */
2607 }
2608 if (row_buf[row].l >= 0)
2609 if (write (fd, r1, 1) <= 0)
2610 return; /* XXX: death, no report */
2611 }
2612} 2680}
2613#endif 2681#endif
2614 2682
2615/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2616 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2617 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2618void 2686void
2619rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2620{ 2688{
2621 row_col_t pos;
2622
2623 if (!selection.op) 2689 if (!selection.op)
2624 return; 2690 return;
2625 2691
2626 pos.row = pos.col = 0;
2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2630 || (check_more == 1 2695 || (check_more == 1
2631 && current_screen == selection.screen 2696 && current_screen == selection.screen
2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2634 || (check_more == 2
2635 && ROWCOL_IS_BEFORE (selection.beg, pos)
2636 && ROWCOL_IS_AFTER (selection.end, pos))
2637 || (check_more == 3
2638 && ROWCOL_IS_AFTER (selection.end, pos))
2639 || (check_more == 4 /* screen width change */
2640 && (selection.beg.row != selection.end.row
2641 || selection.end.col > ncol)))
2642 CLEAR_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2643} 2700}
2644 2701
2645/* ------------------------------------------------------------------------- */ 2702/* ------------------------------------------------------------------------- */
2646/* 2703/*
2647 * Paste a selection direct to the command fd 2704 * Paste a selection direct to the command fd
2648 */ 2705 */
2649void 2706void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2707rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2708{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2709 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2710 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2711 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2712 data[i] = C0_CR;
2656 2713
2657 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~"); 2715 tt_printf ("\x1b[200~");
2659 2716
2660 tt_write (data, len); 2717 tt_write (data, len);
2661 2718
2662 if (priv_modes & PrivMode_BracketPaste) 2719 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~"); 2720 tt_printf ("\x1b[201~");
2664} 2721}
2665 2722
2666/* ------------------------------------------------------------------------- */
2667/*
2668 * Respond to a notification that a primary selection has been sent
2669 * EXT: SelectionNotify
2670 */
2671void 2723void
2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2724rxvt_term::paste (char *data, unsigned int len) NOTHROW
2673{ 2725{
2674 if (prop == None) /* check for failed XConvertSelection */ 2726 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2675 {
2676 if ((selection_type & Sel_CompoundText))
2677 {
2678 int selnum = selection_type & Sel_whereMask;
2679
2680 selection_type = 0;
2681 if (selnum != Sel_direct)
2682 selection_request_other (XA_STRING, selnum);
2683 }
2684
2685 if ((selection_type & Sel_UTF8String))
2686 {
2687 int selnum = selection_type & Sel_whereMask;
2688
2689 selection_type = Sel_CompoundText;
2690 if (selnum != Sel_direct)
2691 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2692 else
2693 selection_type = 0;
2694 }
2695
2696 return;
2697 }
2698
2699 unsigned long bytes_after;
2700 XTextProperty ct;
2701
2702 if (XGetWindowProperty (dpy, win, prop,
2703 0, PROP_SIZE / 4,
2704 delete_prop, AnyPropertyType,
2705 &ct.encoding, &ct.format,
2706 &ct.nitems, &bytes_after,
2707 &ct.value) != Success)
2708 {
2709 ct.value = 0;
2710 goto bailout;
2711 }
2712
2713 if (ct.encoding == None)
2714 goto bailout;
2715
2716 if (bytes_after)
2717 {
2718 // fetch and append remaining data
2719 XTextProperty ct2;
2720
2721 if (XGetWindowProperty (dpy, win, prop,
2722 ct.nitems / 4, (bytes_after + 3) / 4,
2723 delete_prop, AnyPropertyType,
2724 &ct2.encoding, &ct2.format,
2725 &ct2.nitems, &bytes_after,
2726 &ct2.value) != Success)
2727 goto bailout;
2728
2729 // realloc should be compatible to XFree, here, and elsewhere, too
2730 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2731 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2732 ct.nitems += ct2.nitems;
2733
2734 XFree (ct2.value);
2735 }
2736
2737 if (ct.value == 0)
2738 goto bailout;
2739
2740 if (ct.encoding == xa[XA_INCR])
2741 {
2742 // INCR selection, start handshake
2743 if (!delete_prop)
2744 XDeleteProperty (dpy, win, prop);
2745
2746 selection_wait = Sel_incr;
2747 incr_buf_fill = 0;
2748 incr_ev.start (10);
2749
2750 goto bailout;
2751 }
2752
2753 if (ct.nitems == 0)
2754 {
2755 if (selection_wait == Sel_incr)
2756 {
2757 XFree (ct.value);
2758
2759 // finally complete, now paste the whole thing
2760 selection_wait = Sel_normal;
2761 ct.value = (unsigned char *)incr_buf;
2762 ct.nitems = incr_buf_fill;
2763 incr_buf = 0;
2764 incr_buf_size = 0;
2765 incr_ev.stop ();
2766 }
2767 else
2768 {
2769 if (selection_wait == Sel_normal
2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2771 {
2772 /*
2773 * pass through again trying CUT_BUFFER0 if we've come from
2774 * XConvertSelection () but nothing was presented
2775 */
2776 selection_paste (display->root, XA_CUT_BUFFER0, False);
2777 }
2778
2779 goto bailout;
2780 }
2781 }
2782 else if (selection_wait == Sel_incr)
2783 {
2784 incr_ev.start (10);
2785
2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2787 {
2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2790 }
2791
2792 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2793 incr_buf_fill += ct.nitems;
2794
2795 goto bailout;
2796 }
2797
2798 char **cl;
2799 int cr;
2800
2801#if !ENABLE_MINIMAL
2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2803 // so recode it manually
2804 if (ct.encoding == xa[XA_UTF8_STRING])
2805 {
2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807 char *s = rxvt_wcstombs (w);
2808 free (w);
2809 // TODO: strlen == only the first element will be converted. well...
2810 paste (s, strlen (s));
2811 free (s);
2812 }
2813 else
2814#endif
2815 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2816 && cl)
2817 {
2818 for (int i = 0; i < cr; i++)
2819 paste (cl[i], strlen (cl[i]));
2820
2821 XFreeStringList (cl);
2822 }
2823 else
2824 paste ((char *)ct.value, ct.nitems); // paste raw
2825
2826bailout:
2827 XFree (ct.value);
2828
2829 if (selection_wait == Sel_normal)
2830 selection_wait = Sel_none;
2831}
2832
2833void
2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2835{
2836 selection_wait = Sel_none;
2837
2838 incr_buf_size = 0;
2839 free (incr_buf);
2840
2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2842}
2843
2844void
2845rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2846{
2847 if (prop == None || selection_wait != Sel_incr)
2848 return; 2727 return;
2849 2728
2850 selection_paste (win, prop, true); 2729 tt_paste (data, len);
2851} 2730}
2852 2731
2853/* ------------------------------------------------------------------------- */ 2732/* ------------------------------------------------------------------------- */
2854/* 2733/*
2855 * Request the current selection: 2734 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2856 * Order: > internal selection if available 2735 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2736 * as fallback
2858 * > CUT_BUFFER0
2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2860 * will auto fallback to CUT_BUFFER0
2861 * EXT: button 2 release 2737 * EXT: button 2 release
2862 */ 2738 */
2863void 2739void
2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2740rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2865{ 2741{
2866 if (selection.text && selnum == Sel_Primary) 2742 if (!selection_req)
2867 {
2868 /* internal selection */
2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2870 paste (str, strlen (str));
2871 free (str);
2872 return;
2873 } 2743 {
2874 else 2744 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2745 selection_req->run ();
2875 { 2746 }
2876 selection_request_time = tm;
2877 selection_wait = Sel_normal;
2878
2879#if X_HAVE_UTF8_STRING
2880 selection_type = Sel_UTF8String;
2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882 return;
2883#else
2884 selection_type = Sel_CompoundText;
2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886 return;
2887#endif
2888 }
2889
2890 selection_wait = Sel_none; /* don't loop in selection_paste () */
2891 selection_paste (display->root, XA_CUT_BUFFER0, false);
2892}
2893
2894int
2895rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2896{
2897 Atom sel;
2898
2899 selection_type |= selnum;
2900
2901 if (selnum == Sel_Primary)
2902 sel = XA_PRIMARY;
2903 else if (selnum == Sel_Secondary)
2904 sel = XA_SECONDARY;
2905 else
2906 sel = xa[XA_CLIPBOARD];
2907
2908 if (XGetSelectionOwner (dpy, sel) != None)
2909 {
2910 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2911 vt, selection_request_time);
2912 return 1;
2913 }
2914
2915 return 0;
2916} 2747}
2917 2748
2918/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2919/* 2750/*
2920 * Clear all selected text 2751 * Clear all selected text
2921 * EXT: SelectionClear 2752 * EXT: SelectionClear
2922 */ 2753 */
2923void 2754void
2924rxvt_term::selection_clear () NOTHROW 2755rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2756{
2757 if (!clipboard)
2758 {
2926 want_refresh = 1; 2759 want_refresh = 1;
2927 free (selection.text); 2760 free (selection.text);
2928 selection.text = NULL; 2761 selection.text = NULL;
2929 selection.len = 0; 2762 selection.len = 0;
2930 CLEAR_SELECTION (); 2763 CLEAR_SELECTION ();
2931 2764
2932 if (display->selection_owner == this) 2765 if (display->selection_owner == this)
2933 display->selection_owner = 0; 2766 display->selection_owner = 0;
2767 }
2768 else
2769 {
2770 free (selection.clip_text);
2771 selection.clip_text = NULL;
2772 selection.clip_len = 0;
2773
2774 if (display->clipboard_owner == this)
2775 display->clipboard_owner = 0;
2776 }
2934} 2777}
2935 2778
2936/* ------------------------------------------------------------------------- */ 2779/* ------------------------------------------------------------------------- */
2937/* 2780/*
2938 * Copy a selection into the cut buffer 2781 * Copy a selection into the cut buffer
2939 * EXT: button 1 or 3 release 2782 * EXT: button 1 or 3 release
2940 */ 2783 */
2941void 2784void
2942rxvt_term::selection_make (Time tm) 2785rxvt_term::selection_make (Time tm)
2943{ 2786{
2944 int i; 2787 int size;
2945 wchar_t *new_selection_text; 2788 wchar_t *new_selection_text;
2946 text_t *t; 2789 text_t *t;
2947 2790
2948 switch (selection.op) 2791 switch (selection.op)
2949 { 2792 {
… …
2965 return; /* nothing selected, go away */ 2808 return; /* nothing selected, go away */
2966 2809
2967 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2810 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2968 return; 2811 return;
2969 2812
2970 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2813 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2971 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2814 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2972 2815
2973 int ofs = 0; 2816 int ofs = 0;
2974 int extra = 0; 2817 int extra = 0;
2975 2818
2976 int col = selection.beg.col; 2819 int col = selection.beg.col;
… …
2982 { 2825 {
2983#if !ENABLE_MINIMAL 2826#if !ENABLE_MINIMAL
2984 if (selection.rect) 2827 if (selection.rect)
2985 { 2828 {
2986 col = selection.beg.col; 2829 col = selection.beg.col;
2987 end_col = ncol + 1; 2830 end_col = selection.end.col;
2988 } 2831 }
2989 else 2832 else
2990#endif 2833#endif
2991 end_col = ROW(row).l; 2834 end_col = ROW(row).l;
2992 2835
2993 col = max (col, 0); 2836 col = max (col, 0);
2994 2837
2995 if (row == selection.end.row 2838 if (row == selection.end.row)
2996#if !ENABLE_MINIMAL
2997 || selection.rect
2998#endif
2999 )
3000 min_it (end_col, selection.end.col); 2839 min_it (end_col, selection.end.col);
3001 2840
3002 t = ROW(row).t + col; 2841 t = ROW(row).t + col;
3003 2842
3004 for (; col < end_col; col++) 2843 for (; col < end_col; col++)
… …
3012 2851
3013 extra -= (len - 1); 2852 extra -= (len - 1);
3014 2853
3015 if (extra < 0) 2854 if (extra < 0)
3016 { 2855 {
3017 extra += i; 2856 extra += size;
3018 i += i; 2857 size += size;
3019 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2858 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3020 } 2859 }
3021 2860
3022 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2861 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3023 } 2862 }
3024#endif 2863#endif
… …
3036 2875
3037 new_selection_text[ofs++] = C0_LF; 2876 new_selection_text[ofs++] = C0_LF;
3038 } 2877 }
3039 else 2878 else
3040#endif 2879#endif
3041 if (!ROW(row).is_longer () && row != selection.end.row) 2880 if (!ROW(row).is_longer ()
2881 && (row != selection.end.row || end_col != selection.end.col)
2882 && (row != selection.beg.row || selection.beg.col < ncol))
3042 new_selection_text[ofs++] = C0_LF; 2883 new_selection_text[ofs++] = C0_LF;
3043 } 2884 }
3044
3045 if (end_col != selection.end.col)
3046 new_selection_text[ofs++] = C0_LF;
3047 2885
3048 new_selection_text[ofs] = 0; 2886 new_selection_text[ofs] = 0;
3049 2887
3050 if (ofs == 0) 2888 if (ofs == 0)
3051 { 2889 {
… …
3064 2902
3065 selection_grab (tm); 2903 selection_grab (tm);
3066} 2904}
3067 2905
3068bool 2906bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 2907rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 2908{
2909 Atom sel;
2910
2911 if (!clipboard)
2912 {
3071 selection_time = tm; 2913 selection_time = tm;
2914 sel = XA_PRIMARY;
2915 }
2916 else
2917 {
2918 clipboard_time = tm;
2919 sel = xa[XA_CLIPBOARD];
2920 }
3072 2921
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2922 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2923 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 2924 {
3076 display->set_selection_owner (this); 2925 display->set_selection_owner (this, clipboard);
3077 return true; 2926 return true;
3078 } 2927 }
3079 else 2928 else
3080 { 2929 {
3081 selection_clear (); 2930 selection_clear (clipboard);
3082 return false; 2931 return false;
3083 } 2932 }
3084 2933
3085#if 0 2934#if 0
3086 XTextProperty ct; 2935 XTextProperty ct;
… …
3096/* ------------------------------------------------------------------------- */ 2945/* ------------------------------------------------------------------------- */
3097/* 2946/*
3098 * Mark or select text based upon number of clicks: 1, 2, or 3 2947 * Mark or select text based upon number of clicks: 1, 2, or 3
3099 * EXT: button 1 press 2948 * EXT: button 1 press
3100 */ 2949 */
3101void 2950void ecb_cold
3102rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2951rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3103{ 2952{
3104 clicks = ((clicks - 1) % 3) + 1; 2953 clicks = ((clicks - 1) % 3) + 1;
3105 selection.clicks = clicks; /* save clicks so extend will work */ 2954 selection.clicks = clicks; /* save clicks so extend will work */
3106 2955
… …
3125 2974
3126/* ------------------------------------------------------------------------- */ 2975/* ------------------------------------------------------------------------- */
3127/* 2976/*
3128 * Mark a selection at the specified col/row 2977 * Mark a selection at the specified col/row
3129 */ 2978 */
3130void 2979void ecb_cold
3131rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2980rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3132{ 2981{
3133 want_refresh = 1; 2982 want_refresh = 1;
3134 2983
3135 selection.mark.row = row + view_start; 2984 selection.mark.row = row + view_start;
… …
3162/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3011/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3163#define DELIMIT_TEXT(x) \ 3012#define DELIMIT_TEXT(x) \
3164 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3013 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3165#define DELIMIT_REND(x) 1 3014#define DELIMIT_REND(x) 1
3166 3015
3167void 3016void ecb_cold
3168rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3017rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3169{ 3018{
3170 int col, row, dirnadd, tcol, trow, w1, w2; 3019 int col, row, dirnadd, tcol, trow, w1, w2;
3171 row_col_t bound; 3020 row_col_t bound;
3172 text_t *stp; 3021 text_t *stp;
… …
3246 * EXT: button 3 press; button 1 or 3 drag 3095 * EXT: button 3 press; button 1 or 3 drag
3247 * flag == 0 ==> button 1 3096 * flag == 0 ==> button 1
3248 * flag == 1 ==> button 3 press 3097 * flag == 1 ==> button 3 press
3249 * flag == 2 ==> button 3 motion 3098 * flag == 2 ==> button 3 motion
3250 */ 3099 */
3251void 3100void ecb_cold
3252rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3101rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3253{ 3102{
3254 int col = clamp (Pixel2Col (x), 0, ncol); 3103 int col = clamp (Pixel2Col (x), 0, ncol);
3255 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3104 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3256 3105
… …
3282 3131
3283/* ------------------------------------------------------------------------- */ 3132/* ------------------------------------------------------------------------- */
3284/* 3133/*
3285 * Extend the selection to the specified col/row 3134 * Extend the selection to the specified col/row
3286 */ 3135 */
3287void 3136void ecb_cold
3288rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3137rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3289{ 3138{
3290 row_col_t pos; 3139 row_col_t pos;
3291 enum { 3140 enum {
3292 LEFT, RIGHT 3141 LEFT, RIGHT
… …
3483 ::swap (selection.beg.col, selection.end.col); 3332 ::swap (selection.beg.col, selection.end.col);
3484#endif 3333#endif
3485} 3334}
3486 3335
3487#if !ENABLE_MINIMAL 3336#if !ENABLE_MINIMAL
3488void 3337void ecb_cold
3489rxvt_term::selection_remove_trailing_spaces () NOTHROW 3338rxvt_term::selection_remove_trailing_spaces () NOTHROW
3490{ 3339{
3491 int32_t end_col, end_row; 3340 int32_t end_col, end_row;
3492 text_t *stp; 3341 text_t *stp;
3493 3342
… …
3531/* ------------------------------------------------------------------------- */ 3380/* ------------------------------------------------------------------------- */
3532/* 3381/*
3533 * Double click on button 3 when already selected 3382 * Double click on button 3 when already selected
3534 * EXT: button 3 double click 3383 * EXT: button 3 double click
3535 */ 3384 */
3536void 3385void ecb_cold
3537rxvt_term::selection_rotate (int x, int y) NOTHROW 3386rxvt_term::selection_rotate (int x, int y) NOTHROW
3538{ 3387{
3539 selection.clicks = selection.clicks % 3 + 1; 3388 selection.clicks = selection.clicks % 3 + 1;
3540 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3389 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3541} 3390}
… …
3543/* ------------------------------------------------------------------------- */ 3392/* ------------------------------------------------------------------------- */
3544/* 3393/*
3545 * Respond to a request for our current selection 3394 * Respond to a request for our current selection
3546 * EXT: SelectionRequest 3395 * EXT: SelectionRequest
3547 */ 3396 */
3548void 3397void ecb_cold
3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3398rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3550{ 3399{
3400 Atom property = rq.property == None ? rq.target : rq.property;
3551 XSelectionEvent ev; 3401 XSelectionEvent ev;
3552 3402
3553 ev.type = SelectionNotify; 3403 ev.type = SelectionNotify;
3554 ev.property = None; 3404 ev.property = None;
3555 ev.display = rq.display; 3405 ev.display = rq.display;
… …
3570 *target++ = xa[XA_COMPOUND_TEXT]; 3420 *target++ = xa[XA_COMPOUND_TEXT];
3571#if X_HAVE_UTF8_STRING 3421#if X_HAVE_UTF8_STRING
3572 *target++ = xa[XA_UTF8_STRING]; 3422 *target++ = xa[XA_UTF8_STRING];
3573#endif 3423#endif
3574 3424
3575 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3425 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3576 32, PropModeReplace, 3426 32, PropModeReplace,
3577 (unsigned char *)target_list, target - target_list); 3427 (unsigned char *)target_list, target - target_list);
3578 ev.property = rq.property; 3428 ev.property = property;
3579 } 3429 }
3580#if TODO // TODO 3430#if TODO // TODO
3581 else if (rq.target == xa[XA_MULTIPLE]) 3431 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3432 {
3583 /* TODO: Handle MULTIPLE */ 3433 /* TODO: Handle MULTIPLE */
3584 } 3434 }
3585#endif 3435#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3436 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3437 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3438 XChangeProperty (dpy, rq.requestor, property, rq.target,
3589 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3439 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3590 ev.property = rq.property; 3440 ev.property = property;
3441 }
3442 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3443 {
3444 XChangeProperty (dpy, rq.requestor, property, rq.target,
3445 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3446 ev.property = property;
3591 } 3447 }
3592 else if (rq.target == XA_STRING 3448 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3449 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3450 || rq.target == xa[XA_COMPOUND_TEXT]
3595 || rq.target == xa[XA_UTF8_STRING] 3451 || rq.target == xa[XA_UTF8_STRING]
… …
3627 { 3483 {
3628 target = xa[XA_COMPOUND_TEXT]; 3484 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3485 style = enc_compound_text;
3630 } 3486 }
3631 3487
3632 if (selection.text) 3488 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3489 {
3634 cl = selection.text; 3490 cl = selection.text;
3635 selectlen = selection.len; 3491 selectlen = selection.len;
3492 }
3493 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3494 {
3495 cl = selection.clip_text;
3496 selectlen = selection.clip_len;
3636 } 3497 }
3637 else 3498 else
3638 { 3499 {
3639 cl = L""; 3500 cl = L"";
3640 selectlen = 0; 3501 selectlen = 0;
… …
3661 ct.value = (unsigned char *)cl; 3522 ct.value = (unsigned char *)cl;
3662 ct.nitems = selectlen; 3523 ct.nitems = selectlen;
3663 ct.encoding = target; 3524 ct.encoding = target;
3664 } 3525 }
3665 3526
3666 XChangeProperty (dpy, rq.requestor, rq.property, 3527 XChangeProperty (dpy, rq.requestor, property,
3667 ct.encoding, 8, PropModeReplace, 3528 ct.encoding, 8, PropModeReplace,
3668 ct.value, (int)ct.nitems); 3529 ct.value, (int)ct.nitems);
3669 ev.property = rq.property; 3530 ev.property = property;
3670 3531
3671 if (freect) 3532 if (freect)
3672 XFree (ct.value); 3533 XFree (ct.value);
3673 } 3534 }
3674 3535
3675 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3536 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3676} 3537}
3677 3538
3678/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
3679#ifdef USE_XIM 3540#if USE_XIM
3680void 3541void ecb_cold
3681rxvt_term::im_set_position (XPoint &pos) NOTHROW 3542rxvt_term::im_set_position (XPoint &pos) NOTHROW
3682{ 3543{
3683 XWindowAttributes xwa; 3544 XWindowAttributes xwa;
3684 3545
3685 XGetWindowAttributes (dpy, vt, &xwa); 3546 XGetWindowAttributes (dpy, vt, &xwa);
… …
3708 h += 2; min_it (h, nrow); 3569 h += 2; min_it (h, nrow);
3709 3570
3710 x -= 1; clamp_it (x, 0, ncol - w); 3571 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3572 y -= 1; clamp_it (y, 0, nrow - h);
3712 3573
3713 ov_x = x; ov_y = y; 3574 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3575 ov.w = w; ov.h = h;
3715 3576
3716 ov_text = new text_t *[h]; 3577 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3578 ov.rend = new rend_t *[h];
3718 3579
3719 for (y = 0; y < h; y++) 3580 for (y = 0; y < h; y++)
3720 { 3581 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3582 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3583 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3584
3724 text_t t0, t1, t2; 3585 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3586 rend_t r = OVERLAY_RSTYLE;
3726 3587
3727 if (y == 0) 3588 if (y == 0)
… …
3746} 3607}
3747 3608
3748void 3609void
3749rxvt_term::scr_overlay_off () NOTHROW 3610rxvt_term::scr_overlay_off () NOTHROW
3750{ 3611{
3751 if (!ov_text) 3612 if (!ov.text)
3752 return; 3613 return;
3753 3614
3754 want_refresh = 1; 3615 want_refresh = 1;
3755 3616
3756 for (int y = 0; y < ov_h; y++) 3617 for (int y = 0; y < ov.h; y++)
3757 { 3618 {
3758 delete [] ov_text[y]; 3619 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3620 delete [] ov.rend[y];
3760 } 3621 }
3761 3622
3762 delete [] ov_text; ov_text = 0; 3623 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3624 delete [] ov.rend; ov.rend = 0;
3764} 3625}
3765 3626
3766void 3627void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3628rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3629{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3630 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3631 return;
3771 3632
3772 x++, y++; 3633 x++, y++;
3773 3634
3774 ov_text[y][x] = text; 3635 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3636 ov.rend[y][x] = rend;
3776} 3637}
3777 3638
3778void 3639void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3640rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3641{
… …
3799} 3660}
3800 3661
3801void 3662void
3802rxvt_term::scr_swap_overlay () NOTHROW 3663rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3664{
3804 if (!ov_text) 3665 if (!ov.text)
3805 return; 3666 return;
3806 3667
3668 // hide cursor if it is within the overlay area
3669 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3670 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3671 screen.flags &= ~Screen_VisibleCursor;
3672
3807 // swap screen mem with overlay 3673 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3674 for (int y = ov.h; y--; )
3809 { 3675 {
3810 text_t *t1 = ov_text[y]; 3676 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3677 rend_t *r1 = ov.rend[y];
3812 3678
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3679 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3814 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3680 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3681
3816 for (int x = ov_w; x--; ) 3682 for (int x = ov.w; x--; )
3817 { 3683 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3684 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3685 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3686 }
3821 } 3687 }

Diff Legend

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