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.358 by sf-exg, Tue Jan 4 18:22:11 2011 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a 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 ();
… …
159/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
160 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
161 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
162 158
163void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
164rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
165{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
166 view_start = 0; 200 view_start = 0;
167 num_scr = 0; 201 num_scr = 0;
168 202
169 if (ncol == 0) 203 if (ncol == 0)
170 ncol = 80; 204 ncol = 80;
… …
190 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
191 225
192 screen.tscroll = 0; 226 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
194 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
195 if (!row_buf) 239 if (!prev_row_buf)
196 { 240 {
197 /* 241 /*
198 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
199 */ 243 */
200 top_row = 0; 244 top_row = 0;
201 term_start = 0; 245 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 246
217 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
243 { 273 {
244 /* 274 /*
245 * add or delete rows as appropriate 275 * add or delete rows as appropriate
246 */ 276 */
247 277
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
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
265 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
266 { 279 {
267 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 }
270 282
271 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f;
272 { 290 }
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 291
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
283 295
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 303 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 304
293 do 305 do
294 { 306 {
295 p = MOD (p - 1, prev_total_rows); 307 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 308 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 309 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 310 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 311
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 312 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 313 {
302 p = MOD (p - 1, prev_total_rows); 314 p = MOD (p - 1, prev_total_rows);
303 315
304 plines++; 316 plines++;
305 llen += prev_ncol; 317 llen += prev_ncol;
… …
318 330
319 // re-assemble the full line by destination lines 331 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 332 for (int qrow = q; qlines--; qrow++)
321 { 333 {
322 qline = row_buf + qrow; 334 qline = row_buf + qrow;
323 lalloc (*qline); 335 qline->alloc (); // redundant with next line
324 qline->l = ncol; 336 qline->l = ncol;
325 qline->is_longer (1); 337 qline->is_longer (1);
326 338
327 int qcol = 0; 339 int qcol = 0;
328 340
… …
343 // this seems to upset applications/shells/readline 355 // this seems to upset applications/shells/readline
344 // least. 356 // least.
345 if (prow == ocur.row) 357 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 358 screen.cur.row = q - (total_rows - nrow);
347 359
348 line_t &pline = old_buf [prow]; 360 line_t &pline = prev_row_buf [prow];
349 361
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 362 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 363
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 364 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 365 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 386 {
375 // if no scrollback exists (yet), wing, instead of wrap 387 // if no scrollback exists (yet), wing, instead of wrap
376 388
377 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
378 { 390 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 392 line_t &dst = row_buf [row];
381 393
382 qline = pline; 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
383 lresize (qline); 395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = common_col;
384 } 399 }
385 400
386 for (int row = prev_nrow; row < nrow; row++) 401 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 402 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 403
391 term_start = 0; 404 term_start = 0;
392 } 405 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 406
398 clamp_it (screen.cur.row, 0, nrow - 1); 407 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 408 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 409 }
401 410
411 for (int row = nrow; row--; )
412 {
413 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
414 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
415 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
416 }
417
418 chunk_free (prev_chunk, prev_chunk_size);
419
402 free (tabs); 420 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 421 tabs = (char *)rxvt_malloc (ncol);
404 422
405 for (int col = ncol; --col; ) 423 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 424 tabs [col] = col % TABSIZE == 0;
407 425
408 CLEAR_ALL_SELECTION (); 426 CLEAR_ALL_SELECTION ();
409 427
410 prev_nrow = nrow; 428 prev_nrow = nrow;
… …
413 tt_winch (); 431 tt_winch ();
414 432
415 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 433 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416} 434}
417 435
418/* ------------------------------------------------------------------------- */ 436void ecb_cold
419/*
420 * Free everything. That way malloc debugging can find leakage.
421 */
422void
423rxvt_term::scr_release () NOTHROW 437rxvt_term::scr_release () NOTHROW
424{ 438{
425 if (row_buf) 439 chunk_free (chunk, chunk_size);
426 { 440 chunk = 0;
427 delete talloc; talloc = 0; 441 row_buf = 0;
428 delete ralloc; ralloc = 0;
429 442
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); 443 free (tabs);
436 tabs = 0; 444 tabs = 0;
437 }
438} 445}
439 446
440/* ------------------------------------------------------------------------- */ 447/* ------------------------------------------------------------------------- */
441/* 448/*
442 * Hard/Soft reset 449 * Hard/Soft reset
443 */ 450 */
444void 451void ecb_cold
445rxvt_term::scr_poweron () 452rxvt_term::scr_poweron ()
446{ 453{
447 scr_release (); 454 scr_release ();
455
448 prev_nrow = prev_ncol = 0; 456 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false; 457 rvideo_mode = false;
450 scr_soft_reset (); 458 scr_soft_reset ();
451 scr_reset (); 459 scr_reset ();
452 460
453 scr_clear (true); 461 scr_clear (true);
454 scr_refresh (); 462 scr_refresh ();
455} 463}
456 464
457void 465void ecb_cold
458rxvt_term::scr_soft_reset () 466rxvt_term::scr_soft_reset () NOTHROW
459{ 467{
460 /* only affects modes, nothing drastic such as clearing the screen */ 468 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY 469#if ENABLE_OVERLAY
462 scr_overlay_off (); 470 scr_overlay_off ();
463#endif 471#endif
… …
518 assert (s->cur.row >= 0); 526 assert (s->cur.row >= 0);
519 assert (s->cur.col >= 0); 527 assert (s->cur.col >= 0);
520} 528}
521 529
522void 530void
523rxvt_term::scr_swap_screen () 531rxvt_term::scr_swap_screen () NOTHROW
524{ 532{
525 if (!option (Opt_secondaryScreen)) 533 if (!option (Opt_secondaryScreen))
526 return; 534 return;
527 535
528 for (int i = prev_nrow; i--; ) 536 for (int i = prev_nrow; i--; )
… …
547 return; 555 return;
548 556
549 want_refresh = 1; 557 want_refresh = 1;
550 view_start = 0; 558 view_start = 0;
551 559
552 selection_check (2); /* check for boundary cross */ 560 /* check for boundary cross */
561 row_col_t pos;
562 pos.row = pos.col = 0;
563 if (ROWCOL_IS_BEFORE (selection.beg, pos)
564 && ROWCOL_IS_AFTER (selection.end, pos))
565 CLEAR_SELECTION ();
553 566
554 current_screen = scrn; 567 current_screen = scrn;
555 568
556#if NSCREENS 569#if NSCREENS
557 if (option (Opt_secondaryScreen)) 570 if (option (Opt_secondaryScreen))
… …
623/* 636/*
624 * Scroll text between <row1> and <row2> inclusive, by <count> lines 637 * Scroll text between <row1> and <row2> inclusive, by <count> lines
625 * count positive ==> scroll up 638 * count positive ==> scroll up
626 * count negative ==> scroll down 639 * count negative ==> scroll down
627 */ 640 */
628int 641int ecb_hot
629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 642rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630{ 643{
631 if (count == 0 || (row1 > row2)) 644 if (count == 0 || (row1 > row2))
632 return 0; 645 return 0;
633 646
… …
636 649
637 if (count > 0 650 if (count > 0
638 && row1 == 0 651 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 652 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 653 {
654 min_it (count, total_rows - (nrow - (row2 + 1)));
655
641 top_row = max (top_row - count, -saveLines); 656 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 657
646 // sever bottommost line 658 // sever bottommost line
647 { 659 {
648 line_t &l = ROW(row2 - count); 660 line_t &l = ROW(row2);
649 l.is_longer (0); 661 l.is_longer (0);
650 l.touch (); 662 l.touch ();
651 } 663 }
652 664
665 // scroll everything up 'count' lines
666 term_start = (term_start + count) % total_rows;
667
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
653 // erase newly scrolled-in lines 680 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 681 for (int i = count; i--; )
655 { 682 {
656 line_t &l = ROW(nrow - 1 - i); 683 line_t &l = ROW(row2 - i);
657 684
658 // optimize if already cleared, can be significant on slow machines 685 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 686 // 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))) 687 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 688 {
662 scr_blank_line (l, 0, l.l, rstyle); 689 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 690 l.l = 0;
… …
665 } 692 }
666 else 693 else
667 scr_blank_screen_mem (l, rstyle); 694 scr_blank_screen_mem (l, rstyle);
668 } 695 }
669 696
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 697 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 698 if (selection.op && current_screen == selection.screen
699 && selection.beg.row <= row2)
684 { 700 {
685 selection.beg.row -= count; 701 selection.beg.row -= count;
686 selection.end.row -= count; 702 selection.end.row -= count;
687 selection.mark.row -= count; 703 selection.mark.row -= count;
688 704
689 if (selection.beg.row < top_row 705 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 } 706 }
697 707
698 // finally move the view window, if desired 708 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 709 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 710 && view_start != 0
… …
730 } 740 }
731 741
732 // use a simple and robust scrolling algorithm, this 742 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 743 // part of scr_scroll_text is not time-critical.
734 744
745 // sever line above scroll region
746 if (row1)
747 {
748 line_t &l = ROW(row1 - 1);
749 l.is_longer (0);
750 l.touch ();
751 }
752
735 int rows = row2 - row1 + 1; 753 int rows = row2 - row1 + 1;
736 754
737 min_it (count, rows); 755 min_it (count, rows);
738 756
739 line_t *temp_buf = row_buf + total_rows; 757 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 758
741 for (int row = 0; row < rows; row++) 759 for (int row = 0; row < rows; row++)
742 { 760 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 761 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 762
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 764 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 765 }
748 766
749 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 768 ROW(row1 + row) = temp_buf [row];
769
770 // sever bottommost line
771 {
772 line_t &l = ROW(row2);
773 l.is_longer (0);
774 l.touch ();
775 }
751 } 776 }
752 777
753 return count; 778 return count;
754} 779}
755 780
756/* ------------------------------------------------------------------------- */ 781/* ------------------------------------------------------------------------- */
757/* 782/*
758 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
759 */ 784 */
760void 785void ecb_hot
761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 786rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762{ 787{
763 if (len <= 0) /* sanity */ 788 if (len <= 0) /* sanity */
764 return; 789 return;
765 790
766 unsigned char checksel; 791 bool checksel;
767 unicode_t c; 792 unicode_t c;
768 int ncol = this->ncol; 793 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 794 const wchar_t *strend = str + len;
770 795
771 want_refresh = 1; 796 want_refresh = 1;
… …
797 822
798 while (str < strend) 823 while (str < strend)
799 { 824 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 825 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 826
802 if (expect_false (c < 0x20)) 827 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 828 if (c == C0_LF)
804 { 829 {
805 max_it (line->l, screen.cur.col); 830 max_it (line->l, screen.cur.col);
806 831
807 screen.flags &= ~Screen_WrapNext; 832 screen.flags &= ~Screen_WrapNext;
… …
826 { 851 {
827 scr_tab (1, true); 852 scr_tab (1, true);
828 continue; 853 continue;
829 } 854 }
830 855
831 if (expect_false ( 856 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 857 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 860 ))
836 { 861 {
… …
841 * should be a similar check. 866 * should be a similar check.
842 */ 867 */
843 CLEAR_SELECTION (); 868 CLEAR_SELECTION ();
844 } 869 }
845 870
846 if (expect_false (screen.flags & Screen_WrapNext)) 871 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 872 {
848 scr_do_wrap (); 873 scr_do_wrap ();
849 874
850 line->l = ncol; 875 line->l = ncol;
851 line->is_longer (1); 876 line->is_longer (1);
… …
853 row = screen.cur.row; 878 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 879 line = &ROW(row); /* _must_ refresh */
855 } 880 }
856 881
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 882 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 883 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 884 c = 0xfffd;
860 885
861 // rely on wcwidth to tell us the character width, do wcwidth before 886 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 887 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 888 // drawing characters below as they might be invalid in the current
864 // locale. 889 // locale.
865 int width = WCWIDTH (c); 890 int width = WCWIDTH (c);
866 891
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 892 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 893 {
869 // vt100 special graphics and line drawing 894 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 895 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 896 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 897 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 c = vt100_0[c - 0x41]; 910 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 911 width = 1; // vt100 line drawing characters are always single-width
887 } 912 }
888 } 913 }
889 914
890 if (expect_false (screen.flags & Screen_Insert)) 915 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 916 scr_insdel_chars (width, INSERT);
892 917
893 if (width != 0) 918 if (width != 0)
894 { 919 {
895#if !UNICODE_3 920#if !UNICODE_3
… …
903#endif 928#endif
904 929
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 930 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 931
907 // if the character doesn't fit into the remaining columns... 932 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 933 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 934 {
910 if (screen.flags & Screen_Autowrap) 935 if (screen.flags & Screen_Autowrap)
911 { 936 {
912 // ... artificially enlargen the previous one 937 // ... artificially enlargen the previous one
913 c = NOCHAR; 938 c = NOCHAR;
… …
920 945
921 // nuke the character at this position, if required 946 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop 947 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 948 // we never have to check for overwriting a wide char itself,
924 // only its tail. 949 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 950 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 951 scr_kill_char (*line, screen.cur.col);
927 952
928 line->touch (); 953 line->touch ();
929 954
930 do 955 do
931 { 956 {
932 line->t[screen.cur.col] = c; 957 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 958 line->r[screen.cur.col] = rend;
934 959
935 if (expect_true (screen.cur.col < ncol - 1)) 960 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 961 screen.cur.col++;
937 else 962 else
938 { 963 {
939 line->l = ncol; 964 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 965 if (screen.flags & Screen_Autowrap)
… …
943 goto end_of_line; 968 goto end_of_line;
944 } 969 }
945 970
946 c = NOCHAR; 971 c = NOCHAR;
947 } 972 }
948 while (expect_false (--width > 0)); 973 while (ecb_unlikely (--width > 0));
949 974
950 // pad with spaces when overwriting wide character with smaller one 975 // pad with spaces when overwriting wide character with smaller one
951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 976 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952 { 977 {
953 line->t[c] = ' '; 978 line->t[c] = ' ';
954 line->r[c] = rend; 979 line->r[c] = rend;
955 } 980 }
956 981
… …
1115 * XTERM_SEQ: ESC 6 1140 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1141 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1142 * in that row right. Clear left column.
1118 */ 1143 */
1119#if !ENABLE_MINIMAL 1144#if !ENABLE_MINIMAL
1120void 1145void ecb_cold
1121rxvt_term::scr_backindex () NOTHROW 1146rxvt_term::scr_backindex () NOTHROW
1122{ 1147{
1123 if (screen.cur.col > 0) 1148 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1149 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125 else 1150 else
… …
1132 * XTERM_SEQ: ESC 9 1157 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1158 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1159 * in that row left. Clear right column.
1135 */ 1160 */
1136#if !ENABLE_MINIMAL 1161#if !ENABLE_MINIMAL
1137void 1162void ecb_cold
1138rxvt_term::scr_forwardindex () NOTHROW 1163rxvt_term::scr_forwardindex () NOTHROW
1139{ 1164{
1140 if (screen.cur.col < ncol - 1) 1165 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1166 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142 else 1167 else
… …
1293 scr_blank_line (line, col, num, rstyle); 1318 scr_blank_line (line, col, num, rstyle);
1294} 1319}
1295 1320
1296/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
1297/* 1322/*
1298 * Erase part of whole of the screen 1323 * Erase part or whole of the screen
1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1324 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1325 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1326 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302 */ 1327 */
1303void 1328void
… …
1312 ZERO_SCROLLBACK (); 1337 ZERO_SCROLLBACK ();
1313 1338
1314 switch (mode) 1339 switch (mode)
1315 { 1340 {
1316 case 0: /* erase to end of screen */ 1341 case 0: /* erase to end of screen */
1317 selection_check (1);
1318 scr_erase_line (0); 1342 scr_erase_line (0);
1319 row = screen.cur.row + 1; /* possible OOB */ 1343 row = screen.cur.row + 1; /* possible OOB */
1320 num = nrow - row; 1344 num = nrow - row;
1321 break; 1345 break;
1322 case 1: /* erase to beginning of screen */ 1346 case 1: /* erase to beginning of screen */
1323 selection_check (3);
1324 scr_erase_line (1); 1347 scr_erase_line (1);
1325 row = 0; 1348 row = 0;
1326 num = screen.cur.row; 1349 num = screen.cur.row;
1327 break; 1350 break;
1328 case 2: /* erase whole screen */ 1351 case 2: /* erase whole screen */
1329 selection_check (3);
1330 row = 0; 1352 row = 0;
1331 num = nrow; 1353 num = nrow;
1332 break; 1354 break;
1333 default: 1355 default:
1334 return; 1356 return;
… …
1351 { 1373 {
1352 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1353 1375
1354 if (mapped) 1376 if (mapped)
1355 XClearArea (dpy, vt, 0, 1377 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1378 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1379 (unsigned int)Height2Pixel (num), False);
1358 } 1380 }
1359 else 1381 else
1360 { 1382 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1383 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1364 { 1386 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1387 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1389 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1390 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1391 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1392 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 } 1395 }
1374 } 1396 }
… …
1396/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1397/* 1419/*
1398 * Fill the screen with `E's 1420 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1422 */
1401void 1423void ecb_cold
1402rxvt_term::scr_E () NOTHROW 1424rxvt_term::scr_E () NOTHROW
1403{ 1425{
1404 rend_t fs; 1426 rend_t fs;
1405 1427
1406 want_refresh = 1; 1428 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1429 ZERO_SCROLLBACK ();
1408 1430
1409 num_scr_allow = 0; 1431 num_scr_allow = 0;
1410 selection_check (3); 1432
1433 row_col_t pos;
1434 pos.row = pos.col = 0;
1435 if (ROWCOL_IS_AFTER (selection.end, pos))
1436 CLEAR_SELECTION ();
1411 1437
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1438 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (int row = nrow; row--; ) 1439 for (int row = nrow; row--; )
1414 { 1440 {
1415 line_t &line = ROW(row); 1441 line_t &line = ROW(row);
… …
1566/* ------------------------------------------------------------------------- */ 1592/* ------------------------------------------------------------------------- */
1567/* 1593/*
1568 * Set the scrolling region 1594 * Set the scrolling region
1569 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1595 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570 */ 1596 */
1571void 1597void ecb_cold
1572rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1598rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1573{ 1599{
1574 max_it (top, 0); 1600 max_it (top, 0);
1575 min_it (bot, nrow - 1); 1601 min_it (bot, nrow - 1);
1576 1602
… …
1586/* 1612/*
1587 * Make the cursor visible/invisible 1613 * Make the cursor visible/invisible
1588 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1614 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1615 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590 */ 1616 */
1591void 1617void ecb_cold
1592rxvt_term::scr_cursor_visible (int mode) NOTHROW 1618rxvt_term::scr_cursor_visible (int mode) NOTHROW
1593{ 1619{
1594 want_refresh = 1; 1620 want_refresh = 1;
1595 1621
1596 if (mode) 1622 if (mode)
… …
1603/* 1629/*
1604 * Set/unset automatic wrapping 1630 * Set/unset automatic wrapping
1605 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1631 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1632 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607 */ 1633 */
1608void 1634void ecb_cold
1609rxvt_term::scr_autowrap (int mode) NOTHROW 1635rxvt_term::scr_autowrap (int mode) NOTHROW
1610{ 1636{
1611 if (mode) 1637 if (mode)
1612 screen.flags |= Screen_Autowrap; 1638 screen.flags |= Screen_Autowrap;
1613 else 1639 else
… …
1622 * Relative mode: line numbers are relative to top margin of scrolling region 1648 * Relative mode: line numbers are relative to top margin of scrolling region
1623 * and the cursor cannot be moved outside. 1649 * and the cursor cannot be moved outside.
1624 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1650 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1651 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626 */ 1652 */
1627void 1653void ecb_cold
1628rxvt_term::scr_relative_origin (int mode) NOTHROW 1654rxvt_term::scr_relative_origin (int mode) NOTHROW
1629{ 1655{
1630 if (mode) 1656 if (mode)
1631 screen.flags |= Screen_Relative; 1657 screen.flags |= Screen_Relative;
1632 else 1658 else
… …
1639/* 1665/*
1640 * Set insert/replace mode 1666 * Set insert/replace mode
1641 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1667 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1668 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643 */ 1669 */
1644void 1670void ecb_cold
1645rxvt_term::scr_insert_mode (int mode) NOTHROW 1671rxvt_term::scr_insert_mode (int mode) NOTHROW
1646{ 1672{
1647 if (mode) 1673 if (mode)
1648 screen.flags |= Screen_Insert; 1674 screen.flags |= Screen_Insert;
1649 else 1675 else
… …
1655 * Set/Unset tabs 1681 * Set/Unset tabs
1656 * XTERM_SEQ: Set tab at current column : ESC H 1682 * XTERM_SEQ: Set tab at current column : ESC H
1657 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1683 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1684 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659 */ 1685 */
1660void 1686void ecb_cold
1661rxvt_term::scr_set_tab (int mode) NOTHROW 1687rxvt_term::scr_set_tab (int mode) NOTHROW
1662{ 1688{
1663 if (mode < 0) 1689 if (mode < 0)
1664 memset (tabs, 0, ncol); 1690 memset (tabs, 0, ncol);
1665 else if (screen.cur.col < ncol) 1691 else if (screen.cur.col < ncol)
… …
1684 if (rvideo_state != on) 1710 if (rvideo_state != on)
1685 { 1711 {
1686 rvideo_state = on; 1712 rvideo_state = on;
1687 1713
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1714 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1715#ifdef HAVE_IMG
1690 if (bgPixmap.pixmap == None) 1716 if (bg_img == 0)
1691#endif 1717#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1718 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1719
1694 XGCValues gcvalue; 1720 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1721 gcvalue.foreground = pix_colors[Color_fg];
… …
1704/* ------------------------------------------------------------------------- */ 1730/* ------------------------------------------------------------------------- */
1705/* 1731/*
1706 * Report current cursor position 1732 * Report current cursor position
1707 * XTERM_SEQ: Report position: ESC [ 6 n 1733 * XTERM_SEQ: Report position: ESC [ 6 n
1708 */ 1734 */
1709void 1735void ecb_cold
1710rxvt_term::scr_report_position () NOTHROW 1736rxvt_term::scr_report_position () NOTHROW
1711{ 1737{
1712 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1738 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1713} 1739}
1714 1740
… …
1717 * ------------------------------------------------------------------------- */ 1743 * ------------------------------------------------------------------------- */
1718 1744
1719/* 1745/*
1720 * Set font style 1746 * Set font style
1721 */ 1747 */
1722void 1748void ecb_cold
1723rxvt_term::set_font_style () NOTHROW 1749rxvt_term::set_font_style () NOTHROW
1724{ 1750{
1725#if 0 1751#if 0
1726 switch (charsets [screen.charset]) 1752 switch (charsets [screen.charset])
1727 { 1753 {
… …
1749 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1775 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1750 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1776 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1777 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1778 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1779 */
1754void 1780void ecb_cold
1755rxvt_term::scr_charset_choose (int set) NOTHROW 1781rxvt_term::scr_charset_choose (int set) NOTHROW
1756{ 1782{
1757 screen.charset = set; 1783 screen.charset = set;
1758 set_font_style (); 1784 set_font_style ();
1759} 1785}
… …
1780 * ------------------------------------------------------------------------- */ 1806 * ------------------------------------------------------------------------- */
1781 1807
1782/* 1808/*
1783 * refresh matching text. 1809 * refresh matching text.
1784 */ 1810 */
1785bool 1811bool ecb_cold
1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1812rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1787{ 1813{
1788 bool found = false; 1814 bool found = false;
1789 1815
1790 for (int i = 0; i < nrow; i++) 1816 for (int i = 0; i < nrow; i++)
… …
1809 PART_BEG = 0, 1835 PART_BEG = 0,
1810 PART_END, 1836 PART_END,
1811 RC_COUNT 1837 RC_COUNT
1812}; 1838};
1813 1839
1814void 1840void ecb_hot
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1841rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816{ 1842{
1817 int i; 1843 int i;
1818 row_col_t rc[RC_COUNT]; 1844 row_col_t rc[RC_COUNT];
1819 1845
… …
1856 * Refresh the entire screen 1882 * Refresh the entire screen
1857 */ 1883 */
1858void 1884void
1859rxvt_term::scr_touch (bool refresh) NOTHROW 1885rxvt_term::scr_touch (bool refresh) NOTHROW
1860{ 1886{
1861 scr_expose (0, 0, width, height, refresh); 1887 scr_expose (0, 0, vt_width, vt_height, refresh);
1862} 1888}
1863 1889
1864/* ------------------------------------------------------------------------- */ 1890/* ------------------------------------------------------------------------- */
1865/* 1891/*
1866 * Move the display so that the line represented by scrollbar value Y is at 1892 * Move the display so that the line represented by scrollbar value Y is at
… …
1922 1948
1923# ifndef NO_MAPALERT 1949# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1950# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1951 if (option (Opt_mapAlert))
1926# endif 1952# endif
1927 XMapWindow (dpy, parent[0]); 1953 XMapWindow (dpy, parent);
1928# endif 1954# endif
1929 1955
1930# if ENABLE_FRILLS 1956# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1957 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1958 set_urgency (1);
… …
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1971 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1972#endif
1947} 1973}
1948 1974
1949/* ------------------------------------------------------------------------- */ 1975/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1976void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1977rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1978{
1954#ifdef PRINTPIPE 1979#ifdef PRINTPIPE
1955 int nrows, row_start; 1980 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1981 FILE *fd = popen_printer ();
… …
2005/* 2030/*
2006 * Refresh the screen 2031 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2032 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2033 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2034 */
2010void 2035void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2036rxvt_term::scr_refresh () NOTHROW
2012{ 2037{
2013 int16_t col, row, /* column/row we're processing */ 2038 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2039 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2040 int i; /* tmp */
… …
2029 * A: set up vars 2054 * A: set up vars
2030 */ 2055 */
2031 refresh_count = 0; 2056 refresh_count = 0;
2032 2057
2033 unsigned int old_screen_flags = screen.flags; 2058 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2059 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2036 have_bg = bgPixmap.pixmap != None; 2061 have_bg = bg_img != 0;
2037#endif 2062#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2064
2040 /* 2065 /*
2041 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2070 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2071#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2072 scr_swap_overlay ();
2048#endif 2073#endif
2049 2074
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2075 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2076
2052 /* 2077 /*
2053 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2054 */ 2079 */
2055 { 2080 {
2056 unsigned char setoldcursor; 2081 bool setoldcursor;
2057 2082
2058#ifdef CURSOR_BLINK 2083#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2084 if (hidden_cursor)
2060 showcursor = 0; 2085 showcursor = 0;
2061#endif 2086#endif
… …
2148 { 2173 {
2149 int16_t nits; 2174 int16_t nits;
2150 int i = num_scr; 2175 int i = num_scr;
2151 int j; 2176 int j;
2152 int len, wlen; 2177 int len, wlen;
2153 dLocal (int, num_scr);
2154 2178
2155 j = nrow; 2179 j = nrow;
2156 wlen = len = -1; 2180 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2181 row = i > 0 ? 0 : j - 1;
2158 2182
… …
2233 continue; 2257 continue;
2234 2258
2235 // redraw one or more characters 2259 // redraw one or more characters
2236 2260
2237 // seek to the beginning of wide characters 2261 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2262 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2263 --col;
2240 2264
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2265 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2266 text_t *text = stp + col;
2243 int count = 1; 2267 int count = 1;
… …
2281 2305
2282 col--; /* went one too far. move back */ 2306 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2307 count -= i; /* dump any matching trailing chars */
2284 2308
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2309 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2310 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2311 count++, i--;
2288 2312
2289 /* 2313 /*
2290 * Determine the attributes for the string 2314 * Determine the attributes for the string
2291 */ 2315 */
2292 int fore = fgcolor_of (rend); // desired foreground 2316 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2317 int back = bgcolor_of (rend); // desired background
2294 2318
2295 // only do special processing if any attributes are set, which is unlikely 2319 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2320 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2321 {
2298 bool invert = rend & RS_RVid; 2322 bool invert = rend & RS_RVid;
2299 2323
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2325 if (rend & RS_Bold && fore == Color_fg)
… …
2390 /* 2414 /*
2391 * Actually do the drawing of the string here 2415 * Actually do the drawing of the string here
2392 */ 2416 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2417 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2418
2395 if (expect_true (have_bg && back == Color_bg)) 2419 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2420 {
2397 // this is very ugly, maybe push it into ->draw? 2421 // this is very ugly, maybe push it into ->draw?
2398 2422
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2423 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2424 if (text[i] != ' ')
… …
2407 did_clear: ; 2431 did_clear: ;
2408 } 2432 }
2409 else 2433 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2434 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2435
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2436 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2437 {
2414#if ENABLE_FRILLS 2438#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2439 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2440 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2441 else
… …
2463 2487
2464 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2489 Col2Pixel (col),
2466 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2493 }
2470 } 2494 }
2471 2495
2472 /* 2496 /*
2473 * H: cleanup selection 2497 * H: cleanup selection
… …
2482 screen.flags = old_screen_flags; 2506 screen.flags = old_screen_flags;
2483 num_scr = 0; 2507 num_scr = 0;
2484 num_scr_allow = 1; 2508 num_scr_allow = 1;
2485} 2509}
2486 2510
2487void 2511void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2513{
2490 if (!l.t) 2514 if (!l.valid ())
2491 return; 2515 return;
2492 2516
2493 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494 2518
2495 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2496 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497} 2521}
2498 2522
2499void 2523void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2501{ 2525{
2502 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2504 2528
… …
2507 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2509 } 2533 }
2510} 2534}
2511 2535
2512void 2536void ecb_cold
2513rxvt_term::scr_recolour () NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2538{
2515#ifdef HAVE_BG_PIXMAP 2539 bool transparent = false;
2516 bgPixmap.apply ();
2517#else
2518 2540
2541#ifdef HAVE_IMG
2542 if (bg_img != 0)
2543 {
2544# if ENABLE_TRANSPARENCY
2545 if (bg_flags & BG_IS_TRANSPARENT)
2546 {
2547 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2548 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2549
2550 transparent = true;
2551 }
2552 else
2553# endif
2554 {
2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2556 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2557 }
2558 }
2559 else
2560#endif
2561 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2520 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2563 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2564 }
2565
2566 XClearWindow (dpy, parent);
2522 2567
2523 if (scrollBar.win) 2568 if (scrollBar.win)
2524 { 2569 {
2570 if (transparent)
2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2572 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2526 scrollBar.state = STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2527 scrollBar.show (0); 2575 scrollBar.show (0);
2528 } 2576 }
2529 2577
2530#endif 2578 if (refresh)
2531 2579 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2580 scr_clear ();
2534 scr_touch (true); 2581 scr_touch (true);
2582 }
2535 want_refresh = 1; 2583 want_refresh = 1;
2536} 2584}
2537 2585
2538/* ------------------------------------------------------------------------- */ 2586/* ------------------------------------------------------------------------- */
2539void 2587void
… …
2596 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2597 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2598} 2646}
2599 2647
2600/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2601void 2649void ecb_hot
2602rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2603{ 2651{
2604 if (selection.op 2652 if (selection.op
2605 && current_screen == selection.screen 2653 && current_screen == selection.screen
2606 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
… …
2625 */ 2673 */
2626#if 0 2674#if 0
2627void 2675void
2628rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2629{ 2677{
2630 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2631 unsigned int width, towrite; 2679 // relevant code in scr_printscreen
2632 const char r1[] = "\n";
2633
2634 for (row = saveLines + top_row;
2635 row < saveLines + nrow - 1; row++)
2636 {
2637 width = row_buf[row].l >= 0 ? row_buf[row].l
2638 : ncol;
2639 for (towrite = width; towrite; towrite -= wrote)
2640 {
2641 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2642 towrite);
2643 if (wrote < 0)
2644 return; /* XXX: death, no report */
2645 }
2646 if (row_buf[row].l >= 0)
2647 if (write (fd, r1, 1) <= 0)
2648 return; /* XXX: death, no report */
2649 }
2650} 2680}
2651#endif 2681#endif
2652 2682
2653/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2654 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2655 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2656void 2686void
2657rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2658{ 2688{
2659 row_col_t pos;
2660
2661 if (!selection.op) 2689 if (!selection.op)
2662 return; 2690 return;
2663 2691
2664 pos.row = pos.col = 0;
2665 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2666 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2667 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2668 || (check_more == 1 2695 || (check_more == 1
2669 && current_screen == selection.screen 2696 && current_screen == selection.screen
2670 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2671 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2672 || (check_more == 2
2673 && ROWCOL_IS_BEFORE (selection.beg, pos)
2674 && ROWCOL_IS_AFTER (selection.end, pos))
2675 || (check_more == 3
2676 && ROWCOL_IS_AFTER (selection.end, pos))
2677 || (check_more == 4 /* screen width change */
2678 && (selection.beg.row != selection.end.row
2679 || selection.end.col > ncol)))
2680 CLEAR_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2681} 2700}
2682 2701
2683/* ------------------------------------------------------------------------- */ 2702/* ------------------------------------------------------------------------- */
2684/* 2703/*
2685 * Paste a selection direct to the command fd 2704 * Paste a selection direct to the command fd
… …
2691 for (unsigned int i = 0; i < len; i++) 2710 for (unsigned int i = 0; i < len; i++)
2692 if (data[i] == C0_LF) 2711 if (data[i] == C0_LF)
2693 data[i] = C0_CR; 2712 data[i] = C0_CR;
2694 2713
2695 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[200~"); 2715 tt_printf ("\x1b[200~");
2697 2716
2698 tt_write (data, len); 2717 tt_write (data, len);
2699 2718
2700 if (priv_modes & PrivMode_BracketPaste) 2719 if (priv_modes & PrivMode_BracketPaste)
2701 tt_printf ("\e[201~"); 2720 tt_printf ("\x1b[201~");
2702} 2721}
2703 2722
2704void 2723void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW 2724rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{ 2725{
… …
2710 tt_paste (data, len); 2729 tt_paste (data, len);
2711} 2730}
2712 2731
2713/* ------------------------------------------------------------------------- */ 2732/* ------------------------------------------------------------------------- */
2714/* 2733/*
2715 * Respond to a notification that a primary selection has been sent 2734 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2716 * EXT: SelectionNotify 2735 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2717 */ 2736 * as fallback
2718void
2719rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720{
2721 if (prop == None) /* check for failed XConvertSelection */
2722 {
2723 if ((selection_type & Sel_CompoundText))
2724 {
2725 int selnum = selection_type & Sel_whereMask;
2726
2727 selection_type = 0;
2728 if (selnum != Sel_direct)
2729 selection_request_other (XA_STRING, selnum);
2730 }
2731
2732 if ((selection_type & Sel_UTF8String))
2733 {
2734 int selnum = selection_type & Sel_whereMask;
2735
2736 selection_type = Sel_CompoundText;
2737 if (selnum != Sel_direct)
2738 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739 else
2740 selection_type = 0;
2741 }
2742
2743 return;
2744 }
2745
2746 unsigned long bytes_after;
2747 XTextProperty ct;
2748
2749 if (XGetWindowProperty (dpy, win, prop,
2750 0, PROP_SIZE / 4,
2751 delete_prop, AnyPropertyType,
2752 &ct.encoding, &ct.format,
2753 &ct.nitems, &bytes_after,
2754 &ct.value) != Success)
2755 {
2756 ct.value = 0;
2757 goto bailout;
2758 }
2759
2760 if (ct.encoding == None)
2761 goto bailout;
2762
2763 if (bytes_after)
2764 {
2765 // fetch and append remaining data
2766 XTextProperty ct2;
2767
2768 if (XGetWindowProperty (dpy, win, prop,
2769 ct.nitems / 4, (bytes_after + 3) / 4,
2770 delete_prop, AnyPropertyType,
2771 &ct2.encoding, &ct2.format,
2772 &ct2.nitems, &bytes_after,
2773 &ct2.value) != Success)
2774 goto bailout;
2775
2776 // realloc should be compatible to XFree, here, and elsewhere, too
2777 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779 ct.nitems += ct2.nitems;
2780
2781 XFree (ct2.value);
2782 }
2783
2784 if (ct.value == 0)
2785 goto bailout;
2786
2787 if (ct.encoding == xa[XA_INCR])
2788 {
2789 // INCR selection, start handshake
2790 if (!delete_prop)
2791 XDeleteProperty (dpy, win, prop);
2792
2793 selection_wait = Sel_incr;
2794 incr_buf_fill = 0;
2795 incr_ev.start (10);
2796
2797 goto bailout;
2798 }
2799
2800 if (ct.nitems == 0)
2801 {
2802 if (selection_wait == Sel_incr)
2803 {
2804 XFree (ct.value);
2805
2806 // finally complete, now paste the whole thing
2807 selection_wait = Sel_normal;
2808 ct.value = (unsigned char *)incr_buf;
2809 ct.nitems = incr_buf_fill;
2810 incr_buf = 0;
2811 incr_buf_size = 0;
2812 incr_ev.stop ();
2813 }
2814 else
2815 {
2816 if (selection_wait == Sel_normal
2817 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2818 {
2819 /*
2820 * pass through again trying CUT_BUFFER0 if we've come from
2821 * XConvertSelection () but nothing was presented
2822 */
2823 selection_paste (display->root, XA_CUT_BUFFER0, False);
2824 }
2825
2826 goto bailout;
2827 }
2828 }
2829 else if (selection_wait == Sel_incr)
2830 {
2831 incr_ev.start (10);
2832
2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2834 {
2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2837 }
2838
2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840 incr_buf_fill += ct.nitems;
2841
2842 goto bailout;
2843 }
2844
2845 char **cl;
2846 int cr;
2847
2848#if !ENABLE_MINIMAL
2849 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2850 // so recode it manually
2851 if (ct.encoding == xa[XA_UTF8_STRING])
2852 {
2853 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2854 char *s = rxvt_wcstombs (w);
2855 free (w);
2856 // TODO: strlen == only the first element will be converted. well...
2857 paste (s, strlen (s));
2858 free (s);
2859 }
2860 else
2861#endif
2862 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2863 && cl)
2864 {
2865 for (int i = 0; i < cr; i++)
2866 paste (cl[i], strlen (cl[i]));
2867
2868 XFreeStringList (cl);
2869 }
2870 else
2871 paste ((char *)ct.value, ct.nitems); // paste raw
2872
2873bailout:
2874 XFree (ct.value);
2875
2876 if (selection_wait == Sel_normal)
2877 selection_wait = Sel_none;
2878}
2879
2880void
2881rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2882{
2883 selection_wait = Sel_none;
2884
2885 incr_buf_size = 0;
2886 free (incr_buf);
2887
2888 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2889}
2890
2891void
2892rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2893{
2894 if (prop == None || selection_wait != Sel_incr)
2895 return;
2896
2897 selection_paste (win, prop, true);
2898}
2899
2900/* ------------------------------------------------------------------------- */
2901/*
2902 * Request the current selection:
2903 * Order: > internal selection if available
2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2905 * > CUT_BUFFER0
2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2907 * will auto fallback to CUT_BUFFER0
2908 * EXT: button 2 release 2737 * EXT: button 2 release
2909 */ 2738 */
2910void 2739void
2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2740rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2912{ 2741{
2913 if (selection.text && selnum == Sel_Primary) 2742 if (!selection_req)
2914 {
2915 /* internal selection */
2916 char *str = rxvt_wcstombs (selection.text, selection.len);
2917 paste (str, strlen (str));
2918 free (str);
2919 return;
2920 } 2743 {
2921 else 2744 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2745 selection_req->run ();
2922 { 2746 }
2923 selection_request_time = tm;
2924 selection_wait = Sel_normal;
2925
2926#if X_HAVE_UTF8_STRING
2927 selection_type = Sel_UTF8String;
2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2929 return;
2930#else
2931 selection_type = Sel_CompoundText;
2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2933 return;
2934#endif
2935 }
2936
2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
2939}
2940
2941int
2942rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2943{
2944 Atom sel;
2945
2946 selection_type |= selnum;
2947
2948 if (selnum == Sel_Primary)
2949 sel = XA_PRIMARY;
2950 else if (selnum == Sel_Secondary)
2951 sel = XA_SECONDARY;
2952 else
2953 sel = xa[XA_CLIPBOARD];
2954
2955 if (XGetSelectionOwner (dpy, sel) != None)
2956 {
2957 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2958 vt, selection_request_time);
2959 return 1;
2960 }
2961
2962 return 0;
2963} 2747}
2964 2748
2965/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2966/* 2750/*
2967 * Clear all selected text 2751 * Clear all selected text
… …
3041 { 2825 {
3042#if !ENABLE_MINIMAL 2826#if !ENABLE_MINIMAL
3043 if (selection.rect) 2827 if (selection.rect)
3044 { 2828 {
3045 col = selection.beg.col; 2829 col = selection.beg.col;
3046 end_col = ncol + 1; 2830 end_col = selection.end.col;
3047 } 2831 }
3048 else 2832 else
3049#endif 2833#endif
3050 end_col = ROW(row).l; 2834 end_col = ROW(row).l;
3051 2835
3052 col = max (col, 0); 2836 col = max (col, 0);
3053 2837
3054 if (row == selection.end.row 2838 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 2839 min_it (end_col, selection.end.col);
3060 2840
3061 t = ROW(row).t + col; 2841 t = ROW(row).t + col;
3062 2842
3063 for (; col < end_col; col++) 2843 for (; col < end_col; col++)
… …
3095 2875
3096 new_selection_text[ofs++] = C0_LF; 2876 new_selection_text[ofs++] = C0_LF;
3097 } 2877 }
3098 else 2878 else
3099#endif 2879#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row 2880 if (!ROW(row).is_longer ()
2881 && (row != selection.end.row || end_col != selection.end.col)
3101 && (row != selection.beg.row || selection.beg.col < ncol)) 2882 && (row != selection.beg.row || selection.beg.col < ncol))
3102 new_selection_text[ofs++] = C0_LF; 2883 new_selection_text[ofs++] = C0_LF;
3103 } 2884 }
3104
3105 if (end_col != selection.end.col)
3106 new_selection_text[ofs++] = C0_LF;
3107 2885
3108 new_selection_text[ofs] = 0; 2886 new_selection_text[ofs] = 0;
3109 2887
3110 if (ofs == 0) 2888 if (ofs == 0)
3111 { 2889 {
… …
3167/* ------------------------------------------------------------------------- */ 2945/* ------------------------------------------------------------------------- */
3168/* 2946/*
3169 * Mark or select text based upon number of clicks: 1, 2, or 3 2947 * Mark or select text based upon number of clicks: 1, 2, or 3
3170 * EXT: button 1 press 2948 * EXT: button 1 press
3171 */ 2949 */
3172void 2950void ecb_cold
3173rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2951rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3174{ 2952{
3175 clicks = ((clicks - 1) % 3) + 1; 2953 clicks = ((clicks - 1) % 3) + 1;
3176 selection.clicks = clicks; /* save clicks so extend will work */ 2954 selection.clicks = clicks; /* save clicks so extend will work */
3177 2955
… …
3196 2974
3197/* ------------------------------------------------------------------------- */ 2975/* ------------------------------------------------------------------------- */
3198/* 2976/*
3199 * Mark a selection at the specified col/row 2977 * Mark a selection at the specified col/row
3200 */ 2978 */
3201void 2979void ecb_cold
3202rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2980rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3203{ 2981{
3204 want_refresh = 1; 2982 want_refresh = 1;
3205 2983
3206 selection.mark.row = row + view_start; 2984 selection.mark.row = row + view_start;
… …
3233/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3011/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3234#define DELIMIT_TEXT(x) \ 3012#define DELIMIT_TEXT(x) \
3235 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3013 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3236#define DELIMIT_REND(x) 1 3014#define DELIMIT_REND(x) 1
3237 3015
3238void 3016void ecb_cold
3239rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3017rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3240{ 3018{
3241 int col, row, dirnadd, tcol, trow, w1, w2; 3019 int col, row, dirnadd, tcol, trow, w1, w2;
3242 row_col_t bound; 3020 row_col_t bound;
3243 text_t *stp; 3021 text_t *stp;
… …
3317 * EXT: button 3 press; button 1 or 3 drag 3095 * EXT: button 3 press; button 1 or 3 drag
3318 * flag == 0 ==> button 1 3096 * flag == 0 ==> button 1
3319 * flag == 1 ==> button 3 press 3097 * flag == 1 ==> button 3 press
3320 * flag == 2 ==> button 3 motion 3098 * flag == 2 ==> button 3 motion
3321 */ 3099 */
3322void 3100void ecb_cold
3323rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3101rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3324{ 3102{
3325 int col = clamp (Pixel2Col (x), 0, ncol); 3103 int col = clamp (Pixel2Col (x), 0, ncol);
3326 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3104 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3327 3105
… …
3353 3131
3354/* ------------------------------------------------------------------------- */ 3132/* ------------------------------------------------------------------------- */
3355/* 3133/*
3356 * Extend the selection to the specified col/row 3134 * Extend the selection to the specified col/row
3357 */ 3135 */
3358void 3136void ecb_cold
3359rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3137rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3360{ 3138{
3361 row_col_t pos; 3139 row_col_t pos;
3362 enum { 3140 enum {
3363 LEFT, RIGHT 3141 LEFT, RIGHT
… …
3554 ::swap (selection.beg.col, selection.end.col); 3332 ::swap (selection.beg.col, selection.end.col);
3555#endif 3333#endif
3556} 3334}
3557 3335
3558#if !ENABLE_MINIMAL 3336#if !ENABLE_MINIMAL
3559void 3337void ecb_cold
3560rxvt_term::selection_remove_trailing_spaces () NOTHROW 3338rxvt_term::selection_remove_trailing_spaces () NOTHROW
3561{ 3339{
3562 int32_t end_col, end_row; 3340 int32_t end_col, end_row;
3563 text_t *stp; 3341 text_t *stp;
3564 3342
… …
3602/* ------------------------------------------------------------------------- */ 3380/* ------------------------------------------------------------------------- */
3603/* 3381/*
3604 * Double click on button 3 when already selected 3382 * Double click on button 3 when already selected
3605 * EXT: button 3 double click 3383 * EXT: button 3 double click
3606 */ 3384 */
3607void 3385void ecb_cold
3608rxvt_term::selection_rotate (int x, int y) NOTHROW 3386rxvt_term::selection_rotate (int x, int y) NOTHROW
3609{ 3387{
3610 selection.clicks = selection.clicks % 3 + 1; 3388 selection.clicks = selection.clicks % 3 + 1;
3611 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3389 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3612} 3390}
… …
3614/* ------------------------------------------------------------------------- */ 3392/* ------------------------------------------------------------------------- */
3615/* 3393/*
3616 * Respond to a request for our current selection 3394 * Respond to a request for our current selection
3617 * EXT: SelectionRequest 3395 * EXT: SelectionRequest
3618 */ 3396 */
3619void 3397void ecb_cold
3620rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3398rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3621{ 3399{
3400 Atom property = rq.property == None ? rq.target : rq.property;
3622 XSelectionEvent ev; 3401 XSelectionEvent ev;
3623 3402
3624 ev.type = SelectionNotify; 3403 ev.type = SelectionNotify;
3625 ev.property = None; 3404 ev.property = None;
3626 ev.display = rq.display; 3405 ev.display = rq.display;
… …
3641 *target++ = xa[XA_COMPOUND_TEXT]; 3420 *target++ = xa[XA_COMPOUND_TEXT];
3642#if X_HAVE_UTF8_STRING 3421#if X_HAVE_UTF8_STRING
3643 *target++ = xa[XA_UTF8_STRING]; 3422 *target++ = xa[XA_UTF8_STRING];
3644#endif 3423#endif
3645 3424
3646 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3425 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3647 32, PropModeReplace, 3426 32, PropModeReplace,
3648 (unsigned char *)target_list, target - target_list); 3427 (unsigned char *)target_list, target - target_list);
3649 ev.property = rq.property; 3428 ev.property = property;
3650 } 3429 }
3651#if TODO // TODO 3430#if TODO // TODO
3652 else if (rq.target == xa[XA_MULTIPLE]) 3431 else if (rq.target == xa[XA_MULTIPLE])
3653 { 3432 {
3654 /* TODO: Handle MULTIPLE */ 3433 /* TODO: Handle MULTIPLE */
3655 } 3434 }
3656#endif 3435#endif
3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3436 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3658 { 3437 {
3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3438 XChangeProperty (dpy, rq.requestor, property, rq.target,
3660 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3439 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property; 3440 ev.property = property;
3662 } 3441 }
3663 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3442 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3664 { 3443 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3444 XChangeProperty (dpy, rq.requestor, property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3445 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3667 ev.property = rq.property; 3446 ev.property = property;
3668 } 3447 }
3669 else if (rq.target == XA_STRING 3448 else if (rq.target == XA_STRING
3670 || rq.target == xa[XA_TEXT] 3449 || rq.target == xa[XA_TEXT]
3671 || rq.target == xa[XA_COMPOUND_TEXT] 3450 || rq.target == xa[XA_COMPOUND_TEXT]
3672 || rq.target == xa[XA_UTF8_STRING] 3451 || rq.target == xa[XA_UTF8_STRING]
… …
3743 ct.value = (unsigned char *)cl; 3522 ct.value = (unsigned char *)cl;
3744 ct.nitems = selectlen; 3523 ct.nitems = selectlen;
3745 ct.encoding = target; 3524 ct.encoding = target;
3746 } 3525 }
3747 3526
3748 XChangeProperty (dpy, rq.requestor, rq.property, 3527 XChangeProperty (dpy, rq.requestor, property,
3749 ct.encoding, 8, PropModeReplace, 3528 ct.encoding, 8, PropModeReplace,
3750 ct.value, (int)ct.nitems); 3529 ct.value, (int)ct.nitems);
3751 ev.property = rq.property; 3530 ev.property = property;
3752 3531
3753 if (freect) 3532 if (freect)
3754 XFree (ct.value); 3533 XFree (ct.value);
3755 } 3534 }
3756 3535
3757 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3536 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3758} 3537}
3759 3538
3760/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
3761#ifdef USE_XIM 3540#if USE_XIM
3762void 3541void ecb_cold
3763rxvt_term::im_set_position (XPoint &pos) NOTHROW 3542rxvt_term::im_set_position (XPoint &pos) NOTHROW
3764{ 3543{
3765 XWindowAttributes xwa; 3544 XWindowAttributes xwa;
3766 3545
3767 XGetWindowAttributes (dpy, vt, &xwa); 3546 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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