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.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines