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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines