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.360 by sf-exg, Wed Jan 5 22:29:50 2011 UTC vs.
Revision 1.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <inttypes.h> 32#include <inttypes.h>
32 33
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 34static inline void
36fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
37{ 36{
38 while (len--) 37 while (len--)
39 *start++ = value; 38 *start++ = value;
40} 39}
41 40
42/* ------------------------------------------------------------------------- */ 41/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 42#define TABSIZE 8 /* default tab size */
46 43
47/* ------------------------------------------------------------------------- * 44/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 45 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 46 * ------------------------------------------------------------------------- */
… …
100 97
101/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
102void 99void
103rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
104{ 101{
105 if (!l.t) 102 if (!l.valid ())
106 { 103 {
107 lalloc (l); 104 l.alloc ();
108 col = 0; 105 col = 0;
109 width = ncol; 106 width = ncol;
110 } 107 }
111 108
112 l.touch (); 109 l.touch ();
… …
154 l.r[col] = rend; 151 l.r[col] = rend;
155 col++; 152 col++;
156 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
157} 154}
158 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
159/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
160 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
161 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
162 169
163void 170void
171rxvt_term::scr_alloc () NOTHROW
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
164rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
165{ 216{
217#if ENABLE_OVERLAY
218 scr_overlay_off ();
219#endif
220
166 view_start = 0; 221 view_start = 0;
167 num_scr = 0; 222 num_scr = 0;
168 223
169 if (ncol == 0) 224 if (ncol == 0)
170 ncol = 80; 225 ncol = 80;
… …
190 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
191 246
192 screen.tscroll = 0; 247 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
194 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
195 if (!row_buf) 258 if (!prev_row_buf)
196 { 259 {
197 /*
198 * first time called so just malloc everything: don't rely on realloc
199 */
200 top_row = 0; 260 top_row = 0;
201 term_start = 0; 261 term_start = 0;
202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210 for (int row = nrow; row--; )
211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
216 262
217 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
243 { 289 {
244 /* 290 /*
245 * add or delete rows as appropriate 291 * add or delete rows as appropriate
246 */ 292 */
247 293
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 295
265 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
266 { 297 {
267 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
269 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
270 301
271 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
272 { 303 }
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 304
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
283 308
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 317
293 do 318 do
294 { 319 {
295 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 322 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 324
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 326 {
302 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
303 328
304 plines++; 329 plines++;
305 llen += prev_ncol; 330 llen += prev_ncol;
… …
318 343
319 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
321 { 346 {
322 qline = row_buf + qrow; 347 qline = row_buf + qrow;
323 lalloc (*qline); 348 qline->alloc (); // redundant with next line
324 qline->l = ncol; 349 qline->l = ncol;
325 qline->is_longer (1); 350 qline->is_longer (1);
326 351
327 int qcol = 0; 352 int qcol = 0;
328 353
… …
343 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
344 // least. 369 // least.
345 if (prow == ocur.row) 370 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
347 372
348 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
349 374
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 376
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 399 {
375 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
376 401
377 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
378 { 403 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
381 406
382 qline = pline; 407 copy_line (dst, src);
383 lresize (qline);
384 } 408 }
385 409
386 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 412
391 term_start = 0; 413 term_start = 0;
392 } 414 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 415
398 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 418 }
401 419
420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
402 free (tabs); 429 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
404 431
405 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
… …
413 tt_winch (); 440 tt_winch ();
414 441
415 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416} 443}
417 444
418/* ------------------------------------------------------------------------- */ 445void ecb_cold
419/*
420 * Free everything. That way malloc debugging can find leakage.
421 */
422void
423rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () NOTHROW
424{ 447{
425 if (row_buf) 448 chunk_free (chunk, chunk_size);
426 { 449 chunk = 0;
427 delete talloc; talloc = 0; 450 row_buf = 0;
428 delete ralloc; ralloc = 0;
429 451
430 free (row_buf);
431 free (swap_buf);
432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
435 free (tabs); 452 free (tabs);
436 tabs = 0; 453 tabs = 0;
437 }
438} 454}
439 455
440/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
441/* 457/*
442 * Hard/Soft reset 458 * Hard/Soft reset
443 */ 459 */
444void 460void ecb_cold
445rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
446{ 462{
447 scr_release (); 463 scr_release ();
464
448 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false; 466 rvideo_mode = false;
450 scr_soft_reset (); 467 scr_soft_reset ();
451 scr_reset (); 468 scr_reset ();
452 469
453 scr_clear (true); 470 scr_clear (true);
454 scr_refresh (); 471 scr_refresh ();
455} 472}
456 473
457void 474void ecb_cold
458rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () NOTHROW
459{ 476{
460 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
462 scr_overlay_off (); 479 scr_overlay_off ();
463#endif 480#endif
… …
518 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
519 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
520} 537}
521 538
522void 539void
523rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () NOTHROW
524{ 541{
525 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
526 return; 543 return;
527 544
528 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
547 return; 564 return;
548 565
549 want_refresh = 1; 566 want_refresh = 1;
550 view_start = 0; 567 view_start = 0;
551 568
552 selection_check (2); /* check for boundary cross */ 569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
553 575
554 current_screen = scrn; 576 current_screen = scrn;
555 577
556#if NSCREENS 578#if NSCREENS
557 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
593 * Change the colour for following text 615 * Change the colour for following text
594 */ 616 */
595void 617void
596rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
597{ 619{
598 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
599 color = fgbg; 621 color = fgbg;
600 622
601 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
602 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
603 else 625 else
… …
623/* 645/*
624 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
625 * count positive ==> scroll up 647 * count positive ==> scroll up
626 * count negative ==> scroll down 648 * count negative ==> scroll down
627 */ 649 */
628int 650int ecb_hot
629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630{ 652{
631 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
632 return 0; 654 return 0;
633 655
… …
636 658
637 if (count > 0 659 if (count > 0
638 && row1 == 0 660 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
641 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 666
646 // sever bottommost line 667 // sever bottommost line
647 { 668 {
648 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
649 l.is_longer (0); 670 l.is_longer (0);
650 l.touch (); 671 l.touch ();
651 } 672 }
652 673
674 // scroll everything up 'count' lines
675 term_start = (term_start + count) % total_rows;
676
677 // now copy lines below the scroll region bottom to the
678 // bottom of the screen again, so they look as if they
679 // hadn't moved.
680 for (int i = nrow; --i > row2; )
681 {
682 line_t &l1 = ROW(i - count);
683 line_t &l2 = ROW(i);
684
685 ::swap (l1, l2);
686 l2.touch ();
687 }
688
653 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 690 for (int i = count; i--; )
655 { 691 {
656 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
657 693
658 // optimize if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
660 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 696 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 697 {
662 scr_blank_line (l, 0, l.l, rstyle); 698 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 699 l.l = 0;
… …
665 } 701 }
666 else 702 else
667 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
668 } 704 }
669 705
670 // now copy lines below the scroll region bottom to the
671 // bottom of the screen again, so they look as if they
672 // hadn't moved.
673 for (int i = nrow; --i > row2; )
674 {
675 line_t &l1 = ROW(i - count);
676 line_t &l2 = ROW(i);
677
678 ::swap (l1, l2);
679 l2.touch ();
680 }
681
682 // move and/or clear selection, if any 706 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
684 { 709 {
685 selection.beg.row -= count; 710 selection.beg.row -= count;
686 selection.end.row -= count; 711 selection.end.row -= count;
687 selection.mark.row -= count; 712 selection.mark.row -= count;
688 713
689 if (selection.beg.row < top_row 714 selection_check (0);
690 || selection.end.row < top_row
691 || selection.mark.row < top_row)
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR;
695 }
696 } 715 }
697 716
698 // finally move the view window, if desired 717 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 719 && view_start != 0
701 && view_start != -saveLines) 720 && view_start != -saveLines)
702 scr_page (UP, count); 721 scr_page (count);
703 722
704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
705 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
706 } 725 }
707 else 726 else
… …
730 } 749 }
731 750
732 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
734 753
754 // sever line above scroll region
755 if (row1)
756 {
757 line_t &l = ROW(row1 - 1);
758 l.is_longer (0);
759 l.touch ();
760 }
761
735 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
736 763
737 min_it (count, rows); 764 min_it (count, rows);
738 765
739 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 767
741 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
742 { 769 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 771
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 774 }
748 775
749 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 777 ROW(row1 + row) = temp_buf [row];
778
779 // sever bottommost line
780 {
781 line_t &l = ROW(row2);
782 l.is_longer (0);
783 l.touch ();
784 }
751 } 785 }
752 786
753 return count; 787 return count;
754} 788}
755 789
756/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
757/* 791/*
758 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
759 */ 793 */
760void 794void ecb_hot
761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762{ 796{
763 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
764 return; 798 return;
765 799
766 unsigned char checksel; 800 bool checksel;
767 unicode_t c; 801 unicode_t c;
768 int ncol = this->ncol; 802 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
770 804
771 want_refresh = 1; 805 want_refresh = 1;
… …
797 831
798 while (str < strend) 832 while (str < strend)
799 { 833 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 835
802 if (expect_false (c < 0x20)) 836 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 837 if (c == C0_LF)
804 { 838 {
805 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
806 840
807 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
826 { 860 {
827 scr_tab (1, true); 861 scr_tab (1, true);
828 continue; 862 continue;
829 } 863 }
830 864
831 if (expect_false ( 865 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 869 ))
836 { 870 {
… …
841 * should be a similar check. 875 * should be a similar check.
842 */ 876 */
843 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
844 } 878 }
845 879
846 if (expect_false (screen.flags & Screen_WrapNext)) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 881 {
848 scr_do_wrap (); 882 scr_do_wrap ();
849 883
850 line->l = ncol; 884 line->l = ncol;
851 line->is_longer (1); 885 line->is_longer (1);
… …
853 row = screen.cur.row; 887 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
855 } 889 }
856 890
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 893 c = 0xfffd;
860 894
861 // rely on wcwidth to tell us the character width, do wcwidth before 895 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 896 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
864 // locale. 898 // locale.
865 int width = WCWIDTH (c); 899 int width = WCWIDTH (c);
866 900
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 902 {
869 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 904 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
887 } 921 }
888 } 922 }
889 923
890 if (expect_false (screen.flags & Screen_Insert)) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
892 926
893 if (width != 0) 927 if (width != 0)
894 { 928 {
895#if !UNICODE_3 929#if !UNICODE_3
… …
903#endif 937#endif
904 938
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 940
907 // if the character doesn't fit into the remaining columns... 941 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 943 {
910 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
911 { 945 {
912 // ... artificially enlargen the previous one 946 // ... artificially enlargen the previous one
913 c = NOCHAR; 947 c = NOCHAR;
… …
920 954
921 // nuke the character at this position, if required 955 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop 956 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 957 // we never have to check for overwriting a wide char itself,
924 // only its tail. 958 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 960 scr_kill_char (*line, screen.cur.col);
927 961
928 line->touch (); 962 line->touch ();
929 963
930 do 964 do
931 { 965 {
932 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
934 968
935 if (expect_true (screen.cur.col < ncol - 1)) 969 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 970 screen.cur.col++;
937 else 971 else
938 { 972 {
939 line->l = ncol; 973 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
… …
943 goto end_of_line; 977 goto end_of_line;
944 } 978 }
945 979
946 c = NOCHAR; 980 c = NOCHAR;
947 } 981 }
948 while (expect_false (--width > 0)); 982 while (ecb_unlikely (--width > 0));
949 983
950 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952 { 986 {
953 line->t[c] = ' '; 987 line->t[c] = ' ';
954 line->r[c] = rend; 988 line->r[c] = rend;
955 } 989 }
956 990
… …
978 } 1012 }
979 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
980 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
981 { 1015 {
982 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
983 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
984 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
985 } 1019 }
986 else 1020 else
987 continue; 1021 continue;
988 1022
989 linep->touch (); 1023 linep->touch ();
… …
1115 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1118 */ 1152 */
1119#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1120void 1154void ecb_cold
1121rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1122{ 1156{
1123 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125 else 1159 else
… …
1132 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1135 */ 1169 */
1136#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1137void 1171void ecb_cold
1138rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1139{ 1173{
1140 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142 else 1176 else
… …
1207 * direction should be UP or DN 1241 * direction should be UP or DN
1208 */ 1242 */
1209void 1243void
1210rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1211{ 1245{
1212 int dirn;
1213
1214 want_refresh = 1; 1246 want_refresh = 1;
1215 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1216 1248
1217 dirn = ((direction == UP) ? 1 : -1);
1218
1219 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1220 1250
1221 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1222 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1223 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1224 else 1254 else
1225 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1226 1256
1227 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1228 selection_check (0); 1258 selection_check (0);
1229} 1259}
1230 1260
… …
1293 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1294} 1324}
1295 1325
1296/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1297/* 1327/*
1298 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302 */ 1332 */
1303void 1333void
… …
1312 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1313 1343
1314 switch (mode) 1344 switch (mode)
1315 { 1345 {
1316 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1317 selection_check (1);
1318 scr_erase_line (0); 1347 scr_erase_line (0);
1319 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1320 num = nrow - row; 1349 num = nrow - row;
1321 break; 1350 break;
1322 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1323 selection_check (3);
1324 scr_erase_line (1); 1352 scr_erase_line (1);
1325 row = 0; 1353 row = 0;
1326 num = screen.cur.row; 1354 num = screen.cur.row;
1327 break; 1355 break;
1328 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1329 selection_check (3);
1330 row = 0; 1357 row = 0;
1331 num = nrow; 1358 num = nrow;
1332 break; 1359 break;
1333 default: 1360 default:
1334 return; 1361 return;
… …
1351 { 1378 {
1352 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1353 1380
1354 if (mapped) 1381 if (mapped)
1355 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1358 } 1385 }
1359 else 1386 else
1360 { 1387 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1364 { 1391 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1396 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 } 1400 }
1374 } 1401 }
… …
1396/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1397/* 1424/*
1398 * Fill the screen with `E's 1425 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1427 */
1401void 1428void ecb_cold
1402rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1403{ 1430{
1404 rend_t fs; 1431 rend_t fs;
1405 1432
1406 want_refresh = 1; 1433 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1408 1435
1409 num_scr_allow = 0; 1436 num_scr_allow = 0;
1410 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1411 1442
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1414 { 1445 {
1415 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1566/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1567/* 1598/*
1568 * Set the scrolling region 1599 * Set the scrolling region
1569 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570 */ 1601 */
1571void 1602void ecb_cold
1572rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1573{ 1604{
1574 max_it (top, 0); 1605 max_it (top, 0);
1575 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1576 1607
… …
1586/* 1617/*
1587 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1588 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590 */ 1621 */
1591void 1622void ecb_cold
1592rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) NOTHROW
1593{ 1624{
1594 want_refresh = 1; 1625 want_refresh = 1;
1595 1626
1596 if (mode) 1627 if (mode)
… …
1603/* 1634/*
1604 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1605 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607 */ 1638 */
1608void 1639void ecb_cold
1609rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) NOTHROW
1610{ 1641{
1611 if (mode) 1642 if (mode)
1612 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1613 else 1644 else
… …
1622 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1623 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1624 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626 */ 1657 */
1627void 1658void ecb_cold
1628rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) NOTHROW
1629{ 1660{
1630 if (mode) 1661 if (mode)
1631 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1632 else 1663 else
… …
1639/* 1670/*
1640 * Set insert/replace mode 1671 * Set insert/replace mode
1641 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643 */ 1674 */
1644void 1675void ecb_cold
1645rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) NOTHROW
1646{ 1677{
1647 if (mode) 1678 if (mode)
1648 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1649 else 1680 else
… …
1655 * Set/Unset tabs 1686 * Set/Unset tabs
1656 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1657 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659 */ 1690 */
1660void 1691void ecb_cold
1661rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) NOTHROW
1662{ 1693{
1663 if (mode < 0) 1694 if (mode < 0)
1664 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1665 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
… …
1683 1714
1684 if (rvideo_state != on) 1715 if (rvideo_state != on)
1685 { 1716 {
1686 rvideo_state = on; 1717 rvideo_state = on;
1687 1718
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1723 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1724 }
1725 else
1726#endif
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1728#ifdef HAVE_IMG
1690 if (bgPixmap.pixmap == None) 1729 if (bg_img == 0)
1691#endif 1730#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1732
1694 XGCValues gcvalue; 1733 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
… …
1704/* ------------------------------------------------------------------------- */ 1743/* ------------------------------------------------------------------------- */
1705/* 1744/*
1706 * Report current cursor position 1745 * Report current cursor position
1707 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1708 */ 1747 */
1709void 1748void ecb_cold
1710rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () NOTHROW
1711{ 1750{
1712 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1751 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1713} 1752}
1714 1753
… …
1717 * ------------------------------------------------------------------------- */ 1756 * ------------------------------------------------------------------------- */
1718 1757
1719/* 1758/*
1720 * Set font style 1759 * Set font style
1721 */ 1760 */
1722void 1761void ecb_cold
1723rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () NOTHROW
1724{ 1763{
1725#if 0 1764#if 0
1726 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1727 { 1766 {
… …
1749 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1788 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1750 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1792 */
1754void 1793void ecb_cold
1755rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) NOTHROW
1756{ 1795{
1757 screen.charset = set; 1796 screen.charset = set;
1758 set_font_style (); 1797 set_font_style ();
1759} 1798}
… …
1780 * ------------------------------------------------------------------------- */ 1819 * ------------------------------------------------------------------------- */
1781 1820
1782/* 1821/*
1783 * refresh matching text. 1822 * refresh matching text.
1784 */ 1823 */
1785bool 1824bool ecb_cold
1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1787{ 1826{
1788 bool found = false; 1827 bool found = false;
1789 1828
1790 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
… …
1809 PART_BEG = 0, 1848 PART_BEG = 0,
1810 PART_END, 1849 PART_END,
1811 RC_COUNT 1850 RC_COUNT
1812}; 1851};
1813 1852
1814void 1853void ecb_hot
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1854rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816{ 1855{
1817 int i; 1856 int i;
1818 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1819 1858
… …
1856 * Refresh the entire screen 1895 * Refresh the entire screen
1857 */ 1896 */
1858void 1897void
1859rxvt_term::scr_touch (bool refresh) NOTHROW 1898rxvt_term::scr_touch (bool refresh) NOTHROW
1860{ 1899{
1861 scr_expose (0, 0, width, height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1862} 1901}
1863 1902
1864/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1865/* 1904/*
1866 * Move the display so that the line represented by scrollbar value Y is at 1905 * Move the display so that the line represented by scrollbar value Y is at
1867 * the top of the screen 1906 * the top of the screen
1868 */ 1907 */
1869void 1908void
1870rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) NOTHROW
1871{ 1910{
1872 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1911 // lerp (y, 0, len, top_row, nrow - 1)
1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1873} 1913}
1874 1914
1875/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1876/* 1916/*
1877 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1878 * direction should be UP or DN 1918 * direction should be UP or DN
1879 */ 1919 */
1880bool 1920bool
1881rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) NOTHROW
1882{ 1922{
1883 int new_view_start =
1884 direction == UP ? view_start - nlines
1885 : view_start + nlines;
1886
1887 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1888} 1924}
1889 1925
1890bool 1926bool
1891rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) NOTHROW
1892{ 1928{
… …
1922 1958
1923# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1961 if (option (Opt_mapAlert))
1926# endif 1962# endif
1927 XMapWindow (dpy, parent[0]); 1963 XMapWindow (dpy, parent);
1928# endif 1964# endif
1929 1965
1930# if ENABLE_FRILLS 1966# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1967 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1968 set_urgency (1);
… …
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1981 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1982#endif
1947} 1983}
1948 1984
1949/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1986void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1988{
1954#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1955 int nrows, row_start; 1990 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
… …
2005/* 2040/*
2006 * Refresh the screen 2041 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2044 */
2010void 2045void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () NOTHROW
2012{ 2047{
2013 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2050 int i; /* tmp */
2016#ifndef NO_CURSORCOLOR
2017 rend_t cc1; /* store colours at cursor position (s) */
2018#endif
2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2022 2056
2023 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2024 2058
2025 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2026 return; 2060 return;
… …
2029 * A: set up vars 2063 * A: set up vars
2030 */ 2064 */
2031 refresh_count = 0; 2065 refresh_count = 0;
2032 2066
2033 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2068 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2036 have_bg = bgPixmap.pixmap != None; 2070 have_bg = bg_img != 0;
2037#endif 2071#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2073
2040 /* 2074 /*
2041 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2081 scr_swap_overlay ();
2048#endif 2082#endif
2049 2083
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2085
2052 /* 2086 /*
2053 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2054 */ 2088 */
2055 { 2089 {
2056 unsigned char setoldcursor;
2057
2058#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2091 if (hidden_cursor)
2060 showcursor = 0; 2092 showcursor = 0;
2061#endif 2093#endif
2062 2094
… …
2065 int col = screen.cur.col; 2097 int col = screen.cur.col;
2066 2098
2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2068 col--; 2100 col--;
2069 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2070 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2071 2109
2072#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2076 else 2113 else
2077#endif 2114#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2090 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2091#else 2128#else
2092 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2093#endif 2130#endif
2094 2131
2095 if (focus) 2132 if (focus && cursor_type == 0)
2096 { 2133 {
2097 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2098 *crp ^= RS_Uline; 2135
2099 else
2100 {
2101 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2102 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2103 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2104 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2105 } 2141 }
2106 } 2142 }
2107 2143
2108 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2109 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2110 if (ocrow != -1) 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2147
2148 // save the current cursor coordinates if the cursor is visible
2149 // and either the window is unfocused or the cursor style is
2150 // underline or vertical bar, so as to clear the outline cursor in
2151 // the next refresh if the cursor moves or becomes invisible
2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2111 { 2153 {
2112 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2113 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2114 {
2115 if (ocrow < nrow
2116 && oldcursor.col < ncol)
2117 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2118
2119 if (focus || !showcursor)
2120 oldcursor.row = -1;
2121 else
2122 setoldcursor = 1;
2123 }
2124 } 2156 }
2125 else if (!focus) 2157 else
2126 setoldcursor = 1;
2127
2128 if (setoldcursor)
2129 {
2130 if (screen.cur.row - view_start >= nrow)
2131 oldcursor.row = -1; 2158 oldcursor.row = -1;
2132 else
2133 {
2134 oldcursor.row = screen.cur.row - view_start;
2135 oldcursor.col = screen.cur.col;
2136 }
2137 }
2138 } 2159 }
2139 2160
2140#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2162 /*
2142 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2148 { 2169 {
2149 int16_t nits; 2170 int16_t nits;
2150 int i = num_scr; 2171 int i = num_scr;
2151 int j; 2172 int j;
2152 int len, wlen; 2173 int len, wlen;
2153 dLocal (int, num_scr);
2154 2174
2155 j = nrow; 2175 j = nrow;
2156 wlen = len = -1; 2176 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2158 2178
… …
2224 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2225 2245
2226 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2227 { 2247 {
2228 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2229 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2230 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2231 || (stp[col] == ' ' /* space w/ no background change */
2232 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2233 continue; 2250 continue;
2234 2251
2235 // redraw one or more characters 2252 // redraw one or more characters
2236 2253
2237 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2255 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2256 --col;
2240 2257
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2258 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2259 text_t *text = stp + col;
2243 int count = 1; 2260 int count = 1;
… …
2281 2298
2282 col--; /* went one too far. move back */ 2299 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2300 count -= i; /* dump any matching trailing chars */
2284 2301
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2302 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2303 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2304 count++, i--;
2288 2305
2289 /* 2306 /*
2290 * Determine the attributes for the string 2307 * Determine the attributes for the string
2291 */ 2308 */
2292 int fore = fgcolor_of (rend); // desired foreground 2309 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2310 int back = bgcolor_of (rend); // desired background
2294 2311
2295 // only do special processing if any attributes are set, which is unlikely 2312 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2313 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2314 {
2298 bool invert = rend & RS_RVid; 2315 bool invert = rend & RS_RVid;
2299 2316
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2317#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2318 if (rend & RS_Bold && fore == Color_fg)
… …
2390 /* 2407 /*
2391 * Actually do the drawing of the string here 2408 * Actually do the drawing of the string here
2392 */ 2409 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2410 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2411
2395 if (expect_true (have_bg && back == Color_bg)) 2412 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2413 {
2397 // this is very ugly, maybe push it into ->draw? 2414 // this is very ugly, maybe push it into ->draw?
2398 2415
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2416 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2417 if (text[i] != ' ')
… …
2407 did_clear: ; 2424 did_clear: ;
2408 } 2425 }
2409 else 2426 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2428
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2430 {
2431 if (showcursor && focus && row == screen.cur.row
2432 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2433 XSetForeground (dpy, gc, pix_colors[ccol1]);
2434 else
2414#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2438 else
2418#endif 2439#endif
… …
2430 */ 2451 */
2431 if (showcursor) 2452 if (showcursor)
2432 { 2453 {
2433 if (focus) 2454 if (focus)
2434 { 2455 {
2435 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2436 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2437 else 2458 else if (oldcursor.row >= 0)
2438 { 2459 {
2439 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2441 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2442#endif 2463 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row + 1) - 2,
2465 Width2Pixel (1),
2466 2);
2467 else
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 2,
2472 Height2Pixel (1));
2443 } 2473 }
2444 } 2474 }
2445 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2446 { 2476 {
2447 int cursorwidth = 1;
2448 int col = oldcursor.col;
2449
2450 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2451 col--;
2452
2453 while (col + cursorwidth < ncol
2454 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2455 cursorwidth++;
2456
2457#ifndef NO_CURSORCOLOR
2458 if (ISSET_PIXCOLOR (Color_cursor))
2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2460 else
2461#endif
2462 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2463 2478
2464 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2466 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2484 }
2470 } 2485 }
2471 2486
2472 /* 2487 /*
2473 * H: cleanup selection 2488 * H: cleanup selection
… …
2482 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2483 num_scr = 0; 2498 num_scr = 0;
2484 num_scr_allow = 1; 2499 num_scr_allow = 1;
2485} 2500}
2486 2501
2487void 2502void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2504{
2490 if (!l.t) 2505 if (!l.valid ())
2491 return; 2506 return;
2492 2507
2493 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494 2509
2495 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2496 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497} 2512}
2498 2513
2499void 2514void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () NOTHROW
2501{ 2516{
2502 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2504 2519
… …
2507 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2509 } 2524 }
2510} 2525}
2511 2526
2512void 2527void ecb_cold
2513rxvt_term::scr_recolour () NOTHROW 2528rxvt_term::scr_recolor (bool refresh) NOTHROW
2514{ 2529{
2515#ifdef HAVE_BG_PIXMAP 2530 bool transparent = false;
2516 bgPixmap.apply ();
2517#else
2518 2531
2532#ifdef HAVE_IMG
2533 if (bg_img != 0)
2534 {
2535# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT)
2537 {
2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2540
2541 transparent = true;
2542 }
2543 else
2544# endif
2545 {
2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2548 }
2549 }
2550 else
2551#endif
2552 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2520 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2555 }
2522 2556
2523 if (scrollBar.win) 2557 XClearWindow (dpy, parent);
2558
2559 if (scrollBar.state && scrollBar.win)
2524 { 2560 {
2561 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2526 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2527 scrollBar.show (0); 2566 scrollBar.show (0);
2528 } 2567 }
2529 2568
2530#endif 2569 if (refresh)
2531 2570 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2571 scr_clear ();
2534 scr_touch (true); 2572 scr_touch (true);
2573 }
2535 want_refresh = 1; 2574 want_refresh = 1;
2536} 2575}
2537 2576
2538/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2539void 2578void
… …
2596 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2597 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2598} 2637}
2599 2638
2600/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2601void 2640void ecb_hot
2602rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () NOTHROW
2603{ 2642{
2604 if (selection.op 2643 if (selection.op
2605 && current_screen == selection.screen 2644 && current_screen == selection.screen
2606 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
… …
2625 */ 2664 */
2626#if 0 2665#if 0
2627void 2666void
2628rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) NOTHROW
2629{ 2668{
2630 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2631 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2632 const char r1[] = "\n";
2633
2634 for (row = saveLines + top_row;
2635 row < saveLines + nrow - 1; row++)
2636 {
2637 width = row_buf[row].l >= 0 ? row_buf[row].l
2638 : ncol;
2639 for (towrite = width; towrite; towrite -= wrote)
2640 {
2641 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2642 towrite);
2643 if (wrote < 0)
2644 return; /* XXX: death, no report */
2645 }
2646 if (row_buf[row].l >= 0)
2647 if (write (fd, r1, 1) <= 0)
2648 return; /* XXX: death, no report */
2649 }
2650} 2671}
2651#endif 2672#endif
2652 2673
2653/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2654 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2655 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2656void 2677void
2657rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) NOTHROW
2658{ 2679{
2659 row_col_t pos;
2660
2661 if (!selection.op) 2680 if (!selection.op)
2662 return; 2681 return;
2663 2682
2664 pos.row = pos.col = 0;
2665 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2666 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2667 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2668 || (check_more == 1 2686 || (check_more == 1
2669 && current_screen == selection.screen 2687 && current_screen == selection.screen
2670 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2671 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2672 || (check_more == 2
2673 && ROWCOL_IS_BEFORE (selection.beg, pos)
2674 && ROWCOL_IS_AFTER (selection.end, pos))
2675 || (check_more == 3
2676 && ROWCOL_IS_AFTER (selection.end, pos))
2677 || (check_more == 4 /* screen width change */
2678 && (selection.beg.row != selection.end.row
2679 || selection.end.col > ncol)))
2680 CLEAR_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2691}
2692
2693void
2694rxvt_term::selection_changed () NOTHROW
2695{
2696 line_t &r1 = ROW (selection.beg.row);
2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2698 ++selection.beg.col;
2699
2700 line_t &r2 = ROW (selection.end.row);
2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2702 ++selection.end.col;
2703
2704 want_refresh = 1;
2681} 2705}
2682 2706
2683/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2684/* 2708/*
2685 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
… …
2691 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2692 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2693 data[i] = C0_CR; 2717 data[i] = C0_CR;
2694 2718
2695 if (priv_modes & PrivMode_BracketPaste) 2719 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[200~"); 2720 tt_printf ("\x1b[200~");
2697 2721
2698 tt_write (data, len); 2722 tt_write (data, len);
2699 2723
2700 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2701 tt_printf ("\e[201~"); 2725 tt_printf ("\x1b[201~");
2702} 2726}
2703 2727
2704void 2728void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW 2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{ 2730{
… …
2710 tt_paste (data, len); 2734 tt_paste (data, len);
2711} 2735}
2712 2736
2713/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2714/* 2738/*
2715 * Respond to a notification that a primary selection has been sent 2739 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2716 * EXT: SelectionNotify 2740 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2717 */ 2741 * as fallback
2718void
2719rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720{
2721 if (prop == None) /* check for failed XConvertSelection */
2722 {
2723 if ((selection_type & Sel_CompoundText))
2724 {
2725 int selnum = selection_type & Sel_whereMask;
2726
2727 selection_type = 0;
2728 if (selnum != Sel_direct)
2729 selection_request_other (XA_STRING, selnum);
2730 }
2731
2732 if ((selection_type & Sel_UTF8String))
2733 {
2734 int selnum = selection_type & Sel_whereMask;
2735
2736 selection_type = Sel_CompoundText;
2737 if (selnum != Sel_direct)
2738 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739 else
2740 selection_type = 0;
2741 }
2742
2743 return;
2744 }
2745
2746 unsigned long bytes_after;
2747 XTextProperty ct;
2748
2749 if (XGetWindowProperty (dpy, win, prop,
2750 0, PROP_SIZE / 4,
2751 delete_prop, AnyPropertyType,
2752 &ct.encoding, &ct.format,
2753 &ct.nitems, &bytes_after,
2754 &ct.value) != Success)
2755 {
2756 ct.value = 0;
2757 goto bailout;
2758 }
2759
2760 if (ct.encoding == None)
2761 goto bailout;
2762
2763 if (bytes_after)
2764 {
2765 // fetch and append remaining data
2766 XTextProperty ct2;
2767
2768 if (XGetWindowProperty (dpy, win, prop,
2769 ct.nitems / 4, (bytes_after + 3) / 4,
2770 delete_prop, AnyPropertyType,
2771 &ct2.encoding, &ct2.format,
2772 &ct2.nitems, &bytes_after,
2773 &ct2.value) != Success)
2774 goto bailout;
2775
2776 // realloc should be compatible to XFree, here, and elsewhere, too
2777 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779 ct.nitems += ct2.nitems;
2780
2781 XFree (ct2.value);
2782 }
2783
2784 if (ct.value == 0)
2785 goto bailout;
2786
2787 if (ct.encoding == xa[XA_INCR])
2788 {
2789 // INCR selection, start handshake
2790 if (!delete_prop)
2791 XDeleteProperty (dpy, win, prop);
2792
2793 selection_wait = Sel_incr;
2794 incr_buf_fill = 0;
2795 incr_ev.start (10);
2796
2797 goto bailout;
2798 }
2799
2800 if (ct.nitems == 0)
2801 {
2802 if (selection_wait == Sel_incr)
2803 {
2804 XFree (ct.value);
2805
2806 // finally complete, now paste the whole thing
2807 selection_wait = Sel_normal;
2808 ct.value = (unsigned char *)incr_buf;
2809 ct.nitems = incr_buf_fill;
2810 incr_buf = 0;
2811 incr_buf_size = 0;
2812 incr_ev.stop ();
2813 }
2814 else
2815 {
2816 if (selection_wait == Sel_normal
2817 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2818 {
2819 /*
2820 * pass through again trying CUT_BUFFER0 if we've come from
2821 * XConvertSelection () but nothing was presented
2822 */
2823 selection_paste (display->root, XA_CUT_BUFFER0, False);
2824 }
2825
2826 goto bailout;
2827 }
2828 }
2829 else if (selection_wait == Sel_incr)
2830 {
2831 incr_ev.start (10);
2832
2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2834 {
2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2837 }
2838
2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840 incr_buf_fill += ct.nitems;
2841
2842 goto bailout;
2843 }
2844
2845 char **cl;
2846 int cr;
2847
2848#if !ENABLE_MINIMAL
2849 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2850 // so recode it manually
2851 if (ct.encoding == xa[XA_UTF8_STRING])
2852 {
2853 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2854 char *s = rxvt_wcstombs (w);
2855 free (w);
2856 // TODO: strlen == only the first element will be converted. well...
2857 paste (s, strlen (s));
2858 free (s);
2859 }
2860 else
2861#endif
2862 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2863 && cl)
2864 {
2865 for (int i = 0; i < cr; i++)
2866 paste (cl[i], strlen (cl[i]));
2867
2868 XFreeStringList (cl);
2869 }
2870 else
2871 paste ((char *)ct.value, ct.nitems); // paste raw
2872
2873bailout:
2874 XFree (ct.value);
2875
2876 if (selection_wait == Sel_normal)
2877 selection_wait = Sel_none;
2878}
2879
2880void
2881rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2882{
2883 selection_wait = Sel_none;
2884
2885 incr_buf_size = 0;
2886 free (incr_buf);
2887
2888 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2889}
2890
2891void
2892rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2893{
2894 if (prop == None || selection_wait != Sel_incr)
2895 return;
2896
2897 selection_paste (win, prop, true);
2898}
2899
2900/* ------------------------------------------------------------------------- */
2901/*
2902 * Request the current selection:
2903 * Order: > internal selection if available
2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2905 * > CUT_BUFFER0
2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2907 * will auto fallback to CUT_BUFFER0
2908 * EXT: button 2 release 2742 * EXT: button 2 release
2909 */ 2743 */
2910void 2744void
2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2745rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2912{ 2746{
2913 if (selection.text && selnum == Sel_Primary) 2747 if (!selection_req)
2914 {
2915 /* internal selection */
2916 char *str = rxvt_wcstombs (selection.text, selection.len);
2917 paste (str, strlen (str));
2918 free (str);
2919 return;
2920 } 2748 {
2921 else 2749 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2750 selection_req->run ();
2922 { 2751 }
2923 selection_request_time = tm;
2924 selection_wait = Sel_normal;
2925
2926#if X_HAVE_UTF8_STRING
2927 selection_type = Sel_UTF8String;
2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2929 return;
2930#else
2931 selection_type = Sel_CompoundText;
2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2933 return;
2934#endif
2935 }
2936
2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
2939}
2940
2941int
2942rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2943{
2944 Atom sel;
2945
2946 selection_type |= selnum;
2947
2948 if (selnum == Sel_Primary)
2949 sel = XA_PRIMARY;
2950 else if (selnum == Sel_Secondary)
2951 sel = XA_SECONDARY;
2952 else
2953 sel = xa[XA_CLIPBOARD];
2954
2955 if (XGetSelectionOwner (dpy, sel) != None)
2956 {
2957 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2958 vt, selection_request_time);
2959 return 1;
2960 }
2961
2962 return 0;
2963} 2752}
2964 2753
2965/* ------------------------------------------------------------------------- */ 2754/* ------------------------------------------------------------------------- */
2966/* 2755/*
2967 * Clear all selected text 2756 * Clear all selected text
… …
3091 2880
3092 new_selection_text[ofs++] = C0_LF; 2881 new_selection_text[ofs++] = C0_LF;
3093 } 2882 }
3094 else 2883 else
3095#endif 2884#endif
3096 if (!ROW(row).is_longer () && row != selection.end.row 2885 if (!ROW(row).is_longer ()
2886 && (row != selection.end.row || end_col != selection.end.col)
3097 && (row != selection.beg.row || selection.beg.col < ncol)) 2887 && (row != selection.beg.row || selection.beg.col < ncol))
3098 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
3099 } 2889 }
3100
3101 if (end_col != selection.end.col)
3102 new_selection_text[ofs++] = C0_LF;
3103 2890
3104 new_selection_text[ofs] = 0; 2891 new_selection_text[ofs] = 0;
3105 2892
3106 if (ofs == 0) 2893 if (ofs == 0)
3107 { 2894 {
… …
3163/* ------------------------------------------------------------------------- */ 2950/* ------------------------------------------------------------------------- */
3164/* 2951/*
3165 * Mark or select text based upon number of clicks: 1, 2, or 3 2952 * Mark or select text based upon number of clicks: 1, 2, or 3
3166 * EXT: button 1 press 2953 * EXT: button 1 press
3167 */ 2954 */
3168void 2955void ecb_cold
3169rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2956rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3170{ 2957{
3171 clicks = ((clicks - 1) % 3) + 1; 2958 clicks = ((clicks - 1) % 3) + 1;
3172 selection.clicks = clicks; /* save clicks so extend will work */ 2959 selection.clicks = clicks; /* save clicks so extend will work */
3173 2960
… …
3192 2979
3193/* ------------------------------------------------------------------------- */ 2980/* ------------------------------------------------------------------------- */
3194/* 2981/*
3195 * Mark a selection at the specified col/row 2982 * Mark a selection at the specified col/row
3196 */ 2983 */
3197void 2984void ecb_cold
3198rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2985rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3199{ 2986{
3200 want_refresh = 1; 2987 want_refresh = 1;
3201 2988
3202 selection.mark.row = row + view_start; 2989 selection.mark.row = row + view_start;
… …
3225 * Word select: select text for 2 clicks 3012 * Word select: select text for 2 clicks
3226 * We now only find out the boundary in one direction 3013 * We now only find out the boundary in one direction
3227 */ 3014 */
3228 3015
3229/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3016/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3230#define DELIMIT_TEXT(x) \ 3017#define DELIMIT_TEXT(x) \
3231 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3018 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3232#define DELIMIT_REND(x) 1 3019#define DELIMIT_REND(x) 1
3233 3020
3234void 3021void ecb_cold
3235rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3022rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3236{ 3023{
3237 int col, row, dirnadd, tcol, trow, w1, w2; 3024 int col, row, dirnadd, tcol, trow, w1, w2;
3238 row_col_t bound; 3025 row_col_t bound;
3239 text_t *stp; 3026 text_t *stp;
… …
3313 * EXT: button 3 press; button 1 or 3 drag 3100 * EXT: button 3 press; button 1 or 3 drag
3314 * flag == 0 ==> button 1 3101 * flag == 0 ==> button 1
3315 * flag == 1 ==> button 3 press 3102 * flag == 1 ==> button 3 press
3316 * flag == 2 ==> button 3 motion 3103 * flag == 2 ==> button 3 motion
3317 */ 3104 */
3318void 3105void ecb_cold
3319rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3106rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3320{ 3107{
3321 int col = clamp (Pixel2Col (x), 0, ncol); 3108 int col = clamp (Pixel2Col (x), 0, ncol);
3322 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3109 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3323 3110
… …
3349 3136
3350/* ------------------------------------------------------------------------- */ 3137/* ------------------------------------------------------------------------- */
3351/* 3138/*
3352 * Extend the selection to the specified col/row 3139 * Extend the selection to the specified col/row
3353 */ 3140 */
3354void 3141void ecb_cold
3355rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3142rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3356{ 3143{
3357 row_col_t pos; 3144 row_col_t pos;
3358 enum { 3145 enum {
3359 LEFT, RIGHT 3146 LEFT, RIGHT
3360 } closeto = RIGHT; 3147 } closeto = RIGHT;
3361
3362 want_refresh = 1;
3363 3148
3364 switch (selection.op) 3149 switch (selection.op)
3365 { 3150 {
3366 case SELECTION_INIT: 3151 case SELECTION_INIT:
3367 CLEAR_SELECTION (); 3152 CLEAR_SELECTION ();
… …
3547 3332
3548#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3549 if (selection.rect && selection.beg.col > selection.end.col) 3334 if (selection.rect && selection.beg.col > selection.end.col)
3550 ::swap (selection.beg.col, selection.end.col); 3335 ::swap (selection.beg.col, selection.end.col);
3551#endif 3336#endif
3337
3338 selection_changed ();
3552} 3339}
3553 3340
3554#if !ENABLE_MINIMAL 3341#if !ENABLE_MINIMAL
3555void 3342void ecb_cold
3556rxvt_term::selection_remove_trailing_spaces () NOTHROW 3343rxvt_term::selection_remove_trailing_spaces () NOTHROW
3557{ 3344{
3558 int32_t end_col, end_row; 3345 int32_t end_col, end_row;
3559 text_t *stp; 3346 text_t *stp;
3560 3347
… …
3598/* ------------------------------------------------------------------------- */ 3385/* ------------------------------------------------------------------------- */
3599/* 3386/*
3600 * Double click on button 3 when already selected 3387 * Double click on button 3 when already selected
3601 * EXT: button 3 double click 3388 * EXT: button 3 double click
3602 */ 3389 */
3603void 3390void ecb_cold
3604rxvt_term::selection_rotate (int x, int y) NOTHROW 3391rxvt_term::selection_rotate (int x, int y) NOTHROW
3605{ 3392{
3606 selection.clicks = selection.clicks % 3 + 1; 3393 selection.clicks = selection.clicks % 3 + 1;
3607 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3394 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3608} 3395}
… …
3610/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3611/* 3398/*
3612 * Respond to a request for our current selection 3399 * Respond to a request for our current selection
3613 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3614 */ 3401 */
3615void 3402void ecb_cold
3616rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3617{ 3404{
3405 Atom property = rq.property == None ? rq.target : rq.property;
3618 XSelectionEvent ev; 3406 XSelectionEvent ev;
3619 3407
3620 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
3621 ev.property = None; 3409 ev.property = None;
3622 ev.display = rq.display; 3410 ev.display = rq.display;
… …
3637 *target++ = xa[XA_COMPOUND_TEXT]; 3425 *target++ = xa[XA_COMPOUND_TEXT];
3638#if X_HAVE_UTF8_STRING 3426#if X_HAVE_UTF8_STRING
3639 *target++ = xa[XA_UTF8_STRING]; 3427 *target++ = xa[XA_UTF8_STRING];
3640#endif 3428#endif
3641 3429
3642 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3430 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3643 32, PropModeReplace, 3431 32, PropModeReplace,
3644 (unsigned char *)target_list, target - target_list); 3432 (unsigned char *)target_list, target - target_list);
3645 ev.property = rq.property; 3433 ev.property = property;
3646 } 3434 }
3647#if TODO // TODO 3435#if TODO // TODO
3648 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3649 { 3437 {
3650 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3651 } 3439 }
3652#endif 3440#endif
3653 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3654 { 3442 {
3655 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3656 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3657 ev.property = rq.property; 3445 ev.property = property;
3658 } 3446 }
3659 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3660 { 3448 {
3661 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3449 XChangeProperty (dpy, rq.requestor, property, rq.target,
3662 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3663 ev.property = rq.property; 3451 ev.property = property;
3664 } 3452 }
3665 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3666 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3667 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
3668 || rq.target == xa[XA_UTF8_STRING] 3456 || rq.target == xa[XA_UTF8_STRING]
… …
3739 ct.value = (unsigned char *)cl; 3527 ct.value = (unsigned char *)cl;
3740 ct.nitems = selectlen; 3528 ct.nitems = selectlen;
3741 ct.encoding = target; 3529 ct.encoding = target;
3742 } 3530 }
3743 3531
3744 XChangeProperty (dpy, rq.requestor, rq.property, 3532 XChangeProperty (dpy, rq.requestor, property,
3745 ct.encoding, 8, PropModeReplace, 3533 ct.encoding, 8, PropModeReplace,
3746 ct.value, (int)ct.nitems); 3534 ct.value, (int)ct.nitems);
3747 ev.property = rq.property; 3535 ev.property = property;
3748 3536
3749 if (freect) 3537 if (freect)
3750 XFree (ct.value); 3538 XFree (ct.value);
3751 } 3539 }
3752 3540
3753 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3541 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3754} 3542}
3755 3543
3756/* ------------------------------------------------------------------------- */ 3544/* ------------------------------------------------------------------------- */
3757#ifdef USE_XIM 3545#if USE_XIM
3758void 3546void ecb_cold
3759rxvt_term::im_set_position (XPoint &pos) NOTHROW 3547rxvt_term::im_set_position (XPoint &pos) NOTHROW
3760{ 3548{
3761 XWindowAttributes xwa; 3549 XWindowAttributes xwa;
3762 3550
3763 XGetWindowAttributes (dpy, vt, &xwa); 3551 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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