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.341 by root, Sat Apr 17 23:05:48 2010 UTC vs.
Revision 1.418 by sf-exg, Mon May 28 21:13:36 2012 UTC

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

Diff Legend

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