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.351 by sf-exg, Fri Oct 15 11:07: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
901#endif 927#endif
902 928
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 929 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 930
905 // if the character doesn't fit into the remaining columns... 931 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 932 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 933 {
908 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
909 { 935 {
910 // ... artificially enlargen the previous one 936 // ... artificially enlargen the previous one
911 c = NOCHAR; 937 c = NOCHAR;
915 else 941 else
916 screen.cur.col = ncol - width; 942 screen.cur.col = ncol - width;
917 } 943 }
918 944
919 // nuke the character at this position, if required 945 // nuke the character at this position, if required
920 if (expect_false ( 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.
921 line->t[screen.cur.col] == NOCHAR 949 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
922 || (screen.cur.col < ncol - 1
923 && line->t[screen.cur.col + 1] == NOCHAR)
924 ))
925 scr_kill_char (*line, screen.cur.col); 950 scr_kill_char (*line, screen.cur.col);
926 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
1115 * XTERM_SEQ: ESC 6 1139 * XTERM_SEQ: ESC 6
1116 * 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
1117 * in that row right. Clear left column. 1141 * in that row right. Clear left column.
1118 */ 1142 */
1119#if !ENABLE_MINIMAL 1143#if !ENABLE_MINIMAL
1120void 1144void ecb_cold
1121rxvt_term::scr_backindex () NOTHROW 1145rxvt_term::scr_backindex () NOTHROW
1122{ 1146{
1123 if (screen.cur.col > 0) 1147 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125 else 1149 else
1132 * XTERM_SEQ: ESC 9 1156 * XTERM_SEQ: ESC 9
1133 * 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
1134 * in that row left. Clear right column. 1158 * in that row left. Clear right column.
1135 */ 1159 */
1136#if !ENABLE_MINIMAL 1160#if !ENABLE_MINIMAL
1137void 1161void ecb_cold
1138rxvt_term::scr_forwardindex () NOTHROW 1162rxvt_term::scr_forwardindex () NOTHROW
1139{ 1163{
1140 if (screen.cur.col < ncol - 1) 1164 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142 else 1166 else
1293 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1294} 1318}
1295 1319
1296/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1297/* 1321/*
1298 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302 */ 1326 */
1303void 1327void
1312 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1313 1337
1314 switch (mode) 1338 switch (mode)
1315 { 1339 {
1316 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1317 selection_check (1);
1318 scr_erase_line (0); 1341 scr_erase_line (0);
1319 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1320 num = nrow - row; 1343 num = nrow - row;
1321 break; 1344 break;
1322 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1323 selection_check (3);
1324 scr_erase_line (1); 1346 scr_erase_line (1);
1325 row = 0; 1347 row = 0;
1326 num = screen.cur.row; 1348 num = screen.cur.row;
1327 break; 1349 break;
1328 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1329 selection_check (3);
1330 row = 0; 1351 row = 0;
1331 num = nrow; 1352 num = nrow;
1332 break; 1353 break;
1333 default: 1354 default:
1334 return; 1355 return;
1351 { 1372 {
1352 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1353 1374
1354 if (mapped) 1375 if (mapped)
1355 XClearArea (dpy, vt, 0, 1376 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1378 (unsigned int)Height2Pixel (num), False);
1358 } 1379 }
1359 else 1380 else
1360 { 1381 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 { 1385 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1388 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1389 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1390 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1391 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 } 1394 }
1374 } 1395 }
1396/* ------------------------------------------------------------------------- */ 1417/* ------------------------------------------------------------------------- */
1397/* 1418/*
1398 * Fill the screen with `E's 1419 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1420 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1421 */
1401void 1422void ecb_cold
1402rxvt_term::scr_E () NOTHROW 1423rxvt_term::scr_E () NOTHROW
1403{ 1424{
1404 rend_t fs; 1425 rend_t fs;
1405 1426
1406 want_refresh = 1; 1427 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1408 1429
1409 num_scr_allow = 0; 1430 num_scr_allow = 0;
1410 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 ();
1411 1436
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1414 { 1439 {
1415 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
1566/* ------------------------------------------------------------------------- */ 1591/* ------------------------------------------------------------------------- */
1567/* 1592/*
1568 * Set the scrolling region 1593 * Set the scrolling region
1569 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1594 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570 */ 1595 */
1571void 1596void ecb_cold
1572rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1597rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1573{ 1598{
1574 max_it (top, 0); 1599 max_it (top, 0);
1575 min_it (bot, nrow - 1); 1600 min_it (bot, nrow - 1);
1576 1601
1586/* 1611/*
1587 * Make the cursor visible/invisible 1612 * Make the cursor visible/invisible
1588 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1613 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1614 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590 */ 1615 */
1591void 1616void ecb_cold
1592rxvt_term::scr_cursor_visible (int mode) NOTHROW 1617rxvt_term::scr_cursor_visible (int mode) NOTHROW
1593{ 1618{
1594 want_refresh = 1; 1619 want_refresh = 1;
1595 1620
1596 if (mode) 1621 if (mode)
1603/* 1628/*
1604 * Set/unset automatic wrapping 1629 * Set/unset automatic wrapping
1605 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1630 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1631 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607 */ 1632 */
1608void 1633void ecb_cold
1609rxvt_term::scr_autowrap (int mode) NOTHROW 1634rxvt_term::scr_autowrap (int mode) NOTHROW
1610{ 1635{
1611 if (mode) 1636 if (mode)
1612 screen.flags |= Screen_Autowrap; 1637 screen.flags |= Screen_Autowrap;
1613 else 1638 else
1622 * 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
1623 * and the cursor cannot be moved outside. 1648 * and the cursor cannot be moved outside.
1624 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1649 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1650 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626 */ 1651 */
1627void 1652void ecb_cold
1628rxvt_term::scr_relative_origin (int mode) NOTHROW 1653rxvt_term::scr_relative_origin (int mode) NOTHROW
1629{ 1654{
1630 if (mode) 1655 if (mode)
1631 screen.flags |= Screen_Relative; 1656 screen.flags |= Screen_Relative;
1632 else 1657 else
1639/* 1664/*
1640 * Set insert/replace mode 1665 * Set insert/replace mode
1641 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1666 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1667 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643 */ 1668 */
1644void 1669void ecb_cold
1645rxvt_term::scr_insert_mode (int mode) NOTHROW 1670rxvt_term::scr_insert_mode (int mode) NOTHROW
1646{ 1671{
1647 if (mode) 1672 if (mode)
1648 screen.flags |= Screen_Insert; 1673 screen.flags |= Screen_Insert;
1649 else 1674 else
1655 * Set/Unset tabs 1680 * Set/Unset tabs
1656 * XTERM_SEQ: Set tab at current column : ESC H 1681 * XTERM_SEQ: Set tab at current column : ESC H
1657 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1682 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1683 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659 */ 1684 */
1660void 1685void ecb_cold
1661rxvt_term::scr_set_tab (int mode) NOTHROW 1686rxvt_term::scr_set_tab (int mode) NOTHROW
1662{ 1687{
1663 if (mode < 0) 1688 if (mode < 0)
1664 memset (tabs, 0, ncol); 1689 memset (tabs, 0, ncol);
1665 else if (screen.cur.col < ncol) 1690 else if (screen.cur.col < ncol)
1684 if (rvideo_state != on) 1709 if (rvideo_state != on)
1685 { 1710 {
1686 rvideo_state = on; 1711 rvideo_state = on;
1687 1712
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_IMG
1690 if (bgPixmap.pixmap == None) 1715 if (bg_img == 0)
1691#endif 1716#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1718
1694 XGCValues gcvalue; 1719 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
1704/* ------------------------------------------------------------------------- */ 1729/* ------------------------------------------------------------------------- */
1705/* 1730/*
1706 * Report current cursor position 1731 * Report current cursor position
1707 * XTERM_SEQ: Report position: ESC [ 6 n 1732 * XTERM_SEQ: Report position: ESC [ 6 n
1708 */ 1733 */
1709void 1734void ecb_cold
1710rxvt_term::scr_report_position () NOTHROW 1735rxvt_term::scr_report_position () NOTHROW
1711{ 1736{
1712 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);
1713} 1738}
1714 1739
1717 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1718 1743
1719/* 1744/*
1720 * Set font style 1745 * Set font style
1721 */ 1746 */
1722void 1747void ecb_cold
1723rxvt_term::set_font_style () NOTHROW 1748rxvt_term::set_font_style () NOTHROW
1724{ 1749{
1725#if 0 1750#if 0
1726 switch (charsets [screen.charset]) 1751 switch (charsets [screen.charset])
1727 { 1752 {
1749 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1774 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1750 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1775 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1776 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1777 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1778 */
1754void 1779void ecb_cold
1755rxvt_term::scr_charset_choose (int set) NOTHROW 1780rxvt_term::scr_charset_choose (int set) NOTHROW
1756{ 1781{
1757 screen.charset = set; 1782 screen.charset = set;
1758 set_font_style (); 1783 set_font_style ();
1759} 1784}
1780 * ------------------------------------------------------------------------- */ 1805 * ------------------------------------------------------------------------- */
1781 1806
1782/* 1807/*
1783 * refresh matching text. 1808 * refresh matching text.
1784 */ 1809 */
1785bool 1810bool ecb_cold
1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1811rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1787{ 1812{
1788 bool found = false; 1813 bool found = false;
1789 1814
1790 for (int i = 0; i < nrow; i++) 1815 for (int i = 0; i < nrow; i++)
1809 PART_BEG = 0, 1834 PART_BEG = 0,
1810 PART_END, 1835 PART_END,
1811 RC_COUNT 1836 RC_COUNT
1812}; 1837};
1813 1838
1814void 1839void ecb_hot
1815rxvt_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
1816{ 1841{
1817 int i; 1842 int i;
1818 row_col_t rc[RC_COUNT]; 1843 row_col_t rc[RC_COUNT];
1819 1844
1856 * Refresh the entire screen 1881 * Refresh the entire screen
1857 */ 1882 */
1858void 1883void
1859rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1860{ 1885{
1861 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1862} 1887}
1863 1888
1864/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1865/* 1890/*
1866 * 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
1922 1947
1923# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1926# endif 1951# endif
1927 XMapWindow (dpy, parent[0]); 1952 XMapWindow (dpy, parent);
1928# endif 1953# endif
1929 1954
1930# if ENABLE_FRILLS 1955# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1956 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1957 set_urgency (1);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1971#endif
1947} 1972}
1948 1973
1949/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1975void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1977{
1954#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1955 int nrows, row_start; 1979 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1980 FILE *fd = popen_printer ();
2005/* 2029/*
2006 * Refresh the screen 2030 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2033 */
2010void 2034void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
2012{ 2036{
2013 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2039 int i; /* tmp */
2029 * A: set up vars 2053 * A: set up vars
2030 */ 2054 */
2031 refresh_count = 0; 2055 refresh_count = 0;
2032 2056
2033 unsigned int old_screen_flags = screen.flags; 2057 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2058 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_IMG
2036 have_bg = bgPixmap.pixmap != None; 2060 have_bg = bg_img != 0;
2037#endif 2061#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2063
2040 /* 2064 /*
2041 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2070#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2071 scr_swap_overlay ();
2048#endif 2072#endif
2049 2073
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2075
2052 /* 2076 /*
2053 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2054 */ 2078 */
2055 { 2079 {
2056 unsigned char setoldcursor; 2080 bool setoldcursor;
2057 2081
2058#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2083 if (hidden_cursor)
2060 showcursor = 0; 2084 showcursor = 0;
2061#endif 2085#endif
2148 { 2172 {
2149 int16_t nits; 2173 int16_t nits;
2150 int i = num_scr; 2174 int i = num_scr;
2151 int j; 2175 int j;
2152 int len, wlen; 2176 int len, wlen;
2153 dLocal (int, num_scr);
2154 2177
2155 j = nrow; 2178 j = nrow;
2156 wlen = len = -1; 2179 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2158 2181
2233 continue; 2256 continue;
2234 2257
2235 // redraw one or more characters 2258 // redraw one or more characters
2236 2259
2237 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2262 --col;
2240 2263
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2265 text_t *text = stp + col;
2243 int count = 1; 2266 int count = 1;
2281 2304
2282 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2284 2307
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2310 count++, i--;
2288 2311
2289 /* 2312 /*
2290 * Determine the attributes for the string 2313 * Determine the attributes for the string
2291 */ 2314 */
2292 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2294 2317
2295 // 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
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2320 {
2298 bool invert = rend & RS_RVid; 2321 bool invert = rend & RS_RVid;
2299 2322
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
2390 /* 2413 /*
2391 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2392 */ 2415 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2417
2395 if (expect_true (have_bg && back == Color_bg)) 2418 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2419 {
2397 // this is very ugly, maybe push it into ->draw? 2420 // this is very ugly, maybe push it into ->draw?
2398 2421
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2423 if (text[i] != ' ')
2407 did_clear: ; 2430 did_clear: ;
2408 } 2431 }
2409 else 2432 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2434
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2436 {
2414#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2440 else
2463 2486
2464 XDrawRectangle (dpy, vt, gc, 2487 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2488 Col2Pixel (col),
2466 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2492 }
2470 } 2493 }
2471 2494
2472 /* 2495 /*
2473 * H: cleanup selection 2496 * H: cleanup selection
2482 screen.flags = old_screen_flags; 2505 screen.flags = old_screen_flags;
2483 num_scr = 0; 2506 num_scr = 0;
2484 num_scr_allow = 1; 2507 num_scr_allow = 1;
2485} 2508}
2486 2509
2487void 2510void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2512{
2490 if (!l.t) 2513 if (!l.valid ())
2491 return; 2514 return;
2492 2515
2493 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
2494 2517
2495 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
2496 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]));
2497} 2520}
2498 2521
2499void 2522void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2523rxvt_term::scr_remap_chars () NOTHROW
2501{ 2524{
2502 for (int i = total_rows; i--; ) 2525 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2526 scr_remap_chars (row_buf [i]);
2504 2527
2507 scr_remap_chars (drawn_buf [i]); 2530 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2509 } 2532 }
2510} 2533}
2511 2534
2512void 2535void ecb_cold
2513rxvt_term::scr_recolour () NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2537{
2515#ifdef HAVE_BG_PIXMAP 2538 bool transparent = false;
2516 bgPixmap.apply ();
2517#else
2518 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 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2520 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2563 }
2564
2565 XClearWindow (dpy, parent);
2522 2566
2523 if (scrollBar.win) 2567 if (scrollBar.win)
2524 { 2568 {
2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2526 scrollBar.state = STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2527 scrollBar.show (0); 2574 scrollBar.show (0);
2528 } 2575 }
2529 2576
2530#endif 2577 if (refresh)
2531 2578 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2579 scr_clear ();
2534 scr_touch (true); 2580 scr_touch (true);
2581 }
2535 want_refresh = 1; 2582 want_refresh = 1;
2536} 2583}
2537 2584
2538/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2539void 2586void
2596 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2643 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2597 srp[col] ^= rstyle; 2644 srp[col] ^= rstyle;
2598} 2645}
2599 2646
2600/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2601void 2648void ecb_hot
2602rxvt_term::scr_reverse_selection () NOTHROW 2649rxvt_term::scr_reverse_selection () NOTHROW
2603{ 2650{
2604 if (selection.op 2651 if (selection.op
2605 && current_screen == selection.screen 2652 && current_screen == selection.screen
2606 && selection.end.row >= view_start) 2653 && selection.end.row >= view_start)
2625 */ 2672 */
2626#if 0 2673#if 0
2627void 2674void
2628rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2629{ 2676{
2630 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2631 unsigned int width, towrite; 2678 // relevant code in scr_printscreen
2632 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} 2679}
2651#endif 2680#endif
2652 2681
2653/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2654 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2655 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2656void 2685void
2657rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2658{ 2687{
2659 row_col_t pos;
2660
2661 if (!selection.op) 2688 if (!selection.op)
2662 return; 2689 return;
2663 2690
2664 pos.row = pos.col = 0;
2665 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2666 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2667 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2668 || (check_more == 1 2694 || (check_more == 1
2669 && current_screen == selection.screen 2695 && current_screen == selection.screen
2670 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2671 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && 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 (); 2698 CLEAR_ALL_SELECTION ();
2681} 2699}
2682 2700
2683/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2684/* 2702/*
2685 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2691 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2692 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2693 data[i] = C0_CR; 2711 data[i] = C0_CR;
2694 2712
2695 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2697 2715
2698 tt_write (data, len); 2716 tt_write (data, len);
2699 2717
2700 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2701 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2702} 2720}
2703 2721
2704void 2722void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{ 2724{
2710 tt_paste (data, len); 2728 tt_paste (data, len);
2711} 2729}
2712 2730
2713/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2714/* 2732/*
2715 * Respond to a notification that a primary selection has been sent 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2716 * EXT: SelectionNotify 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2717 */ 2735 * 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 2736 * EXT: button 2 release
2909 */ 2737 */
2910void 2738void
2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2912{ 2740{
2913 if (selection.text && selnum == Sel_Primary) 2741 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 } 2742 {
2921 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2922 { 2745 }
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} 2746}
2964 2747
2965/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2966/* 2749/*
2967 * Clear all selected text 2750 * Clear all selected text
2998 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2999 */ 2782 */
3000void 2783void
3001rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
3002{ 2785{
3003 int i; 2786 int size;
3004 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
3005 text_t *t; 2788 text_t *t;
3006 2789
3007 switch (selection.op) 2790 switch (selection.op)
3008 { 2791 {
3024 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
3025 2808
3026 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)))
3027 return; 2810 return;
3028 2811
3029 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030 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));
3031 2814
3032 int ofs = 0; 2815 int ofs = 0;
3033 int extra = 0; 2816 int extra = 0;
3034 2817
3035 int col = selection.beg.col; 2818 int col = selection.beg.col;
3041 { 2824 {
3042#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
3043 if (selection.rect) 2826 if (selection.rect)
3044 { 2827 {
3045 col = selection.beg.col; 2828 col = selection.beg.col;
3046 end_col = ncol + 1; 2829 end_col = selection.end.col;
3047 } 2830 }
3048 else 2831 else
3049#endif 2832#endif
3050 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
3051 2834
3052 col = max (col, 0); 2835 col = max (col, 0);
3053 2836
3054 if (row == selection.end.row 2837 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
3060 2839
3061 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
3062 2841
3063 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
3071 2850
3072 extra -= (len - 1); 2851 extra -= (len - 1);
3073 2852
3074 if (extra < 0) 2853 if (extra < 0)
3075 { 2854 {
3076 extra += i; 2855 extra += size;
3077 i += i; 2856 size += size;
3078 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));
3079 } 2858 }
3080 2859
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 2861 }
3083#endif 2862#endif
3095 2874
3096 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3097 } 2876 }
3098 else 2877 else
3099#endif 2878#endif
3100 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))
3101 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3102 } 2883 }
3103
3104 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF;
3106 2884
3107 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3108 2886
3109 if (ofs == 0) 2887 if (ofs == 0)
3110 { 2888 {
3166/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
3167/* 2945/*
3168 * 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
3169 * EXT: button 1 press 2947 * EXT: button 1 press
3170 */ 2948 */
3171void 2949void ecb_cold
3172rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3173{ 2951{
3174 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
3175 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
3176 2954
3195 2973
3196/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
3197/* 2975/*
3198 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
3199 */ 2977 */
3200void 2978void ecb_cold
3201rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3202{ 2980{
3203 want_refresh = 1; 2981 want_refresh = 1;
3204 2982
3205 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
3232/* 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 */
3233#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3234 (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)))
3235#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3236 3014
3237void 3015void ecb_cold
3238rxvt_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
3239{ 3017{
3240 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3241 row_col_t bound; 3019 row_col_t bound;
3242 text_t *stp; 3020 text_t *stp;
3316 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3317 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3318 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3319 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3320 */ 3098 */
3321void 3099void ecb_cold
3322rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3323{ 3101{
3324 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3325 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3326 3104
3352 3130
3353/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3354/* 3132/*
3355 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3356 */ 3134 */
3357void 3135void ecb_cold
3358rxvt_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
3359{ 3137{
3360 row_col_t pos; 3138 row_col_t pos;
3361 enum { 3139 enum {
3362 LEFT, RIGHT 3140 LEFT, RIGHT
3553 ::swap (selection.beg.col, selection.end.col); 3331 ::swap (selection.beg.col, selection.end.col);
3554#endif 3332#endif
3555} 3333}
3556 3334
3557#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3558void 3336void ecb_cold
3559rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3560{ 3338{
3561 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3562 text_t *stp; 3340 text_t *stp;
3563 3341
3601/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3602/* 3380/*
3603 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3604 * EXT: button 3 double click 3382 * EXT: button 3 double click
3605 */ 3383 */
3606void 3384void ecb_cold
3607rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3608{ 3386{
3609 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3610 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3611} 3389}
3613/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3614/* 3392/*
3615 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3616 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3617 */ 3395 */
3618void 3396void ecb_cold
3619rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3620{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3621 XSelectionEvent ev; 3400 XSelectionEvent ev;
3622 3401
3623 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3624 ev.property = None; 3403 ev.property = None;
3625 ev.display = rq.display; 3404 ev.display = rq.display;
3640 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3641#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3642 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3643#endif 3422#endif
3644 3423
3645 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3646 32, PropModeReplace, 3425 32, PropModeReplace,
3647 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3648 ev.property = rq.property; 3427 ev.property = property;
3649 } 3428 }
3650#if TODO // TODO 3429#if TODO // TODO
3651 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3652 { 3431 {
3653 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3654 } 3433 }
3655#endif 3434#endif
3656 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)
3657 { 3436 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property; 3439 ev.property = property;
3661 } 3440 }
3662 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)
3663 { 3442 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3666 ev.property = rq.property; 3445 ev.property = property;
3667 } 3446 }
3668 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3669 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3670 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3671 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
3742 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3743 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3744 ct.encoding = target; 3523 ct.encoding = target;
3745 } 3524 }
3746 3525
3747 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3748 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3749 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3750 ev.property = rq.property; 3529 ev.property = property;
3751 3530
3752 if (freect) 3531 if (freect)
3753 XFree (ct.value); 3532 XFree (ct.value);
3754 } 3533 }
3755 3534
3756 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3757} 3536}
3758 3537
3759/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3760#ifdef USE_XIM 3539#if USE_XIM
3761void 3540void ecb_cold
3762rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3763{ 3542{
3764 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3765 3544
3766 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines