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

Diff Legend

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