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.344 by sf-exg, Wed Jul 21 09:00:43 2010 UTC vs.
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 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!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
40} 38}
41 39
42/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
46 42
47/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
100 96
101/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
102void 98void
103rxvt_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
104{ 100{
105 if (!l.t) 101 if (!l.valid ())
106 { 102 {
107 lalloc (l); 103 l.alloc ();
108 col = 0; 104 col = 0;
109 width = ncol; 105 width = ncol;
110 } 106 }
111 107
112 l.touch (); 108 l.touch ();
… …
143 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
144 col--; 140 col--;
145 141
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
148 146
149 // found start, nuke 147 // found start, nuke
150 do { 148 do {
151 l.t[col] = ' '; 149 l.t[col] = ' ';
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
155} 153}
156 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
157/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
160 168
161void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
162rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
163{ 215{
216#if ENABLE_OVERLAY
217 scr_overlay_off ();
218#endif
219
164 view_start = 0; 220 view_start = 0;
165 num_scr = 0; 221 num_scr = 0;
166 222
167 if (ncol == 0) 223 if (ncol == 0)
168 ncol = 80; 224 ncol = 80;
… …
188 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
189 245
190 screen.tscroll = 0; 246 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
192 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
193 if (!row_buf) 257 if (!prev_row_buf)
194 { 258 {
195 /*
196 * first time called so just malloc everything: don't rely on realloc
197 */
198 top_row = 0; 259 top_row = 0;
199 term_start = 0; 260 term_start = 0;
200
201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207
208 for (int row = nrow; row--; )
209 {
210 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 }
214 261
215 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
218 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
241 { 288 {
242 /* 289 /*
243 * add or delete rows as appropriate 290 * add or delete rows as appropriate
244 */ 291 */
245 292
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
250 if (nrow < prev_nrow)
251 {
252 for (int row = nrow; row < prev_nrow; row++)
253 {
254 lfree (swap_buf [row]);
255 lfree (drawn_buf[row]);
256 }
257 }
258#endif
259
260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 294
263 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
264 { 296 {
265 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
267 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
268 300
269 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
270 { 302 }
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 303
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
281 307
… …
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 316
291 do 317 do
292 { 318 {
293 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1; 321 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 323
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 325 {
300 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
301 327
302 plines++; 328 plines++;
303 llen += prev_ncol; 329 llen += prev_ncol;
… …
316 342
317 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
319 { 345 {
320 qline = row_buf + qrow; 346 qline = row_buf + qrow;
321 lalloc (*qline); 347 qline->alloc (); // redundant with next line
322 qline->l = ncol; 348 qline->l = ncol;
323 qline->is_longer (1); 349 qline->is_longer (1);
324 350
325 int qcol = 0; 351 int qcol = 0;
326 352
… …
341 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
342 // least. 368 // least.
343 if (prow == ocur.row) 369 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
345 371
346 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
347 373
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 375
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
372 { 398 {
373 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
374 400
375 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
376 { 402 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
379 405
380 qline = pline; 406 copy_line (dst, src);
381 lresize (qline);
382 } 407 }
383 408
384 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 411
389 term_start = 0; 412 term_start = 0;
390 } 413 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 414
396 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 417 }
399 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
400 free (tabs); 428 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
402 430
403 for (int col = ncol; --col; ) 431 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
405 433
406 CLEAR_ALL_SELECTION (); 434 CLEAR_ALL_SELECTION ();
407 435
408 prev_nrow = nrow; 436 prev_nrow = nrow;
… …
411 tt_winch (); 439 tt_winch ();
412 440
413 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 442}
415 443
416/* ------------------------------------------------------------------------- */ 444void ecb_cold
417/*
418 * Free everything. That way malloc debugging can find leakage.
419 */
420void
421rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
422{ 446{
423 if (row_buf) 447 chunk_free (chunk, chunk_size);
424 { 448 chunk = 0;
425 delete talloc; talloc = 0; 449 row_buf = 0;
426 delete ralloc; ralloc = 0;
427 450
428 free (row_buf);
429 free (swap_buf);
430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
433 free (tabs); 451 free (tabs);
434 tabs = 0; 452 tabs = 0;
435 }
436} 453}
437 454
438/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
439/* 456/*
440 * Hard/Soft reset 457 * Hard/Soft reset
441 */ 458 */
442void 459void ecb_cold
443rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
444{ 461{
445 scr_release (); 462 scr_release ();
463
446 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 465 rvideo_mode = false;
448 scr_soft_reset (); 466 scr_soft_reset ();
449 scr_reset (); 467 scr_reset ();
450 468
451 scr_clear (true); 469 scr_clear (true);
452 scr_refresh (); 470 scr_refresh ();
453} 471}
454 472
455void 473void ecb_cold
456rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
457{ 475{
458 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
460 scr_overlay_off (); 478 scr_overlay_off ();
461#endif 479#endif
… …
516 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
518} 536}
519 537
520void 538void
521rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
522{ 540{
523 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
524 return; 542 return;
525 543
526 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
545 return; 563 return;
546 564
547 want_refresh = 1; 565 want_refresh = 1;
548 view_start = 0; 566 view_start = 0;
549 567
550 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
551 574
552 current_screen = scrn; 575 current_screen = scrn;
553 576
554#if NSCREENS 577#if NSCREENS
555 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
… …
621/* 644/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 646 * count positive ==> scroll up
624 * count negative ==> scroll down 647 * count negative ==> scroll down
625 */ 648 */
626int 649int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628{ 651{
629 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
630 return 0; 653 return 0;
631 654
… …
634 657
635 if (count > 0 658 if (count > 0
636 && row1 == 0 659 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
639 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 665
644 // sever bottommost line 666 // sever bottommost line
645 { 667 {
646 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
647 l.is_longer (0); 669 l.is_longer (0);
648 l.touch (); 670 l.touch ();
649 } 671 }
650 672
673 // scroll everything up 'count' lines
674 term_start = (term_start + count) % total_rows;
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 }
687
651 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 689 for (int i = count; i--; )
653 { 690 {
654 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
655 692
656 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 694 // could be rolled into scr_blank_screen_mem
658 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 696 {
660 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 698 l.l = 0;
… …
663 } 700 }
664 else 701 else
665 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
666 } 703 }
667 704
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
680 // move and/or clear selection, if any 705 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
682 { 708 {
683 selection.beg.row -= count; 709 selection.beg.row -= count;
684 selection.end.row -= count; 710 selection.end.row -= count;
685 selection.mark.row -= count; 711 selection.mark.row -= count;
686 712
687 if (selection.beg.row < top_row 713 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 714 }
695 715
696 // finally move the view window, if desired 716 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 718 && view_start != 0
… …
728 } 748 }
729 749
730 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
732 752
753 // sever line above scroll region
754 if (row1)
755 {
756 line_t &l = ROW(row1 - 1);
757 l.is_longer (0);
758 l.touch ();
759 }
760
733 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
734 762
735 min_it (count, rows); 763 min_it (count, rows);
736 764
737 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 766
739 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
740 { 768 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 770
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 773 }
746 774
747 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
777
778 // sever bottommost line
779 {
780 line_t &l = ROW(row2);
781 l.is_longer (0);
782 l.touch ();
783 }
749 } 784 }
750 785
751 return count; 786 return count;
752} 787}
753 788
754/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
755/* 790/*
756 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
757 */ 792 */
758void 793void ecb_hot
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760{ 795{
761 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
762 return; 797 return;
763 798
764 unsigned char checksel; 799 bool checksel;
765 unicode_t c; 800 unicode_t c;
766 int ncol = this->ncol; 801 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
768 803
769 want_refresh = 1; 804 want_refresh = 1;
… …
795 830
796 while (str < strend) 831 while (str < strend)
797 { 832 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 834
800 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 836 if (c == C0_LF)
802 { 837 {
803 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
804 839
805 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
824 { 859 {
825 scr_tab (1, true); 860 scr_tab (1, true);
826 continue; 861 continue;
827 } 862 }
828 863
829 if (expect_false ( 864 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 868 ))
834 { 869 {
… …
839 * should be a similar check. 874 * should be a similar check.
840 */ 875 */
841 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
842 } 877 }
843 878
844 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 880 {
846 scr_do_wrap (); 881 scr_do_wrap ();
847 882
848 line->l = ncol; 883 line->l = ncol;
849 line->is_longer (1); 884 line->is_longer (1);
… …
851 row = screen.cur.row; 886 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
853 } 888 }
854 889
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 892 c = 0xfffd;
858 893
859 // rely on wcwidth to tell us the character width, do wcwidth before 894 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
862 // locale. 897 // locale.
863 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
864 899
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 901 {
867 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 903 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
885 } 920 }
886 } 921 }
887 922
888 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
890 925
891 if (width != 0) 926 if (width != 0)
892 { 927 {
893#if !UNICODE_3 928#if !UNICODE_3
… …
898# else 933# else
899 c = 0xfffd; 934 c = 0xfffd;
900# endif 935# endif
901#endif 936#endif
902 937
938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
939
940 // if the character doesn't fit into the remaining columns...
941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
942 {
943 if (screen.flags & Screen_Autowrap)
944 {
945 // ... artificially enlargen the previous one
946 c = NOCHAR;
947 // and try the same character next loop iteration
948 --str;
949 }
950 else
951 screen.cur.col = ncol - width;
952 }
953
903 // nuke the character at this position, if required 954 // nuke the character at this position, if required
904 if (expect_false ( 955 // due to wonderful coincidences everywhere else in this loop
956 // we never have to check for overwriting a wide char itself,
957 // only its tail.
905 line->t[screen.cur.col] == NOCHAR 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col); 959 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921 960
922 line->touch (); 961 line->touch ();
923 962
924 do 963 do
925 { 964 {
926 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
927 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
928 967
929 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
930 screen.cur.col++; 969 screen.cur.col++;
931 else 970 else
932 { 971 {
933 line->l = ncol; 972 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 974 screen.flags |= Screen_WrapNext;
936 break; 975
976 goto end_of_line;
937 } 977 }
938 978
939 c = NOCHAR; 979 c = NOCHAR;
940 } 980 }
941 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
942 982
943 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
945 { 985 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 986 line->t[c] = ' ';
951 line->r[c] = rend; 987 line->r[c] = rend;
952 }
953 } 988 }
989
990end_of_line:
991 ;
954 } 992 }
955#if ENABLE_COMBINING 993#if ENABLE_COMBINING
956 else // width == 0 994 else // width == 0
957 { 995 {
958 if (c != 0xfeff) // ignore BOM 996 if (c != 0xfeff) // ignore BOM
… …
1021 1059
1022 want_refresh = 1; 1060 want_refresh = 1;
1023#endif 1061#endif
1024 } 1062 }
1025 } 1063 }
1064 else if (screen.flags & Screen_WrapNext)
1065 screen.flags &= ~Screen_WrapNext;
1026 else 1066 else
1027 scr_gotorc (0, -1, RELATIVE); 1067 scr_gotorc (0, -1, RELATIVE);
1028} 1068}
1029 1069
1030/* ------------------------------------------------------------------------- */ 1070/* ------------------------------------------------------------------------- */
… …
1108 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1109 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1110 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1111 */ 1151 */
1112#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1113void 1153void ecb_cold
1114rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1115{ 1155{
1116 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1118 else 1158 else
… …
1125 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1126 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1127 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1128 */ 1168 */
1129#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1130void 1170void ecb_cold
1131rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1132{ 1172{
1133 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1135 else 1175 else
… …
1286 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1287} 1327}
1288 1328
1289/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1290/* 1330/*
1291 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1292 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1293 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1294 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1295 */ 1335 */
1296void 1336void
… …
1305 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1306 1346
1307 switch (mode) 1347 switch (mode)
1308 { 1348 {
1309 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1310 selection_check (1);
1311 scr_erase_line (0); 1350 scr_erase_line (0);
1312 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1313 num = nrow - row; 1352 num = nrow - row;
1314 break; 1353 break;
1315 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1316 selection_check (3);
1317 scr_erase_line (1); 1355 scr_erase_line (1);
1318 row = 0; 1356 row = 0;
1319 num = screen.cur.row; 1357 num = screen.cur.row;
1320 break; 1358 break;
1321 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1322 selection_check (3);
1323 row = 0; 1360 row = 0;
1324 num = nrow; 1361 num = nrow;
1325 break; 1362 break;
1326 default: 1363 default:
1327 return; 1364 return;
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1373 if (row >= nrow) /* Out Of Bounds */
1337 return; 1374 return;
1338 1375
1339 min_it (num, nrow - row); 1376 min_it (num, nrow - row);
1340 1377
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1378 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1379 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1380 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1381 {
1348 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1349 1383
1350 if (mapped && !view_start) 1384 if (mapped)
1351 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1353 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1354 } 1388 }
1355 else 1389 else
1356 { 1390 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1392
1359 if (mapped && !view_start) 1393 if (mapped)
1360 { 1394 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1365 (unsigned int)width, 1399 (unsigned int)vt_width,
1366 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1367 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 } 1403 }
1370 } 1404 }
1371 1405
1372 for (; num--; row++) 1406 for (; num--; row++)
1373 { 1407 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1408 scr_blank_screen_mem (ROW(row), rstyle);
1375 1409
1376 if (!view_start) 1410 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1411 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1412 }
1379} 1413}
1380 1414
1381#if !ENABLE_MINIMAL 1415#if !ENABLE_MINIMAL
1382void 1416void
… …
1392/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1393/* 1427/*
1394 * Fill the screen with `E's 1428 * Fill the screen with `E's
1395 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1396 */ 1430 */
1397void 1431void ecb_cold
1398rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1399{ 1433{
1400 rend_t fs; 1434 rend_t fs;
1401 1435
1402 want_refresh = 1; 1436 want_refresh = 1;
1403 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1404 1438
1405 num_scr_allow = 0; 1439 num_scr_allow = 0;
1406 selection_check (3); 1440
1441 row_col_t pos;
1442 pos.row = pos.col = 0;
1443 if (ROWCOL_IS_AFTER (selection.end, pos))
1444 CLEAR_SELECTION ();
1407 1445
1408 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1409 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1410 { 1448 {
1411 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1562/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1563/* 1601/*
1564 * Set the scrolling region 1602 * Set the scrolling region
1565 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1566 */ 1604 */
1567void 1605void ecb_cold
1568rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1569{ 1607{
1570 max_it (top, 0); 1608 max_it (top, 0);
1571 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1572 1610
… …
1582/* 1620/*
1583 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1584 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1585 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1586 */ 1624 */
1587void 1625void ecb_cold
1588rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1589{ 1627{
1590 want_refresh = 1; 1628 want_refresh = 1;
1591 1629
1592 if (mode) 1630 if (mode)
… …
1599/* 1637/*
1600 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1601 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1602 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1603 */ 1641 */
1604void 1642void ecb_cold
1605rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1606{ 1644{
1607 if (mode) 1645 if (mode)
1608 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1609 else 1647 else
… …
1618 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1619 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1620 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1621 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1622 */ 1660 */
1623void 1661void ecb_cold
1624rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1625{ 1663{
1626 if (mode) 1664 if (mode)
1627 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1628 else 1666 else
… …
1635/* 1673/*
1636 * Set insert/replace mode 1674 * Set insert/replace mode
1637 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1638 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1639 */ 1677 */
1640void 1678void ecb_cold
1641rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1642{ 1680{
1643 if (mode) 1681 if (mode)
1644 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1645 else 1683 else
… …
1651 * Set/Unset tabs 1689 * Set/Unset tabs
1652 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1653 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1654 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1655 */ 1693 */
1656void 1694void ecb_cold
1657rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1658{ 1696{
1659 if (mode < 0) 1697 if (mode < 0)
1660 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1661 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1680 if (rvideo_state != on) 1718 if (rvideo_state != on)
1681 { 1719 {
1682 rvideo_state = on; 1720 rvideo_state = on;
1683 1721
1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1686 if (bgPixmap.pixmap == None) 1724 if (bg_img == 0)
1687#endif 1725#endif
1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689 1727
1690 XGCValues gcvalue; 1728 XGCValues gcvalue;
1691 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1700/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1701/* 1739/*
1702 * Report current cursor position 1740 * Report current cursor position
1703 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1704 */ 1742 */
1705void 1743void ecb_cold
1706rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1707{ 1745{
1708 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1709} 1747}
1710 1748
… …
1713 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1714 1752
1715/* 1753/*
1716 * Set font style 1754 * Set font style
1717 */ 1755 */
1718void 1756void ecb_cold
1719rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1720{ 1758{
1721#if 0 1759#if 0
1722 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1723 { 1761 {
… …
1745 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1746 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1747 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1748 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1749 */ 1787 */
1750void 1788void ecb_cold
1751rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1752{ 1790{
1753 screen.charset = set; 1791 screen.charset = set;
1754 set_font_style (); 1792 set_font_style ();
1755} 1793}
… …
1776 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1777 1815
1778/* 1816/*
1779 * refresh matching text. 1817 * refresh matching text.
1780 */ 1818 */
1781bool 1819bool ecb_cold
1782rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1783{ 1821{
1784 bool found = false; 1822 bool found = false;
1785 1823
1786 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1805 PART_BEG = 0, 1843 PART_BEG = 0,
1806 PART_END, 1844 PART_END,
1807 RC_COUNT 1845 RC_COUNT
1808}; 1846};
1809 1847
1810void 1848void ecb_hot
1811rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1812{ 1850{
1813 int i; 1851 int i;
1814 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1815 1853
… …
1852 * Refresh the entire screen 1890 * Refresh the entire screen
1853 */ 1891 */
1854void 1892void
1855rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1856{ 1894{
1857 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1858} 1896}
1859 1897
1860/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1861/* 1899/*
1862 * Move the display so that the line represented by scrollbar value Y is at 1900 * Move the display so that the line represented by scrollbar value Y is at
… …
1918 1956
1919# ifndef NO_MAPALERT 1957# ifndef NO_MAPALERT
1920# ifdef MAPALERT_OPTION 1958# ifdef MAPALERT_OPTION
1921 if (option (Opt_mapAlert)) 1959 if (option (Opt_mapAlert))
1922# endif 1960# endif
1923 XMapWindow (dpy, parent[0]); 1961 XMapWindow (dpy, parent);
1924# endif 1962# endif
1925 1963
1926# if ENABLE_FRILLS 1964# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell)) 1965 if (option (Opt_urgentOnBell))
1928 set_urgency (1); 1966 set_urgency (1);
… …
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1942#endif 1980#endif
1943} 1981}
1944 1982
1945/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1946/* ARGSUSED */ 1984void ecb_cold
1947void
1948rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1949{ 1986{
1950#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1951 int nrows, row_start; 1988 int nrows, row_start;
1952 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
2001/* 2038/*
2002 * Refresh the screen 2039 * Refresh the screen
2003 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2004 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2005 */ 2042 */
2006void 2043void ecb_hot
2007rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2008{ 2045{
2009 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2010 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2011 int i; /* tmp */ 2048 int i; /* tmp */
2012#ifndef NO_CURSORCOLOR
2013 rend_t cc1; /* store colours at cursor position (s) */
2014#endif
2015 rend_t *crp; // cursor rendition pointer
2016 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2017 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2053 int cursorwidth;
2018 2054
2019 want_refresh = 0; /* screen is current */ 2055 want_refresh = 0; /* screen is current */
2020 2056
2021 if (refresh_type == NO_REFRESH || !mapped) 2057 if (refresh_type == NO_REFRESH || !mapped)
2022 return; 2058 return;
… …
2025 * A: set up vars 2061 * A: set up vars
2026 */ 2062 */
2027 refresh_count = 0; 2063 refresh_count = 0;
2028 2064
2029 unsigned int old_screen_flags = screen.flags; 2065 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0; 2066 bool have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2067#ifdef HAVE_IMG
2032 have_bg = bgPixmap.pixmap != None; 2068 have_bg = bg_img != 0;
2033#endif 2069#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2070 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2071
2036 /* 2072 /*
2037 * B: reverse any characters which are selected 2073 * B: reverse any characters which are selected
… …
2041 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2077 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042#if ENABLE_OVERLAY 2078#if ENABLE_OVERLAY
2043 scr_swap_overlay (); 2079 scr_swap_overlay ();
2044#endif 2080#endif
2045 2081
2046 char showcursor = screen.flags & Screen_VisibleCursor; 2082 bool showcursor = screen.flags & Screen_VisibleCursor;
2047 2083
2048 /* 2084 /*
2049 * C: set the cursor character (s) 2085 * C: set the cursor character (s)
2050 */ 2086 */
2051 { 2087 {
2052 unsigned char setoldcursor;
2053
2054#ifdef CURSOR_BLINK 2088#ifdef CURSOR_BLINK
2055 if (hidden_cursor) 2089 if (hidden_cursor)
2056 showcursor = 0; 2090 showcursor = 0;
2057#endif 2091#endif
2058 2092
… …
2061 int col = screen.cur.col; 2095 int col = screen.cur.col;
2062 2096
2063 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2097 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2064 col--; 2098 col--;
2065 2099
2100 cursorwidth = 1;
2101 while (col + cursorwidth < ncol
2102 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2103 cursorwidth++;
2104
2066 crp = &ROW(screen.cur.row).r[col]; 2105 cur_rend = ROW(screen.cur.row).r[col];
2106 cur_col = col;
2067 2107
2068#ifndef NO_CURSORCOLOR 2108#ifndef NO_CURSORCOLOR
2069 cc1 = *crp & (RS_fgMask | RS_bgMask);
2070 if (ISSET_PIXCOLOR (Color_cursor)) 2109 if (ISSET_PIXCOLOR (Color_cursor))
2071 ccol1 = Color_cursor; 2110 ccol1 = Color_cursor;
2072 else 2111 else
2073#endif 2112#endif
2074#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2113#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2088 ccol2 = Color_bg; 2127 ccol2 = Color_bg;
2089#endif 2128#endif
2090 2129
2091 if (focus) 2130 if (focus)
2092 { 2131 {
2132 rend_t rend = cur_rend;
2133
2093 if (option (Opt_cursorUnderline)) 2134 if (option (Opt_cursorUnderline))
2094 *crp ^= RS_Uline; 2135 rend ^= RS_Uline;
2095 else 2136 else
2096 { 2137 {
2097 *crp ^= RS_RVid; 2138 rend ^= RS_RVid;
2098 *crp = SET_FGCOLOR (*crp, ccol1); 2139 rend = SET_FGCOLOR (rend, ccol1);
2099 *crp = SET_BGCOLOR (*crp, ccol2); 2140 rend = SET_BGCOLOR (rend, ccol2);
2100 } 2141 }
2142
2143 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2101 } 2144 }
2102 } 2145 }
2103 2146
2104 /* make sure no outline cursor is left around */ 2147 /* make sure no outline cursor is left around */
2105 setoldcursor = 0;
2106 if (ocrow != -1) 2148 if (ocrow != -1)
2107 { 2149 {
2108 if (screen.cur.row - view_start != ocrow 2150 if (screen.cur.row - view_start != ocrow
2109 || screen.cur.col != oldcursor.col) 2151 || screen.cur.col != oldcursor.col)
2110 { 2152 {
2111 if (ocrow < nrow 2153 if (ocrow < nrow
2112 && oldcursor.col < ncol) 2154 && oldcursor.col < ncol)
2113 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2155 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2114
2115 if (focus || !showcursor)
2116 oldcursor.row = -1;
2117 else
2118 setoldcursor = 1;
2119 } 2156 }
2120 } 2157 }
2121 else if (!focus)
2122 setoldcursor = 1;
2123 2158
2124 if (setoldcursor) 2159 // save the current cursor coordinates if the cursor is visible
2160 // and the window is unfocused, so as to clear the outline cursor
2161 // in the next refresh if the cursor moves
2162 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2125 { 2163 {
2126 if (screen.cur.row - view_start >= nrow)
2127 oldcursor.row = -1;
2128 else
2129 {
2130 oldcursor.row = screen.cur.row - view_start; 2164 oldcursor.row = screen.cur.row - view_start;
2131 oldcursor.col = screen.cur.col; 2165 oldcursor.col = screen.cur.col;
2132 }
2133 } 2166 }
2167 else
2168 oldcursor.row = -1;
2134 } 2169 }
2135 2170
2136#ifndef NO_SLOW_LINK_SUPPORT 2171#ifndef NO_SLOW_LINK_SUPPORT
2137 /* 2172 /*
2138 * D: CopyArea pass - very useful for slower links 2173 * D: CopyArea pass - very useful for slower links
… …
2144 { 2179 {
2145 int16_t nits; 2180 int16_t nits;
2146 int i = num_scr; 2181 int i = num_scr;
2147 int j; 2182 int j;
2148 int len, wlen; 2183 int len, wlen;
2149 dLocal (int, num_scr);
2150 2184
2151 j = nrow; 2185 j = nrow;
2152 wlen = len = -1; 2186 wlen = len = -1;
2153 row = i > 0 ? 0 : j - 1; 2187 row = i > 0 ? 0 : j - 1;
2154 2188
… …
2229 continue; 2263 continue;
2230 2264
2231 // redraw one or more characters 2265 // redraw one or more characters
2232 2266
2233 // seek to the beginning of wide characters 2267 // seek to the beginning of wide characters
2234 while (expect_false (stp[col] == NOCHAR && col > 0)) 2268 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2235 --col; 2269 --col;
2236 2270
2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2271 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2238 text_t *text = stp + col; 2272 text_t *text = stp + col;
2239 int count = 1; 2273 int count = 1;
… …
2277 2311
2278 col--; /* went one too far. move back */ 2312 col--; /* went one too far. move back */
2279 count -= i; /* dump any matching trailing chars */ 2313 count -= i; /* dump any matching trailing chars */
2280 2314
2281 // sometimes we optimize away the trailing NOCHAR's, add them back 2315 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR)) 2316 while (ecb_unlikely (i && text[count] == NOCHAR))
2283 count++, i--; 2317 count++, i--;
2284 2318
2285 /* 2319 /*
2286 * Determine the attributes for the string 2320 * Determine the attributes for the string
2287 */ 2321 */
2288 int fore = fgcolor_of (rend); // desired foreground 2322 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2323 int back = bgcolor_of (rend); // desired background
2290 2324
2291 // only do special processing if any attributes are set, which is unlikely 2325 // only do special processing if any attributes are set, which is unlikely
2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2326 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293 { 2327 {
2294 bool invert = rend & RS_RVid; 2328 bool invert = rend & RS_RVid;
2295 2329
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2330#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2331 if (rend & RS_Bold && fore == Color_fg)
… …
2386 /* 2420 /*
2387 * Actually do the drawing of the string here 2421 * Actually do the drawing of the string here
2388 */ 2422 */
2389 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2423 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2390 2424
2391 if (expect_true (have_bg && back == Color_bg)) 2425 if (ecb_likely (have_bg && back == Color_bg))
2392 { 2426 {
2393 // this is very ugly, maybe push it into ->draw? 2427 // this is very ugly, maybe push it into ->draw?
2394 2428
2395 for (i = 0; i < count; i++) /* don't draw empty strings */ 2429 for (i = 0; i < count; i++) /* don't draw empty strings */
2396 if (text[i] != ' ') 2430 if (text[i] != ' ')
… …
2403 did_clear: ; 2437 did_clear: ;
2404 } 2438 }
2405 else 2439 else
2406 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2440 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2407 2441
2408 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2442 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2409 { 2443 {
2444 if (showcursor && focus && row == screen.cur.row
2445 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2447 else
2410#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2411 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2412 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2413 else 2451 else
2414#endif 2452#endif
… …
2425 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2426 */ 2464 */
2427 if (showcursor) 2465 if (showcursor)
2428 { 2466 {
2429 if (focus) 2467 if (focus)
2430 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2431 if (option (Opt_cursorUnderline))
2432 *crp ^= RS_Uline;
2433 else
2434 {
2435 *crp ^= RS_RVid;
2436#ifndef NO_CURSORCOLOR
2437 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2438#endif
2439 }
2440 }
2441 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2442 { 2470 {
2443 int cursorwidth = 1;
2444 int col = oldcursor.col;
2445
2446 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2447 col--;
2448
2449 while (col + cursorwidth < ncol
2450 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2451 cursorwidth++;
2452
2453#ifndef NO_CURSORCOLOR
2454 if (ISSET_PIXCOLOR (Color_cursor))
2455 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2456 else
2457#endif
2458 XSetForeground (dpy, gc, pix_colors[ccol1]); 2471 XSetForeground (dpy, gc, pix_colors[ccol1]);
2459 2472
2460 XDrawRectangle (dpy, vt, gc, 2473 XDrawRectangle (dpy, vt, gc,
2461 Col2Pixel (col), 2474 Col2Pixel (cur_col),
2462 Row2Pixel (oldcursor.row), 2475 Row2Pixel (oldcursor.row),
2463 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2476 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2464 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2477 (unsigned int) (Height2Pixel (1) - 1));
2465 } 2478 }
2466 } 2479 }
2467 2480
2468 /* 2481 /*
2469 * H: cleanup selection 2482 * H: cleanup selection
… …
2478 screen.flags = old_screen_flags; 2491 screen.flags = old_screen_flags;
2479 num_scr = 0; 2492 num_scr = 0;
2480 num_scr_allow = 1; 2493 num_scr_allow = 1;
2481} 2494}
2482 2495
2483void 2496void ecb_cold
2484rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2497rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2485{ 2498{
2486 if (!l.t) 2499 if (!l.valid ())
2487 return; 2500 return;
2488 2501
2489 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2502 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2490 2503
2491 for (int i = ncol; i--; ) 2504 for (int i = ncol; i--; )
2492 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2505 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2493} 2506}
2494 2507
2495void 2508void ecb_cold
2496rxvt_term::scr_remap_chars () NOTHROW 2509rxvt_term::scr_remap_chars () NOTHROW
2497{ 2510{
2498 for (int i = total_rows; i--; ) 2511 for (int i = total_rows; i--; )
2499 scr_remap_chars (row_buf [i]); 2512 scr_remap_chars (row_buf [i]);
2500 2513
… …
2503 scr_remap_chars (drawn_buf [i]); 2516 scr_remap_chars (drawn_buf [i]);
2504 scr_remap_chars (swap_buf [i]); 2517 scr_remap_chars (swap_buf [i]);
2505 } 2518 }
2506} 2519}
2507 2520
2508void 2521void ecb_cold
2509rxvt_term::scr_recolour () NOTHROW 2522rxvt_term::scr_recolour (bool refresh) NOTHROW
2510{ 2523{
2511#ifdef HAVE_BG_PIXMAP 2524 bool transparent = false;
2512 bgPixmap.apply ();
2513#else
2514 2525
2526#ifdef HAVE_IMG
2527 if (bg_img != 0)
2528 {
2529# if ENABLE_TRANSPARENCY
2530 if (bg_flags & BG_IS_TRANSPARENT)
2531 {
2532 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2533 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2534
2535 transparent = true;
2536 }
2537 else
2538# endif
2539 {
2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2541 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2542 }
2543 }
2544 else
2545#endif
2546 {
2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2516 XClearWindow (dpy, parent[0]);
2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2548 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2549 }
2550
2551 XClearWindow (dpy, parent);
2518 2552
2519 if (scrollBar.win) 2553 if (scrollBar.win)
2520 { 2554 {
2555 if (transparent)
2556 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2557 else
2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2522 scrollBar.state = STATE_IDLE; 2559 scrollBar.state = SB_STATE_IDLE;
2523 scrollBar.show (0); 2560 scrollBar.show (0);
2524 } 2561 }
2525 2562
2526#endif 2563 if (refresh)
2527 2564 {
2528 /* bgPixmap.apply () does not do the following : */
2529 scr_clear (); 2565 scr_clear ();
2530 scr_touch (true); 2566 scr_touch (true);
2567 }
2531 want_refresh = 1; 2568 want_refresh = 1;
2532} 2569}
2533 2570
2534/* ------------------------------------------------------------------------- */ 2571/* ------------------------------------------------------------------------- */
2535void 2572void
… …
2592 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2629 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2593 srp[col] ^= rstyle; 2630 srp[col] ^= rstyle;
2594} 2631}
2595 2632
2596/* ------------------------------------------------------------------------- */ 2633/* ------------------------------------------------------------------------- */
2597void 2634void ecb_hot
2598rxvt_term::scr_reverse_selection () NOTHROW 2635rxvt_term::scr_reverse_selection () NOTHROW
2599{ 2636{
2600 if (selection.op 2637 if (selection.op
2601 && current_screen == selection.screen 2638 && current_screen == selection.screen
2602 && selection.end.row >= view_start) 2639 && selection.end.row >= view_start)
… …
2621 */ 2658 */
2622#if 0 2659#if 0
2623void 2660void
2624rxvt_term::scr_dump (int fd) NOTHROW 2661rxvt_term::scr_dump (int fd) NOTHROW
2625{ 2662{
2626 int row, wrote; 2663 // if this method is needed, it can be implemented by factoring the
2627 unsigned int width, towrite; 2664 // relevant code in scr_printscreen
2628 char r1[] = "\n";
2629
2630 for (row = saveLines + top_row;
2631 row < saveLines + nrow - 1; row++)
2632 {
2633 width = row_buf[row].l >= 0 ? row_buf[row].l
2634 : ncol;
2635 for (towrite = width; towrite; towrite -= wrote)
2636 {
2637 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2638 towrite);
2639 if (wrote < 0)
2640 return; /* XXX: death, no report */
2641 }
2642 if (row_buf[row].l >= 0)
2643 if (write (fd, r1, 1) <= 0)
2644 return; /* XXX: death, no report */
2645 }
2646} 2665}
2647#endif 2666#endif
2648 2667
2649/* ------------------------------------------------------------------------- * 2668/* ------------------------------------------------------------------------- *
2650 * CHARACTER SELECTION * 2669 * CHARACTER SELECTION *
2651 * ------------------------------------------------------------------------- */ 2670 * ------------------------------------------------------------------------- */
2652void 2671void
2653rxvt_term::selection_check (int check_more) NOTHROW 2672rxvt_term::selection_check (int check_more) NOTHROW
2654{ 2673{
2655 row_col_t pos;
2656
2657 if (!selection.op) 2674 if (!selection.op)
2658 return; 2675 return;
2659 2676
2660 pos.row = pos.col = 0;
2661 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2677 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2662 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2678 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2663 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2679 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2664 || (check_more == 1 2680 || (check_more == 1
2665 && current_screen == selection.screen 2681 && current_screen == selection.screen
2666 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2682 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2667 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2683 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2668 || (check_more == 2
2669 && ROWCOL_IS_BEFORE (selection.beg, pos)
2670 && ROWCOL_IS_AFTER (selection.end, pos))
2671 || (check_more == 3
2672 && ROWCOL_IS_AFTER (selection.end, pos))
2673 || (check_more == 4 /* screen width change */
2674 && (selection.beg.row != selection.end.row
2675 || selection.end.col > ncol)))
2676 CLEAR_SELECTION (); 2684 CLEAR_ALL_SELECTION ();
2685}
2686
2687void
2688rxvt_term::selection_changed () NOTHROW
2689{
2690 line_t &r1 = ROW (selection.beg.row);
2691 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2692 --selection.beg.col;
2693
2694 line_t &r2 = ROW (selection.end.row);
2695 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2696 ++selection.end.col;
2697
2698 want_refresh = 1;
2677} 2699}
2678 2700
2679/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2680/* 2702/*
2681 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2682 */ 2704 */
2683void 2705void
2684rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2685{ 2707{
2686 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2687 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2688 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2689 data[i] = C0_CR; 2711 data[i] = C0_CR;
2690 2712
2691 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2693 2715
2694 tt_write (data, len); 2716 tt_write (data, len);
2695 2717
2696 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2698} 2720}
2699 2721
2700/* ------------------------------------------------------------------------- */
2701/*
2702 * Respond to a notification that a primary selection has been sent
2703 * EXT: SelectionNotify
2704 */
2705void 2722void
2706rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{ 2724{
2708 if (prop == None) /* check for failed XConvertSelection */ 2725 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2709 {
2710 if ((selection_type & Sel_CompoundText))
2711 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = 0;
2715 if (selnum != Sel_direct)
2716 selection_request_other (XA_STRING, selnum);
2717 }
2718
2719 if ((selection_type & Sel_UTF8String))
2720 {
2721 int selnum = selection_type & Sel_whereMask;
2722
2723 selection_type = Sel_CompoundText;
2724 if (selnum != Sel_direct)
2725 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2726 else
2727 selection_type = 0;
2728 }
2729
2730 return;
2731 }
2732
2733 unsigned long bytes_after;
2734 XTextProperty ct;
2735
2736 if (XGetWindowProperty (dpy, win, prop,
2737 0, PROP_SIZE / 4,
2738 delete_prop, AnyPropertyType,
2739 &ct.encoding, &ct.format,
2740 &ct.nitems, &bytes_after,
2741 &ct.value) != Success)
2742 {
2743 ct.value = 0;
2744 goto bailout;
2745 }
2746
2747 if (ct.encoding == None)
2748 goto bailout;
2749
2750 if (bytes_after)
2751 {
2752 // fetch and append remaining data
2753 XTextProperty ct2;
2754
2755 if (XGetWindowProperty (dpy, win, prop,
2756 ct.nitems / 4, (bytes_after + 3) / 4,
2757 delete_prop, AnyPropertyType,
2758 &ct2.encoding, &ct2.format,
2759 &ct2.nitems, &bytes_after,
2760 &ct2.value) != Success)
2761 goto bailout;
2762
2763 // realloc should be compatible to XFree, here, and elsewhere, too
2764 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2765 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2766 ct.nitems += ct2.nitems;
2767
2768 XFree (ct2.value);
2769 }
2770
2771 if (ct.value == 0)
2772 goto bailout;
2773
2774 if (ct.encoding == xa[XA_INCR])
2775 {
2776 // INCR selection, start handshake
2777 if (!delete_prop)
2778 XDeleteProperty (dpy, win, prop);
2779
2780 selection_wait = Sel_incr;
2781 incr_buf_fill = 0;
2782 incr_ev.start (10);
2783
2784 goto bailout;
2785 }
2786
2787 if (ct.nitems == 0)
2788 {
2789 if (selection_wait == Sel_incr)
2790 {
2791 XFree (ct.value);
2792
2793 // finally complete, now paste the whole thing
2794 selection_wait = Sel_normal;
2795 ct.value = (unsigned char *)incr_buf;
2796 ct.nitems = incr_buf_fill;
2797 incr_buf = 0;
2798 incr_buf_size = 0;
2799 incr_ev.stop ();
2800 }
2801 else
2802 {
2803 if (selection_wait == Sel_normal
2804 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2805 {
2806 /*
2807 * pass through again trying CUT_BUFFER0 if we've come from
2808 * XConvertSelection () but nothing was presented
2809 */
2810 selection_paste (display->root, XA_CUT_BUFFER0, False);
2811 }
2812
2813 goto bailout;
2814 }
2815 }
2816 else if (selection_wait == Sel_incr)
2817 {
2818 incr_ev.start (10);
2819
2820 while (incr_buf_fill + ct.nitems > incr_buf_size)
2821 {
2822 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2823 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2824 }
2825
2826 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2827 incr_buf_fill += ct.nitems;
2828
2829 goto bailout;
2830 }
2831
2832 char **cl;
2833 int cr;
2834
2835#if !ENABLE_MINIMAL
2836 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2837 // so recode it manually
2838 if (ct.encoding == xa[XA_UTF8_STRING])
2839 {
2840 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2841 char *s = rxvt_wcstombs (w);
2842 free (w);
2843 // TODO: strlen == only the first element will be converted. well...
2844 paste (s, strlen (s));
2845 free (s);
2846 }
2847 else
2848#endif
2849 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2850 && cl)
2851 {
2852 for (int i = 0; i < cr; i++)
2853 paste (cl[i], strlen (cl[i]));
2854
2855 XFreeStringList (cl);
2856 }
2857 else
2858 paste ((char *)ct.value, ct.nitems); // paste raw
2859
2860bailout:
2861 XFree (ct.value);
2862
2863 if (selection_wait == Sel_normal)
2864 selection_wait = Sel_none;
2865}
2866
2867void
2868rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2869{
2870 selection_wait = Sel_none;
2871
2872 incr_buf_size = 0;
2873 free (incr_buf);
2874
2875 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2876}
2877
2878void
2879rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2880{
2881 if (prop == None || selection_wait != Sel_incr)
2882 return; 2726 return;
2883 2727
2884 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2885} 2729}
2886 2730
2887/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2888/* 2732/*
2889 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2890 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2891 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * as fallback
2892 * > CUT_BUFFER0
2893 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2894 * will auto fallback to CUT_BUFFER0
2895 * EXT: button 2 release 2736 * EXT: button 2 release
2896 */ 2737 */
2897void 2738void
2898rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2899{ 2740{
2900 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2901 {
2902 /* internal selection */
2903 char *str = rxvt_wcstombs (selection.text, selection.len);
2904 paste (str, strlen (str));
2905 free (str);
2906 return;
2907 } 2742 {
2908 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2909 { 2745 }
2910 selection_request_time = tm;
2911 selection_wait = Sel_normal;
2912
2913#if X_HAVE_UTF8_STRING
2914 selection_type = Sel_UTF8String;
2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2916 return;
2917#else
2918 selection_type = Sel_CompoundText;
2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2920 return;
2921#endif
2922 }
2923
2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
2926}
2927
2928int
2929rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2930{
2931 Atom sel;
2932
2933 selection_type |= selnum;
2934
2935 if (selnum == Sel_Primary)
2936 sel = XA_PRIMARY;
2937 else if (selnum == Sel_Secondary)
2938 sel = XA_SECONDARY;
2939 else
2940 sel = xa[XA_CLIPBOARD];
2941
2942 if (XGetSelectionOwner (dpy, sel) != None)
2943 {
2944 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2945 vt, selection_request_time);
2946 return 1;
2947 }
2948
2949 return 0;
2950} 2746}
2951 2747
2952/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2953/* 2749/*
2954 * Clear all selected text 2750 * Clear all selected text
… …
2985 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2986 */ 2782 */
2987void 2783void
2988rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
2989{ 2785{
2990 int i; 2786 int size;
2991 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
2992 text_t *t; 2788 text_t *t;
2993 2789
2994 switch (selection.op) 2790 switch (selection.op)
2995 { 2791 {
… …
3011 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
3012 2808
3013 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3014 return; 2810 return;
3015 2811
3016 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3017 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3018 2814
3019 int ofs = 0; 2815 int ofs = 0;
3020 int extra = 0; 2816 int extra = 0;
3021 2817
3022 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
3028 { 2824 {
3029#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
3030 if (selection.rect) 2826 if (selection.rect)
3031 { 2827 {
3032 col = selection.beg.col; 2828 col = selection.beg.col;
3033 end_col = ncol + 1; 2829 end_col = selection.end.col;
3034 } 2830 }
3035 else 2831 else
3036#endif 2832#endif
3037 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
3038 2834
3039 col = max (col, 0); 2835 col = max (col, 0);
3040 2836
3041 if (row == selection.end.row 2837 if (row == selection.end.row)
3042#if !ENABLE_MINIMAL
3043 || selection.rect
3044#endif
3045 )
3046 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
3047 2839
3048 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
3049 2841
3050 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
3058 2850
3059 extra -= (len - 1); 2851 extra -= (len - 1);
3060 2852
3061 if (extra < 0) 2853 if (extra < 0)
3062 { 2854 {
3063 extra += i; 2855 extra += size;
3064 i += i; 2856 size += size;
3065 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3066 } 2858 }
3067 2859
3068 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3069 } 2861 }
3070#endif 2862#endif
… …
3082 2874
3083 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3084 } 2876 }
3085 else 2877 else
3086#endif 2878#endif
3087 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
3088 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3089 } 2883 }
3090
3091 if (end_col != selection.end.col)
3092 new_selection_text[ofs++] = C0_LF;
3093 2884
3094 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3095 2886
3096 if (ofs == 0) 2887 if (ofs == 0)
3097 { 2888 {
… …
3153/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
3154/* 2945/*
3155 * Mark or select text based upon number of clicks: 1, 2, or 3 2946 * Mark or select text based upon number of clicks: 1, 2, or 3
3156 * EXT: button 1 press 2947 * EXT: button 1 press
3157 */ 2948 */
3158void 2949void ecb_cold
3159rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3160{ 2951{
3161 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
3162 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
3163 2954
… …
3182 2973
3183/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
3184/* 2975/*
3185 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
3186 */ 2977 */
3187void 2978void ecb_cold
3188rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3189{ 2980{
3190 want_refresh = 1; 2981 want_refresh = 1;
3191 2982
3192 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3215 * Word select: select text for 2 clicks 3006 * Word select: select text for 2 clicks
3216 * We now only find out the boundary in one direction 3007 * We now only find out the boundary in one direction
3217 */ 3008 */
3218 3009
3219/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3220#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3221 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3222#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3223 3014
3224void 3015void ecb_cold
3225rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3226{ 3017{
3227 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3228 row_col_t bound; 3019 row_col_t bound;
3229 text_t *stp; 3020 text_t *stp;
… …
3303 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3304 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3305 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3306 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3307 */ 3098 */
3308void 3099void ecb_cold
3309rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3310{ 3101{
3311 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3312 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3313 3104
… …
3339 3130
3340/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3341/* 3132/*
3342 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3343 */ 3134 */
3344void 3135void ecb_cold
3345rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3346{ 3137{
3347 row_col_t pos; 3138 row_col_t pos;
3348 enum { 3139 enum {
3349 LEFT, RIGHT 3140 LEFT, RIGHT
3350 } closeto = RIGHT; 3141 } closeto = RIGHT;
3351
3352 want_refresh = 1;
3353 3142
3354 switch (selection.op) 3143 switch (selection.op)
3355 { 3144 {
3356 case SELECTION_INIT: 3145 case SELECTION_INIT:
3357 CLEAR_SELECTION (); 3146 CLEAR_SELECTION ();
… …
3537 3326
3538#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3539 if (selection.rect && selection.beg.col > selection.end.col) 3328 if (selection.rect && selection.beg.col > selection.end.col)
3540 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3541#endif 3330#endif
3331
3332 selection_changed ();
3542} 3333}
3543 3334
3544#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3545void 3336void ecb_cold
3546rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3547{ 3338{
3548 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3549 text_t *stp; 3340 text_t *stp;
3550 3341
… …
3588/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3589/* 3380/*
3590 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3591 * EXT: button 3 double click 3382 * EXT: button 3 double click
3592 */ 3383 */
3593void 3384void ecb_cold
3594rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3595{ 3386{
3596 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3597 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3598} 3389}
… …
3600/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3601/* 3392/*
3602 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3603 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3604 */ 3395 */
3605void 3396void ecb_cold
3606rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3607{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3608 XSelectionEvent ev; 3400 XSelectionEvent ev;
3609 3401
3610 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3611 ev.property = None; 3403 ev.property = None;
3612 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3627 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3628#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3629 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3630#endif 3422#endif
3631 3423
3632 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3633 32, PropModeReplace, 3425 32, PropModeReplace,
3634 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3635 ev.property = rq.property; 3427 ev.property = property;
3636 } 3428 }
3637#if TODO // TODO 3429#if TODO // TODO
3638 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3639 { 3431 {
3640 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3641 } 3433 }
3642#endif 3434#endif
3643 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3644 { 3436 {
3645 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3646 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3647 ev.property = rq.property; 3439 ev.property = property;
3648 } 3440 }
3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3650 { 3442 {
3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3652 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3653 ev.property = rq.property; 3445 ev.property = property;
3654 } 3446 }
3655 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3656 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3657 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3658 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3729 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3730 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3731 ct.encoding = target; 3523 ct.encoding = target;
3732 } 3524 }
3733 3525
3734 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3735 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3736 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3737 ev.property = rq.property; 3529 ev.property = property;
3738 3530
3739 if (freect) 3531 if (freect)
3740 XFree (ct.value); 3532 XFree (ct.value);
3741 } 3533 }
3742 3534
3743 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3744} 3536}
3745 3537
3746/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3747#ifdef USE_XIM 3539#if USE_XIM
3748void 3540void ecb_cold
3749rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3750{ 3542{
3751 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3752 3544
3753 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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