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.352 by root, Fri Oct 15 20:52:15 2010 UTC vs.
Revision 1.440 by root, Wed Mar 27 17:24:16 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 separate 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 ();
… …
154 l.r[col] = rend; 150 l.r[col] = rend;
155 col++; 151 col++;
156 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
157} 153}
158 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
159/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
160 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
161 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
162 168
163void 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
164rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
165{ 215{
216#if ENABLE_OVERLAY
217 scr_overlay_off ();
218#endif
219
166 view_start = 0; 220 view_start = 0;
167 num_scr = 0; 221 num_scr = 0;
168 222
169 if (ncol == 0) 223 if (ncol == 0)
170 ncol = 80; 224 ncol = 80;
… …
190 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
191 245
192 screen.tscroll = 0; 246 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
194 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
195 if (!row_buf) 257 if (!prev_row_buf)
196 { 258 {
197 /*
198 * first time called so just malloc everything: don't rely on realloc
199 */
200 top_row = 0; 259 top_row = 0;
201 term_start = 0; 260 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 261
217 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
243 { 288 {
244 /* 289 /*
245 * add or delete rows as appropriate 290 * add or delete rows as appropriate
246 */ 291 */
247 292
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 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 294
265 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
266 { 296 {
267 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
269 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
270 300
271 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
272 { 302 }
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 303
280 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
281 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
283 307
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 316
293 do 317 do
294 { 318 {
295 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 321 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 323
300 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 ())
301 { 325 {
302 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
303 327
304 plines++; 328 plines++;
305 llen += prev_ncol; 329 llen += prev_ncol;
… …
318 342
319 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
321 { 345 {
322 qline = row_buf + qrow; 346 qline = row_buf + qrow;
323 lalloc (*qline); 347 qline->alloc (); // redundant with next line
324 qline->l = ncol; 348 qline->l = ncol;
325 qline->is_longer (1); 349 qline->is_longer (1);
326 350
327 int qcol = 0; 351 int qcol = 0;
328 352
… …
343 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
344 // least. 368 // least.
345 if (prow == ocur.row) 369 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
347 371
348 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
349 373
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 375
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 398 {
375 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
376 400
377 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
378 { 402 {
379 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)];
380 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
381 405
382 qline = pline; 406 copy_line (dst, src);
383 lresize (qline);
384 } 407 }
385 408
386 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 411
391 term_start = 0; 412 term_start = 0;
392 } 413 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 414
398 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 417 }
401 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
402 free (tabs); 428 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
404 430
405 for (int col = ncol; --col; ) 431 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
407 433
408 CLEAR_ALL_SELECTION (); 434 CLEAR_ALL_SELECTION ();
409 435
410 prev_nrow = nrow; 436 prev_nrow = nrow;
… …
413 tt_winch (); 439 tt_winch ();
414 440
415 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416} 442}
417 443
418/* ------------------------------------------------------------------------- */ 444void ecb_cold
419/*
420 * Free everything. That way malloc debugging can find leakage.
421 */
422void
423rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
424{ 446{
425 if (row_buf) 447 chunk_free (chunk, chunk_size);
426 { 448 chunk = 0;
427 delete talloc; talloc = 0; 449 row_buf = 0;
428 delete ralloc; ralloc = 0;
429 450
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); 451 free (tabs);
436 tabs = 0; 452 tabs = 0;
437 }
438} 453}
439 454
440/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
441/* 456/*
442 * Hard/Soft reset 457 * Hard/Soft reset
443 */ 458 */
444void 459void ecb_cold
445rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
446{ 461{
447 scr_release (); 462 scr_release ();
463
448 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false; 465 rvideo_mode = false;
450 scr_soft_reset (); 466 scr_soft_reset ();
451 scr_reset (); 467 scr_reset ();
452 468
453 scr_clear (true); 469 scr_clear (true);
454 scr_refresh (); 470 scr_refresh ();
455} 471}
456 472
457void 473void ecb_cold
458rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
459{ 475{
460 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
462 scr_overlay_off (); 478 scr_overlay_off ();
463#endif 479#endif
… …
518 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
519 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
520} 536}
521 537
522void 538void
523rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
524{ 540{
525 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
526 return; 542 return;
527 543
528 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
547 return; 563 return;
548 564
549 want_refresh = 1; 565 want_refresh = 1;
550 view_start = 0; 566 view_start = 0;
551 567
552 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 ();
553 574
554 current_screen = scrn; 575 current_screen = scrn;
555 576
556#if NSCREENS 577#if NSCREENS
557 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
… …
623/* 644/*
624 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
625 * count positive ==> scroll up 646 * count positive ==> scroll up
626 * count negative ==> scroll down 647 * count negative ==> scroll down
627 */ 648 */
628int 649int ecb_hot
629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630{ 651{
631 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
632 return 0; 653 return 0;
633 654
… …
636 657
637 if (count > 0 658 if (count > 0
638 && row1 == 0 659 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
641 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 665
646 // sever bottommost line 666 // sever bottommost line
647 { 667 {
648 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
649 l.is_longer (0); 669 l.is_longer (0);
650 l.touch (); 670 l.touch ();
651 } 671 }
652 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
653 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 689 for (int i = count; i--; )
655 { 690 {
656 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
657 692
658 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 694 // 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))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 696 {
662 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 698 l.l = 0;
… …
665 } 700 }
666 else 701 else
667 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
668 } 703 }
669 704
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 705 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
684 { 708 {
685 selection.beg.row -= count; 709 selection.beg.row -= count;
686 selection.end.row -= count; 710 selection.end.row -= count;
687 selection.mark.row -= count; 711 selection.mark.row -= count;
688 712
689 if (selection.beg.row < top_row 713 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 } 714 }
697 715
698 // finally move the view window, if desired 716 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 718 && view_start != 0
701 && view_start != -saveLines) 719 && view_start != -saveLines)
702 scr_page (UP, count); 720 scr_page (count);
703 721
704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
705 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
706 } 724 }
707 else 725 else
… …
730 } 748 }
731 749
732 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
734 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
735 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
736 762
737 min_it (count, rows); 763 min_it (count, rows);
738 764
739 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 766
741 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
742 { 768 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 770
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 773 }
748 774
749 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
750 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 }
751 } 784 }
752 785
753 return count; 786 return count;
754} 787}
755 788
756/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
757/* 790/*
758 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
759 */ 792 */
760void 793void ecb_hot
761rxvt_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
762{ 795{
763 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
764 return; 797 return;
765 798
766 unsigned char checksel; 799 bool checksel;
767 unicode_t c; 800 unicode_t c;
768 int ncol = this->ncol; 801 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
770 803
771 want_refresh = 1; 804 want_refresh = 1;
… …
797 830
798 while (str < strend) 831 while (str < strend)
799 { 832 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 834
802 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 836 if (c == C0_LF)
804 { 837 {
805 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
806 839
807 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
826 { 859 {
827 scr_tab (1, true); 860 scr_tab (1, true);
828 continue; 861 continue;
829 } 862 }
830 863
831 if (expect_false ( 864 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 868 ))
836 { 869 {
… …
841 * should be a similar check. 874 * should be a similar check.
842 */ 875 */
843 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
844 } 877 }
845 878
846 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 880 {
848 scr_do_wrap (); 881 scr_do_wrap ();
849 882
850 line->l = ncol; 883 line->l = ncol;
851 line->is_longer (1); 884 line->is_longer (1);
… …
853 row = screen.cur.row; 886 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
855 } 888 }
856 889
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 892 c = 0xfffd;
860 893
861 // 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
862 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
864 // locale. 897 // locale.
865 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
866 899
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 901 {
869 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 903 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
887 } 920 }
888 } 921 }
889 922
890 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
892 925
893 if (width != 0) 926 if (width != 0)
894 { 927 {
895#if !UNICODE_3 928#if !UNICODE_3
… …
903#endif 936#endif
904 937
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 939
907 // if the character doesn't fit into the remaining columns... 940 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 942 {
910 if (screen.flags & Screen_Autowrap) 943 if (screen.flags & Screen_Autowrap)
911 { 944 {
912 // ... artificially enlargen the previous one 945 // ... artificially enlargen the previous one
913 c = NOCHAR; 946 c = NOCHAR;
… …
917 else 950 else
918 screen.cur.col = ncol - width; 951 screen.cur.col = ncol - width;
919 } 952 }
920 953
921 // nuke the character at this position, if required 954 // nuke the character at this position, if required
922 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.
923 line->t[screen.cur.col] == NOCHAR 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 || (screen.cur.col < ncol - 1
925 && line->t[screen.cur.col + 1] == NOCHAR)
926 ))
927 scr_kill_char (*line, screen.cur.col); 959 scr_kill_char (*line, screen.cur.col);
928 960
929 line->touch (); 961 line->touch ();
930 962
931 do 963 do
932 { 964 {
933 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
934 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
935 967
936 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
937 screen.cur.col++; 969 screen.cur.col++;
938 else 970 else
939 { 971 {
940 line->l = ncol; 972 line->l = ncol;
941 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
… …
944 goto end_of_line; 976 goto end_of_line;
945 } 977 }
946 978
947 c = NOCHAR; 979 c = NOCHAR;
948 } 980 }
949 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
950 982
951 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
952 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
953 { 985 {
954 line->t[c] = ' '; 986 line->t[c] = ' ';
955 line->r[c] = rend; 987 line->r[c] = rend;
956 } 988 }
957 989
… …
1116 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1117 * 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
1118 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1119 */ 1151 */
1120#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1121void 1153void ecb_cold
1122rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1123{ 1155{
1124 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1125 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1126 else 1158 else
… …
1133 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1134 * 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
1135 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1136 */ 1168 */
1137#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1138void 1170void ecb_cold
1139rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1140{ 1172{
1141 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1142 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1143 else 1175 else
… …
1294 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1295} 1327}
1296 1328
1297/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1298/* 1330/*
1299 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303 */ 1335 */
1304void 1336void
… …
1313 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1314 1346
1315 switch (mode) 1347 switch (mode)
1316 { 1348 {
1317 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1318 selection_check (1);
1319 scr_erase_line (0); 1350 scr_erase_line (0);
1320 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1321 num = nrow - row; 1352 num = nrow - row;
1322 break; 1353 break;
1323 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1324 selection_check (3);
1325 scr_erase_line (1); 1355 scr_erase_line (1);
1326 row = 0; 1356 row = 0;
1327 num = screen.cur.row; 1357 num = screen.cur.row;
1328 break; 1358 break;
1329 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1330 selection_check (3);
1331 row = 0; 1360 row = 0;
1332 num = nrow; 1361 num = nrow;
1333 break; 1362 break;
1334 default: 1363 default:
1335 return; 1364 return;
… …
1352 { 1381 {
1353 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1354 1383
1355 if (mapped) 1384 if (mapped)
1356 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1359 } 1388 }
1360 else 1389 else
1361 { 1390 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1365 { 1394 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1399 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1403 }
1375 } 1404 }
… …
1397/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1398/* 1427/*
1399 * Fill the screen with `E's 1428 * Fill the screen with `E's
1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1401 */ 1430 */
1402void 1431void ecb_cold
1403rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1404{ 1433{
1405 rend_t fs; 1434 rend_t fs;
1406 1435
1407 want_refresh = 1; 1436 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1409 1438
1410 num_scr_allow = 0; 1439 num_scr_allow = 0;
1411 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 ();
1412 1445
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1415 { 1448 {
1416 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1567/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1568/* 1601/*
1569 * Set the scrolling region 1602 * Set the scrolling region
1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571 */ 1604 */
1572void 1605void ecb_cold
1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574{ 1607{
1575 max_it (top, 0); 1608 max_it (top, 0);
1576 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1577 1610
… …
1587/* 1620/*
1588 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591 */ 1624 */
1592void 1625void ecb_cold
1593rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594{ 1627{
1595 want_refresh = 1; 1628 want_refresh = 1;
1596 1629
1597 if (mode) 1630 if (mode)
… …
1604/* 1637/*
1605 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608 */ 1641 */
1609void 1642void ecb_cold
1610rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1611{ 1644{
1612 if (mode) 1645 if (mode)
1613 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1614 else 1647 else
… …
1623 * 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
1624 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627 */ 1660 */
1628void 1661void ecb_cold
1629rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1630{ 1663{
1631 if (mode) 1664 if (mode)
1632 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1633 else 1666 else
… …
1640/* 1673/*
1641 * Set insert/replace mode 1674 * Set insert/replace mode
1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644 */ 1677 */
1645void 1678void ecb_cold
1646rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1647{ 1680{
1648 if (mode) 1681 if (mode)
1649 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1650 else 1683 else
… …
1656 * Set/Unset tabs 1689 * Set/Unset tabs
1657 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660 */ 1693 */
1661void 1694void ecb_cold
1662rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1663{ 1696{
1664 if (mode < 0) 1697 if (mode < 0)
1665 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1666 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1685 if (rvideo_state != on) 1718 if (rvideo_state != on)
1686 { 1719 {
1687 rvideo_state = on; 1720 rvideo_state = on;
1688 1721
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1691 if (bgPixmap.pixmap == None) 1724 if (bg_img == 0)
1692#endif 1725#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1727
1695 XGCValues gcvalue; 1728 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1705/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1706/* 1739/*
1707 * Report current cursor position 1740 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1742 */
1710void 1743void ecb_cold
1711rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1712{ 1745{
1713 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);
1714} 1747}
1715 1748
… …
1718 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1719 1752
1720/* 1753/*
1721 * Set font style 1754 * Set font style
1722 */ 1755 */
1723void 1756void ecb_cold
1724rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1725{ 1758{
1726#if 0 1759#if 0
1727 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1728 { 1761 {
… …
1750 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1787 */
1755void 1788void ecb_cold
1756rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1790{
1758 screen.charset = set; 1791 screen.charset = set;
1759 set_font_style (); 1792 set_font_style ();
1760} 1793}
… …
1781 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1782 1815
1783/* 1816/*
1784 * refresh matching text. 1817 * refresh matching text.
1785 */ 1818 */
1786bool 1819bool ecb_cold
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1821{
1789 bool found = false; 1822 bool found = false;
1790 1823
1791 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1810 PART_BEG = 0, 1843 PART_BEG = 0,
1811 PART_END, 1844 PART_END,
1812 RC_COUNT 1845 RC_COUNT
1813}; 1846};
1814 1847
1815void 1848void ecb_hot
1816rxvt_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
1817{ 1850{
1818 int i; 1851 int i;
1819 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1820 1853
… …
1857 * Refresh the entire screen 1890 * Refresh the entire screen
1858 */ 1891 */
1859void 1892void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1861{ 1894{
1862 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1896}
1864 1897
1865/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1866/* 1899/*
1867 * 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
… …
1877/* 1910/*
1878 * Page the screen up/down nlines 1911 * Page the screen up/down nlines
1879 * direction should be UP or DN 1912 * direction should be UP or DN
1880 */ 1913 */
1881bool 1914bool
1882rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1915rxvt_term::scr_page (int nlines) NOTHROW
1883{ 1916{
1884 int new_view_start =
1885 direction == UP ? view_start - nlines
1886 : view_start + nlines;
1887
1888 return scr_changeview (new_view_start); 1917 return scr_changeview (view_start - nlines);
1889} 1918}
1890 1919
1891bool 1920bool
1892rxvt_term::scr_changeview (int new_view_start) NOTHROW 1921rxvt_term::scr_changeview (int new_view_start) NOTHROW
1893{ 1922{
… …
1923 1952
1924# ifndef NO_MAPALERT 1953# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1954# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1955 if (option (Opt_mapAlert))
1927# endif 1956# endif
1928 XMapWindow (dpy, parent[0]); 1957 XMapWindow (dpy, parent);
1929# endif 1958# endif
1930 1959
1931# if ENABLE_FRILLS 1960# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1961 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1962 set_urgency (1);
… …
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1975 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1947#endif 1976#endif
1948} 1977}
1949 1978
1950/* ------------------------------------------------------------------------- */ 1979/* ------------------------------------------------------------------------- */
1951/* ARGSUSED */ 1980void ecb_cold
1952void
1953rxvt_term::scr_printscreen (int fullhist) NOTHROW 1981rxvt_term::scr_printscreen (int fullhist) NOTHROW
1954{ 1982{
1955#ifdef PRINTPIPE 1983#ifdef PRINTPIPE
1956 int nrows, row_start; 1984 int nrows, row_start;
1957 FILE *fd = popen_printer (); 1985 FILE *fd = popen_printer ();
… …
2006/* 2034/*
2007 * Refresh the screen 2035 * Refresh the screen
2008 * drawn_text/drawn_rend contain the screen information before the update. 2036 * drawn_text/drawn_rend contain the screen information before the update.
2009 * screen.text/screen.rend contain what the screen will change to. 2037 * screen.text/screen.rend contain what the screen will change to.
2010 */ 2038 */
2011void 2039void ecb_hot
2012rxvt_term::scr_refresh () NOTHROW 2040rxvt_term::scr_refresh () NOTHROW
2013{ 2041{
2014 int16_t col, row, /* column/row we're processing */ 2042 int16_t col, row, /* column/row we're processing */
2015 ocrow; /* old cursor row */ 2043 ocrow; /* old cursor row */
2016 int i; /* tmp */ 2044 int i; /* tmp */
2017#ifndef NO_CURSORCOLOR
2018 rend_t cc1; /* store colours at cursor position (s) */
2019#endif
2020 rend_t *crp; // cursor rendition pointer
2021 rend_t ccol1, /* Cursor colour */ 2045 rend_t ccol1, /* Cursor colour */
2022 ccol2; /* Cursor colour2 */ 2046 ccol2; /* Cursor colour2 */
2047 rend_t cur_rend;
2048 int cur_col;
2049 int cursorwidth;
2023 2050
2024 want_refresh = 0; /* screen is current */ 2051 want_refresh = 0; /* screen is current */
2025 2052
2026 if (refresh_type == NO_REFRESH || !mapped) 2053 if (refresh_type == NO_REFRESH || !mapped)
2027 return; 2054 return;
… …
2030 * A: set up vars 2057 * A: set up vars
2031 */ 2058 */
2032 refresh_count = 0; 2059 refresh_count = 0;
2033 2060
2034 unsigned int old_screen_flags = screen.flags; 2061 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0; 2062 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2063#ifdef HAVE_IMG
2037 have_bg = bgPixmap.pixmap != None; 2064 have_bg = bg_img != 0;
2038#endif 2065#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2066 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2067
2041 /* 2068 /*
2042 * B: reverse any characters which are selected 2069 * B: reverse any characters which are selected
… …
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2073 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY 2074#if ENABLE_OVERLAY
2048 scr_swap_overlay (); 2075 scr_swap_overlay ();
2049#endif 2076#endif
2050 2077
2051 char showcursor = screen.flags & Screen_VisibleCursor; 2078 bool showcursor = screen.flags & Screen_VisibleCursor;
2052 2079
2053 /* 2080 /*
2054 * C: set the cursor character (s) 2081 * C: set the cursor character (s)
2055 */ 2082 */
2056 { 2083 {
2057 unsigned char setoldcursor;
2058
2059#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2060 if (hidden_cursor) 2085 if (hidden_cursor)
2061 showcursor = 0; 2086 showcursor = 0;
2062#endif 2087#endif
2063 2088
… …
2066 int col = screen.cur.col; 2091 int col = screen.cur.col;
2067 2092
2068 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2093 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2069 col--; 2094 col--;
2070 2095
2096 cursorwidth = 1;
2097 while (col + cursorwidth < ncol
2098 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2099 cursorwidth++;
2100
2071 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2072 2103
2073#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2074 cc1 = *crp & (RS_fgMask | RS_bgMask);
2075 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2076 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2077 else 2107 else
2078#endif 2108#endif
2079#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2093 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2094#endif 2124#endif
2095 2125
2096 if (focus) 2126 if (focus)
2097 { 2127 {
2128 rend_t rend = cur_rend;
2129
2098 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2099 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2100 else 2132 else
2101 { 2133 {
2102 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2103 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2104 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2105 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2106 } 2140 }
2107 } 2141 }
2108 2142
2109 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2110 setoldcursor = 0;
2111 if (ocrow != -1) 2144 if (ocrow != -1)
2112 { 2145 {
2113 if (screen.cur.row - view_start != ocrow 2146 if (screen.cur.row - view_start != ocrow
2114 || screen.cur.col != oldcursor.col) 2147 || screen.cur.col != oldcursor.col)
2115 { 2148 {
2116 if (ocrow < nrow 2149 if (ocrow < nrow
2117 && oldcursor.col < ncol) 2150 && oldcursor.col < ncol)
2118 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2151 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2119
2120 if (focus || !showcursor)
2121 oldcursor.row = -1;
2122 else
2123 setoldcursor = 1;
2124 } 2152 }
2125 } 2153 }
2126 else if (!focus)
2127 setoldcursor = 1;
2128 2154
2129 if (setoldcursor) 2155 // save the current cursor coordinates if the cursor is visible
2156 // and the window is unfocused, so as to clear the outline cursor
2157 // in the next refresh if the cursor moves
2158 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2130 { 2159 {
2131 if (screen.cur.row - view_start >= nrow)
2132 oldcursor.row = -1;
2133 else
2134 {
2135 oldcursor.row = screen.cur.row - view_start; 2160 oldcursor.row = screen.cur.row - view_start;
2136 oldcursor.col = screen.cur.col; 2161 oldcursor.col = screen.cur.col;
2137 }
2138 } 2162 }
2163 else
2164 oldcursor.row = -1;
2139 } 2165 }
2140 2166
2141#ifndef NO_SLOW_LINK_SUPPORT 2167#ifndef NO_SLOW_LINK_SUPPORT
2142 /* 2168 /*
2143 * D: CopyArea pass - very useful for slower links 2169 * D: CopyArea pass - very useful for slower links
… …
2149 { 2175 {
2150 int16_t nits; 2176 int16_t nits;
2151 int i = num_scr; 2177 int i = num_scr;
2152 int j; 2178 int j;
2153 int len, wlen; 2179 int len, wlen;
2154 dLocal (int, num_scr);
2155 2180
2156 j = nrow; 2181 j = nrow;
2157 wlen = len = -1; 2182 wlen = len = -1;
2158 row = i > 0 ? 0 : j - 1; 2183 row = i > 0 ? 0 : j - 1;
2159 2184
… …
2234 continue; 2259 continue;
2235 2260
2236 // redraw one or more characters 2261 // redraw one or more characters
2237 2262
2238 // seek to the beginning of wide characters 2263 // seek to the beginning of wide characters
2239 while (expect_false (stp[col] == NOCHAR && col > 0)) 2264 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2240 --col; 2265 --col;
2241 2266
2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2267 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2243 text_t *text = stp + col; 2268 text_t *text = stp + col;
2244 int count = 1; 2269 int count = 1;
… …
2282 2307
2283 col--; /* went one too far. move back */ 2308 col--; /* went one too far. move back */
2284 count -= i; /* dump any matching trailing chars */ 2309 count -= i; /* dump any matching trailing chars */
2285 2310
2286 // sometimes we optimize away the trailing NOCHAR's, add them back 2311 // sometimes we optimize away the trailing NOCHAR's, add them back
2287 while (expect_false (i && text[count] == NOCHAR)) 2312 while (ecb_unlikely (i && text[count] == NOCHAR))
2288 count++, i--; 2313 count++, i--;
2289 2314
2290 /* 2315 /*
2291 * Determine the attributes for the string 2316 * Determine the attributes for the string
2292 */ 2317 */
2293 int fore = fgcolor_of (rend); // desired foreground 2318 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2319 int back = bgcolor_of (rend); // desired background
2295 2320
2296 // only do special processing if any attributes are set, which is unlikely 2321 // only do special processing if any attributes are set, which is unlikely
2297 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2322 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298 { 2323 {
2299 bool invert = rend & RS_RVid; 2324 bool invert = rend & RS_RVid;
2300 2325
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2326#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2327 if (rend & RS_Bold && fore == Color_fg)
… …
2391 /* 2416 /*
2392 * Actually do the drawing of the string here 2417 * Actually do the drawing of the string here
2393 */ 2418 */
2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2419 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2395 2420
2396 if (expect_true (have_bg && back == Color_bg)) 2421 if (ecb_likely (have_bg && back == Color_bg))
2397 { 2422 {
2398 // this is very ugly, maybe push it into ->draw? 2423 // this is very ugly, maybe push it into ->draw?
2399 2424
2400 for (i = 0; i < count; i++) /* don't draw empty strings */ 2425 for (i = 0; i < count; i++) /* don't draw empty strings */
2401 if (text[i] != ' ') 2426 if (text[i] != ' ')
… …
2408 did_clear: ; 2433 did_clear: ;
2409 } 2434 }
2410 else 2435 else
2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2436 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2412 2437
2413 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2438 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2414 { 2439 {
2440 if (showcursor && focus && row == screen.cur.row
2441 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2442 XSetForeground (dpy, gc, pix_colors[ccol1]);
2443 else
2415#if ENABLE_FRILLS 2444#if ENABLE_FRILLS
2416 if (ISSET_PIXCOLOR (Color_underline)) 2445 if (ISSET_PIXCOLOR (Color_underline))
2417 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2446 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2418 else 2447 else
2419#endif 2448#endif
… …
2430 * G: cleanup cursor and display outline cursor if necessary 2459 * G: cleanup cursor and display outline cursor if necessary
2431 */ 2460 */
2432 if (showcursor) 2461 if (showcursor)
2433 { 2462 {
2434 if (focus) 2463 if (focus)
2435 { 2464 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2436 if (option (Opt_cursorUnderline))
2437 *crp ^= RS_Uline;
2438 else
2439 {
2440 *crp ^= RS_RVid;
2441#ifndef NO_CURSORCOLOR
2442 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2443#endif
2444 }
2445 }
2446 else if (oldcursor.row >= 0) 2465 else if (oldcursor.row >= 0)
2447 { 2466 {
2448 int cursorwidth = 1;
2449 int col = oldcursor.col;
2450
2451 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2452 col--;
2453
2454 while (col + cursorwidth < ncol
2455 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2456 cursorwidth++;
2457
2458#ifndef NO_CURSORCOLOR
2459 if (ISSET_PIXCOLOR (Color_cursor))
2460 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2461 else
2462#endif
2463 XSetForeground (dpy, gc, pix_colors[ccol1]); 2467 XSetForeground (dpy, gc, pix_colors[ccol1]);
2464 2468
2465 XDrawRectangle (dpy, vt, gc, 2469 XDrawRectangle (dpy, vt, gc,
2466 Col2Pixel (col), 2470 Col2Pixel (cur_col),
2467 Row2Pixel (oldcursor.row), 2471 Row2Pixel (oldcursor.row),
2468 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2472 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2469 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2473 (unsigned int) (Height2Pixel (1) - 1));
2470 } 2474 }
2471 } 2475 }
2472 2476
2473 /* 2477 /*
2474 * H: cleanup selection 2478 * H: cleanup selection
… …
2483 screen.flags = old_screen_flags; 2487 screen.flags = old_screen_flags;
2484 num_scr = 0; 2488 num_scr = 0;
2485 num_scr_allow = 1; 2489 num_scr_allow = 1;
2486} 2490}
2487 2491
2488void 2492void ecb_cold
2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2493rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2490{ 2494{
2491 if (!l.t) 2495 if (!l.valid ())
2492 return; 2496 return;
2493 2497
2494 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2498 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2495 2499
2496 for (int i = ncol; i--; ) 2500 for (int i = ncol; i--; )
2497 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2501 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2498} 2502}
2499 2503
2500void 2504void ecb_cold
2501rxvt_term::scr_remap_chars () NOTHROW 2505rxvt_term::scr_remap_chars () NOTHROW
2502{ 2506{
2503 for (int i = total_rows; i--; ) 2507 for (int i = total_rows; i--; )
2504 scr_remap_chars (row_buf [i]); 2508 scr_remap_chars (row_buf [i]);
2505 2509
… …
2508 scr_remap_chars (drawn_buf [i]); 2512 scr_remap_chars (drawn_buf [i]);
2509 scr_remap_chars (swap_buf [i]); 2513 scr_remap_chars (swap_buf [i]);
2510 } 2514 }
2511} 2515}
2512 2516
2513void 2517void ecb_cold
2514rxvt_term::scr_recolour () NOTHROW 2518rxvt_term::scr_recolour (bool refresh) NOTHROW
2515{ 2519{
2516#ifdef HAVE_BG_PIXMAP 2520 bool transparent = false;
2517 bgPixmap.apply ();
2518#else
2519 2521
2522#ifdef HAVE_IMG
2523 if (bg_img != 0)
2524 {
2525# if ENABLE_TRANSPARENCY
2526 if (bg_flags & BG_IS_TRANSPARENT)
2527 {
2528 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2529 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2530
2531 transparent = true;
2532 }
2533 else
2534# endif
2535 {
2536 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2538 }
2539 }
2540 else
2541#endif
2542 {
2520 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2543 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2521 XClearWindow (dpy, parent[0]);
2522 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2544 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2545 }
2546
2547 XClearWindow (dpy, parent);
2523 2548
2524 if (scrollBar.win) 2549 if (scrollBar.win)
2525 { 2550 {
2551 if (transparent)
2552 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2553 else
2526 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2554 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2527 scrollBar.state = STATE_IDLE; 2555 scrollBar.state = SB_STATE_IDLE;
2528 scrollBar.show (0); 2556 scrollBar.show (0);
2529 } 2557 }
2530 2558
2531#endif 2559 if (refresh)
2532 2560 {
2533 /* bgPixmap.apply () does not do the following : */
2534 scr_clear (); 2561 scr_clear ();
2535 scr_touch (true); 2562 scr_touch (true);
2563 }
2536 want_refresh = 1; 2564 want_refresh = 1;
2537} 2565}
2538 2566
2539/* ------------------------------------------------------------------------- */ 2567/* ------------------------------------------------------------------------- */
2540void 2568void
… …
2597 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2625 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2598 srp[col] ^= rstyle; 2626 srp[col] ^= rstyle;
2599} 2627}
2600 2628
2601/* ------------------------------------------------------------------------- */ 2629/* ------------------------------------------------------------------------- */
2602void 2630void ecb_hot
2603rxvt_term::scr_reverse_selection () NOTHROW 2631rxvt_term::scr_reverse_selection () NOTHROW
2604{ 2632{
2605 if (selection.op 2633 if (selection.op
2606 && current_screen == selection.screen 2634 && current_screen == selection.screen
2607 && selection.end.row >= view_start) 2635 && selection.end.row >= view_start)
… …
2626 */ 2654 */
2627#if 0 2655#if 0
2628void 2656void
2629rxvt_term::scr_dump (int fd) NOTHROW 2657rxvt_term::scr_dump (int fd) NOTHROW
2630{ 2658{
2631 int row, wrote; 2659 // if this method is needed, it can be implemented by factoring the
2632 unsigned int width, towrite; 2660 // relevant code in scr_printscreen
2633 char r1[] = "\n";
2634
2635 for (row = saveLines + top_row;
2636 row < saveLines + nrow - 1; row++)
2637 {
2638 width = row_buf[row].l >= 0 ? row_buf[row].l
2639 : ncol;
2640 for (towrite = width; towrite; towrite -= wrote)
2641 {
2642 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2643 towrite);
2644 if (wrote < 0)
2645 return; /* XXX: death, no report */
2646 }
2647 if (row_buf[row].l >= 0)
2648 if (write (fd, r1, 1) <= 0)
2649 return; /* XXX: death, no report */
2650 }
2651} 2661}
2652#endif 2662#endif
2653 2663
2654/* ------------------------------------------------------------------------- * 2664/* ------------------------------------------------------------------------- *
2655 * CHARACTER SELECTION * 2665 * CHARACTER SELECTION *
2656 * ------------------------------------------------------------------------- */ 2666 * ------------------------------------------------------------------------- */
2657void 2667void
2658rxvt_term::selection_check (int check_more) NOTHROW 2668rxvt_term::selection_check (int check_more) NOTHROW
2659{ 2669{
2660 row_col_t pos;
2661
2662 if (!selection.op) 2670 if (!selection.op)
2663 return; 2671 return;
2664 2672
2665 pos.row = pos.col = 0;
2666 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2673 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2667 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2674 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2668 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2675 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2669 || (check_more == 1 2676 || (check_more == 1
2670 && current_screen == selection.screen 2677 && current_screen == selection.screen
2671 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2678 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2672 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2679 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2673 || (check_more == 2
2674 && ROWCOL_IS_BEFORE (selection.beg, pos)
2675 && ROWCOL_IS_AFTER (selection.end, pos))
2676 || (check_more == 3
2677 && ROWCOL_IS_AFTER (selection.end, pos))
2678 || (check_more == 4 /* screen width change */
2679 && (selection.beg.row != selection.end.row
2680 || selection.end.col > ncol)))
2681 CLEAR_SELECTION (); 2680 CLEAR_ALL_SELECTION ();
2681}
2682
2683void
2684rxvt_term::selection_changed () NOTHROW
2685{
2686 line_t &r1 = ROW (selection.beg.row);
2687 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2688 --selection.beg.col;
2689
2690 line_t &r2 = ROW (selection.end.row);
2691 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2692 ++selection.end.col;
2693
2694 want_refresh = 1;
2682} 2695}
2683 2696
2684/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2685/* 2698/*
2686 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
… …
2692 for (unsigned int i = 0; i < len; i++) 2705 for (unsigned int i = 0; i < len; i++)
2693 if (data[i] == C0_LF) 2706 if (data[i] == C0_LF)
2694 data[i] = C0_CR; 2707 data[i] = C0_CR;
2695 2708
2696 if (priv_modes & PrivMode_BracketPaste) 2709 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[200~"); 2710 tt_printf ("\x1b[200~");
2698 2711
2699 tt_write (data, len); 2712 tt_write (data, len);
2700 2713
2701 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2702 tt_printf ("\e[201~"); 2715 tt_printf ("\x1b[201~");
2703} 2716}
2704 2717
2705void 2718void
2706rxvt_term::paste (char *data, unsigned int len) NOTHROW 2719rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{ 2720{
… …
2711 tt_paste (data, len); 2724 tt_paste (data, len);
2712} 2725}
2713 2726
2714/* ------------------------------------------------------------------------- */ 2727/* ------------------------------------------------------------------------- */
2715/* 2728/*
2716 * Respond to a notification that a primary selection has been sent 2729 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2717 * EXT: SelectionNotify 2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2718 */ 2731 * as fallback
2719void
2720rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2721{
2722 if (prop == None) /* check for failed XConvertSelection */
2723 {
2724 if ((selection_type & Sel_CompoundText))
2725 {
2726 int selnum = selection_type & Sel_whereMask;
2727
2728 selection_type = 0;
2729 if (selnum != Sel_direct)
2730 selection_request_other (XA_STRING, selnum);
2731 }
2732
2733 if ((selection_type & Sel_UTF8String))
2734 {
2735 int selnum = selection_type & Sel_whereMask;
2736
2737 selection_type = Sel_CompoundText;
2738 if (selnum != Sel_direct)
2739 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2740 else
2741 selection_type = 0;
2742 }
2743
2744 return;
2745 }
2746
2747 unsigned long bytes_after;
2748 XTextProperty ct;
2749
2750 if (XGetWindowProperty (dpy, win, prop,
2751 0, PROP_SIZE / 4,
2752 delete_prop, AnyPropertyType,
2753 &ct.encoding, &ct.format,
2754 &ct.nitems, &bytes_after,
2755 &ct.value) != Success)
2756 {
2757 ct.value = 0;
2758 goto bailout;
2759 }
2760
2761 if (ct.encoding == None)
2762 goto bailout;
2763
2764 if (bytes_after)
2765 {
2766 // fetch and append remaining data
2767 XTextProperty ct2;
2768
2769 if (XGetWindowProperty (dpy, win, prop,
2770 ct.nitems / 4, (bytes_after + 3) / 4,
2771 delete_prop, AnyPropertyType,
2772 &ct2.encoding, &ct2.format,
2773 &ct2.nitems, &bytes_after,
2774 &ct2.value) != Success)
2775 goto bailout;
2776
2777 // realloc should be compatible to XFree, here, and elsewhere, too
2778 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2779 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2780 ct.nitems += ct2.nitems;
2781
2782 XFree (ct2.value);
2783 }
2784
2785 if (ct.value == 0)
2786 goto bailout;
2787
2788 if (ct.encoding == xa[XA_INCR])
2789 {
2790 // INCR selection, start handshake
2791 if (!delete_prop)
2792 XDeleteProperty (dpy, win, prop);
2793
2794 selection_wait = Sel_incr;
2795 incr_buf_fill = 0;
2796 incr_ev.start (10);
2797
2798 goto bailout;
2799 }
2800
2801 if (ct.nitems == 0)
2802 {
2803 if (selection_wait == Sel_incr)
2804 {
2805 XFree (ct.value);
2806
2807 // finally complete, now paste the whole thing
2808 selection_wait = Sel_normal;
2809 ct.value = (unsigned char *)incr_buf;
2810 ct.nitems = incr_buf_fill;
2811 incr_buf = 0;
2812 incr_buf_size = 0;
2813 incr_ev.stop ();
2814 }
2815 else
2816 {
2817 if (selection_wait == Sel_normal
2818 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2819 {
2820 /*
2821 * pass through again trying CUT_BUFFER0 if we've come from
2822 * XConvertSelection () but nothing was presented
2823 */
2824 selection_paste (display->root, XA_CUT_BUFFER0, False);
2825 }
2826
2827 goto bailout;
2828 }
2829 }
2830 else if (selection_wait == Sel_incr)
2831 {
2832 incr_ev.start (10);
2833
2834 while (incr_buf_fill + ct.nitems > incr_buf_size)
2835 {
2836 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2837 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2838 }
2839
2840 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2841 incr_buf_fill += ct.nitems;
2842
2843 goto bailout;
2844 }
2845
2846 char **cl;
2847 int cr;
2848
2849#if !ENABLE_MINIMAL
2850 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2851 // so recode it manually
2852 if (ct.encoding == xa[XA_UTF8_STRING])
2853 {
2854 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2855 char *s = rxvt_wcstombs (w);
2856 free (w);
2857 // TODO: strlen == only the first element will be converted. well...
2858 paste (s, strlen (s));
2859 free (s);
2860 }
2861 else
2862#endif
2863 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2864 && cl)
2865 {
2866 for (int i = 0; i < cr; i++)
2867 paste (cl[i], strlen (cl[i]));
2868
2869 XFreeStringList (cl);
2870 }
2871 else
2872 paste ((char *)ct.value, ct.nitems); // paste raw
2873
2874bailout:
2875 XFree (ct.value);
2876
2877 if (selection_wait == Sel_normal)
2878 selection_wait = Sel_none;
2879}
2880
2881void
2882rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2883{
2884 selection_wait = Sel_none;
2885
2886 incr_buf_size = 0;
2887 free (incr_buf);
2888
2889 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2890}
2891
2892void
2893rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2894{
2895 if (prop == None || selection_wait != Sel_incr)
2896 return;
2897
2898 selection_paste (win, prop, true);
2899}
2900
2901/* ------------------------------------------------------------------------- */
2902/*
2903 * Request the current selection:
2904 * Order: > internal selection if available
2905 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2906 * > CUT_BUFFER0
2907 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2908 * will auto fallback to CUT_BUFFER0
2909 * EXT: button 2 release 2732 * EXT: button 2 release
2910 */ 2733 */
2911void 2734void
2912rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2913{ 2736{
2914 if (selection.text && selnum == Sel_Primary) 2737 if (!selection_req)
2915 {
2916 /* internal selection */
2917 char *str = rxvt_wcstombs (selection.text, selection.len);
2918 paste (str, strlen (str));
2919 free (str);
2920 return;
2921 } 2738 {
2922 else 2739 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2740 selection_req->run ();
2923 { 2741 }
2924 selection_request_time = tm;
2925 selection_wait = Sel_normal;
2926
2927#if X_HAVE_UTF8_STRING
2928 selection_type = Sel_UTF8String;
2929 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2930 return;
2931#else
2932 selection_type = Sel_CompoundText;
2933 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2934 return;
2935#endif
2936 }
2937
2938 selection_wait = Sel_none; /* don't loop in selection_paste () */
2939 selection_paste (display->root, XA_CUT_BUFFER0, false);
2940}
2941
2942int
2943rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2944{
2945 Atom sel;
2946
2947 selection_type |= selnum;
2948
2949 if (selnum == Sel_Primary)
2950 sel = XA_PRIMARY;
2951 else if (selnum == Sel_Secondary)
2952 sel = XA_SECONDARY;
2953 else
2954 sel = xa[XA_CLIPBOARD];
2955
2956 if (XGetSelectionOwner (dpy, sel) != None)
2957 {
2958 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2959 vt, selection_request_time);
2960 return 1;
2961 }
2962
2963 return 0;
2964} 2742}
2965 2743
2966/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2967/* 2745/*
2968 * Clear all selected text 2746 * Clear all selected text
… …
2999 * EXT: button 1 or 3 release 2777 * EXT: button 1 or 3 release
3000 */ 2778 */
3001void 2779void
3002rxvt_term::selection_make (Time tm) 2780rxvt_term::selection_make (Time tm)
3003{ 2781{
3004 int i; 2782 int size;
3005 wchar_t *new_selection_text; 2783 wchar_t *new_selection_text;
3006 text_t *t; 2784 text_t *t;
3007 2785
3008 switch (selection.op) 2786 switch (selection.op)
3009 { 2787 {
… …
3025 return; /* nothing selected, go away */ 2803 return; /* nothing selected, go away */
3026 2804
3027 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2805 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3028 return; 2806 return;
3029 2807
3030 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2808 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3031 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2809 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3032 2810
3033 int ofs = 0; 2811 int ofs = 0;
3034 int extra = 0; 2812 int extra = 0;
3035 2813
3036 int col = selection.beg.col; 2814 int col = selection.beg.col;
… …
3042 { 2820 {
3043#if !ENABLE_MINIMAL 2821#if !ENABLE_MINIMAL
3044 if (selection.rect) 2822 if (selection.rect)
3045 { 2823 {
3046 col = selection.beg.col; 2824 col = selection.beg.col;
3047 end_col = ncol + 1; 2825 end_col = selection.end.col;
3048 } 2826 }
3049 else 2827 else
3050#endif 2828#endif
3051 end_col = ROW(row).l; 2829 end_col = ROW(row).l;
3052 2830
3053 col = max (col, 0); 2831 col = max (col, 0);
3054 2832
3055 if (row == selection.end.row 2833 if (row == selection.end.row)
3056#if !ENABLE_MINIMAL
3057 || selection.rect
3058#endif
3059 )
3060 min_it (end_col, selection.end.col); 2834 min_it (end_col, selection.end.col);
3061 2835
3062 t = ROW(row).t + col; 2836 t = ROW(row).t + col;
3063 2837
3064 for (; col < end_col; col++) 2838 for (; col < end_col; col++)
… …
3072 2846
3073 extra -= (len - 1); 2847 extra -= (len - 1);
3074 2848
3075 if (extra < 0) 2849 if (extra < 0)
3076 { 2850 {
3077 extra += i; 2851 extra += size;
3078 i += i; 2852 size += size;
3079 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3080 } 2854 }
3081 2855
3082 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3083 } 2857 }
3084#endif 2858#endif
… …
3096 2870
3097 new_selection_text[ofs++] = C0_LF; 2871 new_selection_text[ofs++] = C0_LF;
3098 } 2872 }
3099 else 2873 else
3100#endif 2874#endif
3101 if (!ROW(row).is_longer () && row != selection.end.row) 2875 if (!ROW(row).is_longer ()
2876 && (row != selection.end.row || end_col != selection.end.col)
2877 && (row != selection.beg.row || selection.beg.col < ncol))
3102 new_selection_text[ofs++] = C0_LF; 2878 new_selection_text[ofs++] = C0_LF;
3103 } 2879 }
3104
3105 if (end_col != selection.end.col)
3106 new_selection_text[ofs++] = C0_LF;
3107 2880
3108 new_selection_text[ofs] = 0; 2881 new_selection_text[ofs] = 0;
3109 2882
3110 if (ofs == 0) 2883 if (ofs == 0)
3111 { 2884 {
… …
3167/* ------------------------------------------------------------------------- */ 2940/* ------------------------------------------------------------------------- */
3168/* 2941/*
3169 * Mark or select text based upon number of clicks: 1, 2, or 3 2942 * Mark or select text based upon number of clicks: 1, 2, or 3
3170 * EXT: button 1 press 2943 * EXT: button 1 press
3171 */ 2944 */
3172void 2945void ecb_cold
3173rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2946rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3174{ 2947{
3175 clicks = ((clicks - 1) % 3) + 1; 2948 clicks = ((clicks - 1) % 3) + 1;
3176 selection.clicks = clicks; /* save clicks so extend will work */ 2949 selection.clicks = clicks; /* save clicks so extend will work */
3177 2950
… …
3196 2969
3197/* ------------------------------------------------------------------------- */ 2970/* ------------------------------------------------------------------------- */
3198/* 2971/*
3199 * Mark a selection at the specified col/row 2972 * Mark a selection at the specified col/row
3200 */ 2973 */
3201void 2974void ecb_cold
3202rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2975rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3203{ 2976{
3204 want_refresh = 1; 2977 want_refresh = 1;
3205 2978
3206 selection.mark.row = row + view_start; 2979 selection.mark.row = row + view_start;
… …
3229 * Word select: select text for 2 clicks 3002 * Word select: select text for 2 clicks
3230 * We now only find out the boundary in one direction 3003 * We now only find out the boundary in one direction
3231 */ 3004 */
3232 3005
3233/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3006/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3234#define DELIMIT_TEXT(x) \ 3007#define DELIMIT_TEXT(x) \
3235 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3236#define DELIMIT_REND(x) 1 3009#define DELIMIT_REND(x) 1
3237 3010
3238void 3011void ecb_cold
3239rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3240{ 3013{
3241 int col, row, dirnadd, tcol, trow, w1, w2; 3014 int col, row, dirnadd, tcol, trow, w1, w2;
3242 row_col_t bound; 3015 row_col_t bound;
3243 text_t *stp; 3016 text_t *stp;
… …
3317 * EXT: button 3 press; button 1 or 3 drag 3090 * EXT: button 3 press; button 1 or 3 drag
3318 * flag == 0 ==> button 1 3091 * flag == 0 ==> button 1
3319 * flag == 1 ==> button 3 press 3092 * flag == 1 ==> button 3 press
3320 * flag == 2 ==> button 3 motion 3093 * flag == 2 ==> button 3 motion
3321 */ 3094 */
3322void 3095void ecb_cold
3323rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3096rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3324{ 3097{
3325 int col = clamp (Pixel2Col (x), 0, ncol); 3098 int col = clamp (Pixel2Col (x), 0, ncol);
3326 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3099 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3327 3100
… …
3353 3126
3354/* ------------------------------------------------------------------------- */ 3127/* ------------------------------------------------------------------------- */
3355/* 3128/*
3356 * Extend the selection to the specified col/row 3129 * Extend the selection to the specified col/row
3357 */ 3130 */
3358void 3131void ecb_cold
3359rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3132rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3360{ 3133{
3361 row_col_t pos; 3134 row_col_t pos;
3362 enum { 3135 enum {
3363 LEFT, RIGHT 3136 LEFT, RIGHT
3364 } closeto = RIGHT; 3137 } closeto = RIGHT;
3365
3366 want_refresh = 1;
3367 3138
3368 switch (selection.op) 3139 switch (selection.op)
3369 { 3140 {
3370 case SELECTION_INIT: 3141 case SELECTION_INIT:
3371 CLEAR_SELECTION (); 3142 CLEAR_SELECTION ();
… …
3551 3322
3552#if !ENABLE_MINIMAL 3323#if !ENABLE_MINIMAL
3553 if (selection.rect && selection.beg.col > selection.end.col) 3324 if (selection.rect && selection.beg.col > selection.end.col)
3554 ::swap (selection.beg.col, selection.end.col); 3325 ::swap (selection.beg.col, selection.end.col);
3555#endif 3326#endif
3327
3328 selection_changed ();
3556} 3329}
3557 3330
3558#if !ENABLE_MINIMAL 3331#if !ENABLE_MINIMAL
3559void 3332void ecb_cold
3560rxvt_term::selection_remove_trailing_spaces () NOTHROW 3333rxvt_term::selection_remove_trailing_spaces () NOTHROW
3561{ 3334{
3562 int32_t end_col, end_row; 3335 int32_t end_col, end_row;
3563 text_t *stp; 3336 text_t *stp;
3564 3337
… …
3602/* ------------------------------------------------------------------------- */ 3375/* ------------------------------------------------------------------------- */
3603/* 3376/*
3604 * Double click on button 3 when already selected 3377 * Double click on button 3 when already selected
3605 * EXT: button 3 double click 3378 * EXT: button 3 double click
3606 */ 3379 */
3607void 3380void ecb_cold
3608rxvt_term::selection_rotate (int x, int y) NOTHROW 3381rxvt_term::selection_rotate (int x, int y) NOTHROW
3609{ 3382{
3610 selection.clicks = selection.clicks % 3 + 1; 3383 selection.clicks = selection.clicks % 3 + 1;
3611 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3612} 3385}
… …
3614/* ------------------------------------------------------------------------- */ 3387/* ------------------------------------------------------------------------- */
3615/* 3388/*
3616 * Respond to a request for our current selection 3389 * Respond to a request for our current selection
3617 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3618 */ 3391 */
3619void 3392void ecb_cold
3620rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3621{ 3394{
3395 Atom property = rq.property == None ? rq.target : rq.property;
3622 XSelectionEvent ev; 3396 XSelectionEvent ev;
3623 3397
3624 ev.type = SelectionNotify; 3398 ev.type = SelectionNotify;
3625 ev.property = None; 3399 ev.property = None;
3626 ev.display = rq.display; 3400 ev.display = rq.display;
… …
3641 *target++ = xa[XA_COMPOUND_TEXT]; 3415 *target++ = xa[XA_COMPOUND_TEXT];
3642#if X_HAVE_UTF8_STRING 3416#if X_HAVE_UTF8_STRING
3643 *target++ = xa[XA_UTF8_STRING]; 3417 *target++ = xa[XA_UTF8_STRING];
3644#endif 3418#endif
3645 3419
3646 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3420 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3647 32, PropModeReplace, 3421 32, PropModeReplace,
3648 (unsigned char *)target_list, target - target_list); 3422 (unsigned char *)target_list, target - target_list);
3649 ev.property = rq.property; 3423 ev.property = property;
3650 } 3424 }
3651#if TODO // TODO 3425#if TODO // TODO
3652 else if (rq.target == xa[XA_MULTIPLE]) 3426 else if (rq.target == xa[XA_MULTIPLE])
3653 { 3427 {
3654 /* TODO: Handle MULTIPLE */ 3428 /* TODO: Handle MULTIPLE */
3655 } 3429 }
3656#endif 3430#endif
3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3431 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3658 { 3432 {
3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3433 XChangeProperty (dpy, rq.requestor, property, rq.target,
3660 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3434 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property; 3435 ev.property = property;
3662 } 3436 }
3663 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3664 { 3438 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3440 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3667 ev.property = rq.property; 3441 ev.property = property;
3668 } 3442 }
3669 else if (rq.target == XA_STRING 3443 else if (rq.target == XA_STRING
3670 || rq.target == xa[XA_TEXT] 3444 || rq.target == xa[XA_TEXT]
3671 || rq.target == xa[XA_COMPOUND_TEXT] 3445 || rq.target == xa[XA_COMPOUND_TEXT]
3672 || rq.target == xa[XA_UTF8_STRING] 3446 || rq.target == xa[XA_UTF8_STRING]
… …
3743 ct.value = (unsigned char *)cl; 3517 ct.value = (unsigned char *)cl;
3744 ct.nitems = selectlen; 3518 ct.nitems = selectlen;
3745 ct.encoding = target; 3519 ct.encoding = target;
3746 } 3520 }
3747 3521
3748 XChangeProperty (dpy, rq.requestor, rq.property, 3522 XChangeProperty (dpy, rq.requestor, property,
3749 ct.encoding, 8, PropModeReplace, 3523 ct.encoding, 8, PropModeReplace,
3750 ct.value, (int)ct.nitems); 3524 ct.value, (int)ct.nitems);
3751 ev.property = rq.property; 3525 ev.property = property;
3752 3526
3753 if (freect) 3527 if (freect)
3754 XFree (ct.value); 3528 XFree (ct.value);
3755 } 3529 }
3756 3530
3757 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3531 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3758} 3532}
3759 3533
3760/* ------------------------------------------------------------------------- */ 3534/* ------------------------------------------------------------------------- */
3761#ifdef USE_XIM 3535#if USE_XIM
3762void 3536void ecb_cold
3763rxvt_term::im_set_position (XPoint &pos) NOTHROW 3537rxvt_term::im_set_position (XPoint &pos) NOTHROW
3764{ 3538{
3765 XWindowAttributes xwa; 3539 XWindowAttributes xwa;
3766 3540
3767 XGetWindowAttributes (dpy, vt, &xwa); 3541 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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