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.368 by sf-exg, Tue Feb 1 00:41:01 2011 UTC vs.
Revision 1.426 by sf-exg, Tue Oct 2 10:29:12 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 ();
… …
159/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
160 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
161 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
162 158
163void 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
164rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
165{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
166 view_start = 0; 200 view_start = 0;
167 num_scr = 0; 201 num_scr = 0;
168 202
169 if (ncol == 0) 203 if (ncol == 0)
170 ncol = 80; 204 ncol = 80;
… …
190 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
191 225
192 screen.tscroll = 0; 226 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
194 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
195 if (!row_buf) 239 if (!prev_row_buf)
196 { 240 {
197 /* 241 /*
198 * 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
199 */ 243 */
200 top_row = 0; 244 top_row = 0;
201 term_start = 0; 245 term_start = 0;
202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210 for (int row = nrow; row--; )
211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
216 246
217 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
243 { 273 {
244 /* 274 /*
245 * add or delete rows as appropriate 275 * add or delete rows as appropriate
246 */ 276 */
247 277
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264
265 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
266 { 279 {
267 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 }
270 282
271 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 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
272 { 287 }
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 288
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
283 292
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 301
293 do 302 do
294 { 303 {
295 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 306 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 308
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 310 {
302 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
303 312
304 plines++; 313 plines++;
305 llen += prev_ncol; 314 llen += prev_ncol;
… …
318 327
319 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
321 { 330 {
322 qline = row_buf + qrow; 331 qline = row_buf + qrow;
323 lalloc (*qline); 332 qline->alloc (); // redundant with next line
324 qline->l = ncol; 333 qline->l = ncol;
325 qline->is_longer (1); 334 qline->is_longer (1);
326 335
327 int qcol = 0; 336 int qcol = 0;
328 337
… …
343 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
344 // least. 353 // least.
345 if (prow == ocur.row) 354 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
347 356
348 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
349 358
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 360
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 383 {
375 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
376 385
377 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
378 { 387 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
381 390
382 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
383 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
384 } 395 }
385 396
386 for (int row = prev_nrow; row < nrow; row++) 397 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 399
391 term_start = 0; 400 term_start = 0;
392 } 401 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 402
398 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 405 }
401 406
407 for (int row = nrow; row--; )
408 {
409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412 }
413
414 chunk_free (prev_chunk, prev_chunk_size);
415
402 free (tabs); 416 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 417 tabs = (char *)rxvt_malloc (ncol);
404 418
405 for (int col = ncol; col--; ) 419 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 420 tabs [col] = col % TABSIZE == 0;
… …
413 tt_winch (); 427 tt_winch ();
414 428
415 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 429 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416} 430}
417 431
418/* ------------------------------------------------------------------------- */ 432void ecb_cold
419/*
420 * Free everything. That way malloc debugging can find leakage.
421 */
422void
423rxvt_term::scr_release () NOTHROW 433rxvt_term::scr_release () NOTHROW
424{ 434{
425 if (row_buf) 435 chunk_free (chunk, chunk_size);
426 { 436 chunk = 0;
427 delete talloc; talloc = 0; 437 row_buf = 0;
428 delete ralloc; ralloc = 0;
429 438
430 free (row_buf);
431 free (swap_buf);
432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
435 free (tabs); 439 free (tabs);
436 tabs = 0; 440 tabs = 0;
437 }
438} 441}
439 442
440/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
441/* 444/*
442 * Hard/Soft reset 445 * Hard/Soft reset
443 */ 446 */
444void 447void ecb_cold
445rxvt_term::scr_poweron () 448rxvt_term::scr_poweron ()
446{ 449{
447 scr_release (); 450 scr_release ();
451
448 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false; 453 rvideo_mode = false;
450 scr_soft_reset (); 454 scr_soft_reset ();
451 scr_reset (); 455 scr_reset ();
452 456
453 scr_clear (true); 457 scr_clear (true);
454 scr_refresh (); 458 scr_refresh ();
455} 459}
456 460
457void 461void ecb_cold
458rxvt_term::scr_soft_reset () 462rxvt_term::scr_soft_reset () NOTHROW
459{ 463{
460 /* only affects modes, nothing drastic such as clearing the screen */ 464 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY 465#if ENABLE_OVERLAY
462 scr_overlay_off (); 466 scr_overlay_off ();
463#endif 467#endif
… …
518 assert (s->cur.row >= 0); 522 assert (s->cur.row >= 0);
519 assert (s->cur.col >= 0); 523 assert (s->cur.col >= 0);
520} 524}
521 525
522void 526void
523rxvt_term::scr_swap_screen () 527rxvt_term::scr_swap_screen () NOTHROW
524{ 528{
525 if (!option (Opt_secondaryScreen)) 529 if (!option (Opt_secondaryScreen))
526 return; 530 return;
527 531
528 for (int i = prev_nrow; i--; ) 532 for (int i = prev_nrow; i--; )
… …
547 return; 551 return;
548 552
549 want_refresh = 1; 553 want_refresh = 1;
550 view_start = 0; 554 view_start = 0;
551 555
552 selection_check (2); /* check for boundary cross */ 556 /* check for boundary cross */
557 row_col_t pos;
558 pos.row = pos.col = 0;
559 if (ROWCOL_IS_BEFORE (selection.beg, pos)
560 && ROWCOL_IS_AFTER (selection.end, pos))
561 CLEAR_SELECTION ();
553 562
554 current_screen = scrn; 563 current_screen = scrn;
555 564
556#if NSCREENS 565#if NSCREENS
557 if (option (Opt_secondaryScreen)) 566 if (option (Opt_secondaryScreen))
… …
623/* 632/*
624 * Scroll text between <row1> and <row2> inclusive, by <count> lines 633 * Scroll text between <row1> and <row2> inclusive, by <count> lines
625 * count positive ==> scroll up 634 * count positive ==> scroll up
626 * count negative ==> scroll down 635 * count negative ==> scroll down
627 */ 636 */
628int 637int ecb_hot
629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 638rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630{ 639{
631 if (count == 0 || (row1 > row2)) 640 if (count == 0 || (row1 > row2))
632 return 0; 641 return 0;
633 642
… …
636 645
637 if (count > 0 646 if (count > 0
638 && row1 == 0 647 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 648 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 649 {
650 min_it (count, total_rows - (nrow - (row2 + 1)));
651
641 top_row = max (top_row - count, -saveLines); 652 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 653
646 // sever bottommost line 654 // sever bottommost line
647 { 655 {
648 line_t &l = ROW(row2 - count); 656 line_t &l = ROW(row2);
649 l.is_longer (0); 657 l.is_longer (0);
650 l.touch (); 658 l.touch ();
651 } 659 }
652 660
661 // scroll everything up 'count' lines
662 term_start = (term_start + count) % total_rows;
663
664 // now copy lines below the scroll region bottom to the
665 // bottom of the screen again, so they look as if they
666 // hadn't moved.
667 for (int i = nrow; --i > row2; )
668 {
669 line_t &l1 = ROW(i - count);
670 line_t &l2 = ROW(i);
671
672 ::swap (l1, l2);
673 l2.touch ();
674 }
675
653 // erase newly scrolled-in lines 676 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 677 for (int i = count; i--; )
655 { 678 {
656 line_t &l = ROW(nrow - 1 - i); 679 line_t &l = ROW(row2 - i);
657 680
658 // optimize if already cleared, can be significant on slow machines 681 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 682 // could be rolled into scr_blank_screen_mem
660 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 683 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 684 {
662 scr_blank_line (l, 0, l.l, rstyle); 685 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 686 l.l = 0;
… …
665 } 688 }
666 else 689 else
667 scr_blank_screen_mem (l, rstyle); 690 scr_blank_screen_mem (l, rstyle);
668 } 691 }
669 692
670 // now copy lines below the scroll region bottom to the
671 // bottom of the screen again, so they look as if they
672 // hadn't moved.
673 for (int i = nrow; --i > row2; )
674 {
675 line_t &l1 = ROW(i - count);
676 line_t &l2 = ROW(i);
677
678 ::swap (l1, l2);
679 l2.touch ();
680 }
681
682 // move and/or clear selection, if any 693 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 694 if (selection.op && current_screen == selection.screen
695 && selection.beg.row <= row2)
684 { 696 {
685 selection.beg.row -= count; 697 selection.beg.row -= count;
686 selection.end.row -= count; 698 selection.end.row -= count;
687 selection.mark.row -= count; 699 selection.mark.row -= count;
688 700
689 if (selection.beg.row < top_row 701 selection_check (0);
690 || selection.end.row < top_row
691 || selection.mark.row < top_row)
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR;
695 }
696 } 702 }
697 703
698 // finally move the view window, if desired 704 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 705 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 706 && view_start != 0
… …
730 } 736 }
731 737
732 // use a simple and robust scrolling algorithm, this 738 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 739 // part of scr_scroll_text is not time-critical.
734 740
741 // sever line above scroll region
742 if (row1)
743 {
744 line_t &l = ROW(row1 - 1);
745 l.is_longer (0);
746 l.touch ();
747 }
748
735 int rows = row2 - row1 + 1; 749 int rows = row2 - row1 + 1;
736 750
737 min_it (count, rows); 751 min_it (count, rows);
738 752
739 line_t *temp_buf = row_buf + total_rows; 753 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 754
741 for (int row = 0; row < rows; row++) 755 for (int row = 0; row < rows; row++)
742 { 756 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 757 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 758
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 760 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 761 }
748 762
749 for (int row = 0; row < rows; row++) 763 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 764 ROW(row1 + row) = temp_buf [row];
765
766 // sever bottommost line
767 {
768 line_t &l = ROW(row2);
769 l.is_longer (0);
770 l.touch ();
771 }
751 } 772 }
752 773
753 return count; 774 return count;
754} 775}
755 776
756/* ------------------------------------------------------------------------- */ 777/* ------------------------------------------------------------------------- */
757/* 778/*
758 * Add text given in <str> of length <len> to screen struct 779 * Add text given in <str> of length <len> to screen struct
759 */ 780 */
760void 781void ecb_hot
761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 782rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762{ 783{
763 if (len <= 0) /* sanity */ 784 if (len <= 0) /* sanity */
764 return; 785 return;
765 786
766 unsigned char checksel; 787 bool checksel;
767 unicode_t c; 788 unicode_t c;
768 int ncol = this->ncol; 789 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 790 const wchar_t *strend = str + len;
770 791
771 want_refresh = 1; 792 want_refresh = 1;
… …
797 818
798 while (str < strend) 819 while (str < strend)
799 { 820 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 821 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 822
802 if (expect_false (c < 0x20)) 823 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 824 if (c == C0_LF)
804 { 825 {
805 max_it (line->l, screen.cur.col); 826 max_it (line->l, screen.cur.col);
806 827
807 screen.flags &= ~Screen_WrapNext; 828 screen.flags &= ~Screen_WrapNext;
… …
826 { 847 {
827 scr_tab (1, true); 848 scr_tab (1, true);
828 continue; 849 continue;
829 } 850 }
830 851
831 if (expect_false ( 852 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 853 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 854 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 855 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 856 ))
836 { 857 {
… …
841 * should be a similar check. 862 * should be a similar check.
842 */ 863 */
843 CLEAR_SELECTION (); 864 CLEAR_SELECTION ();
844 } 865 }
845 866
846 if (expect_false (screen.flags & Screen_WrapNext)) 867 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 868 {
848 scr_do_wrap (); 869 scr_do_wrap ();
849 870
850 line->l = ncol; 871 line->l = ncol;
851 line->is_longer (1); 872 line->is_longer (1);
… …
853 row = screen.cur.row; 874 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 875 line = &ROW(row); /* _must_ refresh */
855 } 876 }
856 877
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 878 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 879 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 880 c = 0xfffd;
860 881
861 // rely on wcwidth to tell us the character width, do wcwidth before 882 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 883 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 884 // drawing characters below as they might be invalid in the current
864 // locale. 885 // locale.
865 int width = WCWIDTH (c); 886 int width = WCWIDTH (c);
866 887
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 888 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 889 {
869 // vt100 special graphics and line drawing 890 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 891 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 892 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 893 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 c = vt100_0[c - 0x41]; 906 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 907 width = 1; // vt100 line drawing characters are always single-width
887 } 908 }
888 } 909 }
889 910
890 if (expect_false (screen.flags & Screen_Insert)) 911 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 912 scr_insdel_chars (width, INSERT);
892 913
893 if (width != 0) 914 if (width != 0)
894 { 915 {
895#if !UNICODE_3 916#if !UNICODE_3
… …
903#endif 924#endif
904 925
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 926 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 927
907 // if the character doesn't fit into the remaining columns... 928 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 929 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 930 {
910 if (screen.flags & Screen_Autowrap) 931 if (screen.flags & Screen_Autowrap)
911 { 932 {
912 // ... artificially enlargen the previous one 933 // ... artificially enlargen the previous one
913 c = NOCHAR; 934 c = NOCHAR;
… …
920 941
921 // nuke the character at this position, if required 942 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop 943 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 944 // we never have to check for overwriting a wide char itself,
924 // only its tail. 945 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 946 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 947 scr_kill_char (*line, screen.cur.col);
927 948
928 line->touch (); 949 line->touch ();
929 950
930 do 951 do
931 { 952 {
932 line->t[screen.cur.col] = c; 953 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 954 line->r[screen.cur.col] = rend;
934 955
935 if (expect_true (screen.cur.col < ncol - 1)) 956 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 957 screen.cur.col++;
937 else 958 else
938 { 959 {
939 line->l = ncol; 960 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 961 if (screen.flags & Screen_Autowrap)
… …
943 goto end_of_line; 964 goto end_of_line;
944 } 965 }
945 966
946 c = NOCHAR; 967 c = NOCHAR;
947 } 968 }
948 while (expect_false (--width > 0)); 969 while (ecb_unlikely (--width > 0));
949 970
950 // pad with spaces when overwriting wide character with smaller one 971 // pad with spaces when overwriting wide character with smaller one
951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 972 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952 { 973 {
953 line->t[c] = ' '; 974 line->t[c] = ' ';
954 line->r[c] = rend; 975 line->r[c] = rend;
955 } 976 }
956 977
… …
1115 * XTERM_SEQ: ESC 6 1136 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1137 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1138 * in that row right. Clear left column.
1118 */ 1139 */
1119#if !ENABLE_MINIMAL 1140#if !ENABLE_MINIMAL
1120void 1141void ecb_cold
1121rxvt_term::scr_backindex () NOTHROW 1142rxvt_term::scr_backindex () NOTHROW
1122{ 1143{
1123 if (screen.cur.col > 0) 1144 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125 else 1146 else
… …
1132 * XTERM_SEQ: ESC 9 1153 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1154 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1155 * in that row left. Clear right column.
1135 */ 1156 */
1136#if !ENABLE_MINIMAL 1157#if !ENABLE_MINIMAL
1137void 1158void ecb_cold
1138rxvt_term::scr_forwardindex () NOTHROW 1159rxvt_term::scr_forwardindex () NOTHROW
1139{ 1160{
1140 if (screen.cur.col < ncol - 1) 1161 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1162 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142 else 1163 else
… …
1293 scr_blank_line (line, col, num, rstyle); 1314 scr_blank_line (line, col, num, rstyle);
1294} 1315}
1295 1316
1296/* ------------------------------------------------------------------------- */ 1317/* ------------------------------------------------------------------------- */
1297/* 1318/*
1298 * Erase part of whole of the screen 1319 * Erase part or whole of the screen
1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1320 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1321 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1322 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302 */ 1323 */
1303void 1324void
… …
1312 ZERO_SCROLLBACK (); 1333 ZERO_SCROLLBACK ();
1313 1334
1314 switch (mode) 1335 switch (mode)
1315 { 1336 {
1316 case 0: /* erase to end of screen */ 1337 case 0: /* erase to end of screen */
1317 selection_check (1);
1318 scr_erase_line (0); 1338 scr_erase_line (0);
1319 row = screen.cur.row + 1; /* possible OOB */ 1339 row = screen.cur.row + 1; /* possible OOB */
1320 num = nrow - row; 1340 num = nrow - row;
1321 break; 1341 break;
1322 case 1: /* erase to beginning of screen */ 1342 case 1: /* erase to beginning of screen */
1323 selection_check (3);
1324 scr_erase_line (1); 1343 scr_erase_line (1);
1325 row = 0; 1344 row = 0;
1326 num = screen.cur.row; 1345 num = screen.cur.row;
1327 break; 1346 break;
1328 case 2: /* erase whole screen */ 1347 case 2: /* erase whole screen */
1329 selection_check (3);
1330 row = 0; 1348 row = 0;
1331 num = nrow; 1349 num = nrow;
1332 break; 1350 break;
1333 default: 1351 default:
1334 return; 1352 return;
… …
1351 { 1369 {
1352 ren = DEFAULT_RSTYLE; 1370 ren = DEFAULT_RSTYLE;
1353 1371
1354 if (mapped) 1372 if (mapped)
1355 XClearArea (dpy, vt, 0, 1373 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1374 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1375 (unsigned int)Height2Pixel (num), False);
1358 } 1376 }
1359 else 1377 else
1360 { 1378 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1364 { 1382 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1383 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1384 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1385 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1386 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1387 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1388 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1389 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1390 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 } 1391 }
1374 } 1392 }
… …
1396/* ------------------------------------------------------------------------- */ 1414/* ------------------------------------------------------------------------- */
1397/* 1415/*
1398 * Fill the screen with `E's 1416 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1417 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1418 */
1401void 1419void ecb_cold
1402rxvt_term::scr_E () NOTHROW 1420rxvt_term::scr_E () NOTHROW
1403{ 1421{
1404 rend_t fs; 1422 rend_t fs;
1405 1423
1406 want_refresh = 1; 1424 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1425 ZERO_SCROLLBACK ();
1408 1426
1409 num_scr_allow = 0; 1427 num_scr_allow = 0;
1410 selection_check (3); 1428
1429 row_col_t pos;
1430 pos.row = pos.col = 0;
1431 if (ROWCOL_IS_AFTER (selection.end, pos))
1432 CLEAR_SELECTION ();
1411 1433
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1434 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (int row = nrow; row--; ) 1435 for (int row = nrow; row--; )
1414 { 1436 {
1415 line_t &line = ROW(row); 1437 line_t &line = ROW(row);
… …
1566/* ------------------------------------------------------------------------- */ 1588/* ------------------------------------------------------------------------- */
1567/* 1589/*
1568 * Set the scrolling region 1590 * Set the scrolling region
1569 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1591 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570 */ 1592 */
1571void 1593void ecb_cold
1572rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1594rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1573{ 1595{
1574 max_it (top, 0); 1596 max_it (top, 0);
1575 min_it (bot, nrow - 1); 1597 min_it (bot, nrow - 1);
1576 1598
… …
1586/* 1608/*
1587 * Make the cursor visible/invisible 1609 * Make the cursor visible/invisible
1588 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1610 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1611 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590 */ 1612 */
1591void 1613void ecb_cold
1592rxvt_term::scr_cursor_visible (int mode) NOTHROW 1614rxvt_term::scr_cursor_visible (int mode) NOTHROW
1593{ 1615{
1594 want_refresh = 1; 1616 want_refresh = 1;
1595 1617
1596 if (mode) 1618 if (mode)
… …
1603/* 1625/*
1604 * Set/unset automatic wrapping 1626 * Set/unset automatic wrapping
1605 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1627 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1628 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607 */ 1629 */
1608void 1630void ecb_cold
1609rxvt_term::scr_autowrap (int mode) NOTHROW 1631rxvt_term::scr_autowrap (int mode) NOTHROW
1610{ 1632{
1611 if (mode) 1633 if (mode)
1612 screen.flags |= Screen_Autowrap; 1634 screen.flags |= Screen_Autowrap;
1613 else 1635 else
… …
1622 * Relative mode: line numbers are relative to top margin of scrolling region 1644 * Relative mode: line numbers are relative to top margin of scrolling region
1623 * and the cursor cannot be moved outside. 1645 * and the cursor cannot be moved outside.
1624 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1646 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1647 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626 */ 1648 */
1627void 1649void ecb_cold
1628rxvt_term::scr_relative_origin (int mode) NOTHROW 1650rxvt_term::scr_relative_origin (int mode) NOTHROW
1629{ 1651{
1630 if (mode) 1652 if (mode)
1631 screen.flags |= Screen_Relative; 1653 screen.flags |= Screen_Relative;
1632 else 1654 else
… …
1639/* 1661/*
1640 * Set insert/replace mode 1662 * Set insert/replace mode
1641 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1663 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1664 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643 */ 1665 */
1644void 1666void ecb_cold
1645rxvt_term::scr_insert_mode (int mode) NOTHROW 1667rxvt_term::scr_insert_mode (int mode) NOTHROW
1646{ 1668{
1647 if (mode) 1669 if (mode)
1648 screen.flags |= Screen_Insert; 1670 screen.flags |= Screen_Insert;
1649 else 1671 else
… …
1655 * Set/Unset tabs 1677 * Set/Unset tabs
1656 * XTERM_SEQ: Set tab at current column : ESC H 1678 * XTERM_SEQ: Set tab at current column : ESC H
1657 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1679 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1680 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659 */ 1681 */
1660void 1682void ecb_cold
1661rxvt_term::scr_set_tab (int mode) NOTHROW 1683rxvt_term::scr_set_tab (int mode) NOTHROW
1662{ 1684{
1663 if (mode < 0) 1685 if (mode < 0)
1664 memset (tabs, 0, ncol); 1686 memset (tabs, 0, ncol);
1665 else if (screen.cur.col < ncol) 1687 else if (screen.cur.col < ncol)
… …
1685 { 1707 {
1686 rvideo_state = on; 1708 rvideo_state = on;
1687 1709
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_BG_PIXMAP
1690 if (bg_pixmap == None) 1712 if (bg_img == 0)
1691#endif 1713#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1715
1694 XGCValues gcvalue; 1716 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1717 gcvalue.foreground = pix_colors[Color_fg];
… …
1704/* ------------------------------------------------------------------------- */ 1726/* ------------------------------------------------------------------------- */
1705/* 1727/*
1706 * Report current cursor position 1728 * Report current cursor position
1707 * XTERM_SEQ: Report position: ESC [ 6 n 1729 * XTERM_SEQ: Report position: ESC [ 6 n
1708 */ 1730 */
1709void 1731void ecb_cold
1710rxvt_term::scr_report_position () NOTHROW 1732rxvt_term::scr_report_position () NOTHROW
1711{ 1733{
1712 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1734 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1713} 1735}
1714 1736
… …
1717 * ------------------------------------------------------------------------- */ 1739 * ------------------------------------------------------------------------- */
1718 1740
1719/* 1741/*
1720 * Set font style 1742 * Set font style
1721 */ 1743 */
1722void 1744void ecb_cold
1723rxvt_term::set_font_style () NOTHROW 1745rxvt_term::set_font_style () NOTHROW
1724{ 1746{
1725#if 0 1747#if 0
1726 switch (charsets [screen.charset]) 1748 switch (charsets [screen.charset])
1727 { 1749 {
… …
1749 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1771 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1750 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1772 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1773 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1774 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1775 */
1754void 1776void ecb_cold
1755rxvt_term::scr_charset_choose (int set) NOTHROW 1777rxvt_term::scr_charset_choose (int set) NOTHROW
1756{ 1778{
1757 screen.charset = set; 1779 screen.charset = set;
1758 set_font_style (); 1780 set_font_style ();
1759} 1781}
… …
1780 * ------------------------------------------------------------------------- */ 1802 * ------------------------------------------------------------------------- */
1781 1803
1782/* 1804/*
1783 * refresh matching text. 1805 * refresh matching text.
1784 */ 1806 */
1785bool 1807bool ecb_cold
1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1808rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1787{ 1809{
1788 bool found = false; 1810 bool found = false;
1789 1811
1790 for (int i = 0; i < nrow; i++) 1812 for (int i = 0; i < nrow; i++)
… …
1809 PART_BEG = 0, 1831 PART_BEG = 0,
1810 PART_END, 1832 PART_END,
1811 RC_COUNT 1833 RC_COUNT
1812}; 1834};
1813 1835
1814void 1836void ecb_hot
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1837rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816{ 1838{
1817 int i; 1839 int i;
1818 row_col_t rc[RC_COUNT]; 1840 row_col_t rc[RC_COUNT];
1819 1841
… …
1856 * Refresh the entire screen 1878 * Refresh the entire screen
1857 */ 1879 */
1858void 1880void
1859rxvt_term::scr_touch (bool refresh) NOTHROW 1881rxvt_term::scr_touch (bool refresh) NOTHROW
1860{ 1882{
1861 scr_expose (0, 0, width, height, refresh); 1883 scr_expose (0, 0, vt_width, vt_height, refresh);
1862} 1884}
1863 1885
1864/* ------------------------------------------------------------------------- */ 1886/* ------------------------------------------------------------------------- */
1865/* 1887/*
1866 * Move the display so that the line represented by scrollbar value Y is at 1888 * Move the display so that the line represented by scrollbar value Y is at
… …
1922 1944
1923# ifndef NO_MAPALERT 1945# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1946# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1947 if (option (Opt_mapAlert))
1926# endif 1948# endif
1927 XMapWindow (dpy, parent[0]); 1949 XMapWindow (dpy, parent);
1928# endif 1950# endif
1929 1951
1930# if ENABLE_FRILLS 1952# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1953 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1954 set_urgency (1);
… …
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1967 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1968#endif
1947} 1969}
1948 1970
1949/* ------------------------------------------------------------------------- */ 1971/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1972void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1973rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1974{
1954#ifdef PRINTPIPE 1975#ifdef PRINTPIPE
1955 int nrows, row_start; 1976 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1977 FILE *fd = popen_printer ();
… …
2005/* 2026/*
2006 * Refresh the screen 2027 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2028 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2029 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2030 */
2010void 2031void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2032rxvt_term::scr_refresh () NOTHROW
2012{ 2033{
2013 int16_t col, row, /* column/row we're processing */ 2034 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2035 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2036 int i; /* tmp */
… …
2029 * A: set up vars 2050 * A: set up vars
2030 */ 2051 */
2031 refresh_count = 0; 2052 refresh_count = 0;
2032 2053
2033 unsigned int old_screen_flags = screen.flags; 2054 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2055 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_BG_PIXMAP
2036 have_bg = bg_pixmap != None; 2057 have_bg = bg_img != 0;
2037#endif 2058#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2060
2040 /* 2061 /*
2041 * B: reverse any characters which are selected 2062 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2067#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2068 scr_swap_overlay ();
2048#endif 2069#endif
2049 2070
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2071 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2072
2052 /* 2073 /*
2053 * C: set the cursor character (s) 2074 * C: set the cursor character (s)
2054 */ 2075 */
2055 { 2076 {
2056 unsigned char setoldcursor; 2077 bool setoldcursor;
2057 2078
2058#ifdef CURSOR_BLINK 2079#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2080 if (hidden_cursor)
2060 showcursor = 0; 2081 showcursor = 0;
2061#endif 2082#endif
… …
2148 { 2169 {
2149 int16_t nits; 2170 int16_t nits;
2150 int i = num_scr; 2171 int i = num_scr;
2151 int j; 2172 int j;
2152 int len, wlen; 2173 int len, wlen;
2153 dLocal (int, num_scr);
2154 2174
2155 j = nrow; 2175 j = nrow;
2156 wlen = len = -1; 2176 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2158 2178
… …
2233 continue; 2253 continue;
2234 2254
2235 // redraw one or more characters 2255 // redraw one or more characters
2236 2256
2237 // seek to the beginning of wide characters 2257 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2258 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2259 --col;
2240 2260
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2261 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2262 text_t *text = stp + col;
2243 int count = 1; 2263 int count = 1;
… …
2281 2301
2282 col--; /* went one too far. move back */ 2302 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2303 count -= i; /* dump any matching trailing chars */
2284 2304
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2305 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2306 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2307 count++, i--;
2288 2308
2289 /* 2309 /*
2290 * Determine the attributes for the string 2310 * Determine the attributes for the string
2291 */ 2311 */
2292 int fore = fgcolor_of (rend); // desired foreground 2312 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2313 int back = bgcolor_of (rend); // desired background
2294 2314
2295 // only do special processing if any attributes are set, which is unlikely 2315 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2316 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2317 {
2298 bool invert = rend & RS_RVid; 2318 bool invert = rend & RS_RVid;
2299 2319
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2320#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2321 if (rend & RS_Bold && fore == Color_fg)
… …
2390 /* 2410 /*
2391 * Actually do the drawing of the string here 2411 * Actually do the drawing of the string here
2392 */ 2412 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2413 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2414
2395 if (expect_true (have_bg && back == Color_bg)) 2415 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2416 {
2397 // this is very ugly, maybe push it into ->draw? 2417 // this is very ugly, maybe push it into ->draw?
2398 2418
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2419 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2420 if (text[i] != ' ')
… …
2407 did_clear: ; 2427 did_clear: ;
2408 } 2428 }
2409 else 2429 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2430 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2431
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2432 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2433 {
2414#if ENABLE_FRILLS 2434#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2435 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2436 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2437 else
… …
2463 2483
2464 XDrawRectangle (dpy, vt, gc, 2484 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2485 Col2Pixel (col),
2466 Row2Pixel (oldcursor.row), 2486 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2487 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2488 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2489 }
2470 } 2490 }
2471 2491
2472 /* 2492 /*
2473 * H: cleanup selection 2493 * H: cleanup selection
… …
2482 screen.flags = old_screen_flags; 2502 screen.flags = old_screen_flags;
2483 num_scr = 0; 2503 num_scr = 0;
2484 num_scr_allow = 1; 2504 num_scr_allow = 1;
2485} 2505}
2486 2506
2487void 2507void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2508rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2509{
2490 if (!l.t) 2510 if (!l.valid ())
2491 return; 2511 return;
2492 2512
2493 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2513 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494 2514
2495 for (int i = ncol; i--; ) 2515 for (int i = ncol; i--; )
2496 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2516 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497} 2517}
2498 2518
2499void 2519void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2520rxvt_term::scr_remap_chars () NOTHROW
2501{ 2521{
2502 for (int i = total_rows; i--; ) 2522 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2523 scr_remap_chars (row_buf [i]);
2504 2524
… …
2507 scr_remap_chars (drawn_buf [i]); 2527 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2528 scr_remap_chars (swap_buf [i]);
2509 } 2529 }
2510} 2530}
2511 2531
2512void 2532void ecb_cold
2513rxvt_term::scr_recolour (bool refresh) NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2534{
2515 bool transparent = false; 2535 bool transparent = false;
2516 2536
2517#ifdef HAVE_BG_PIXMAP 2537#ifdef HAVE_BG_PIXMAP
2518 if (bg_pixmap != None) 2538 if (bg_img != 0)
2519 { 2539 {
2520# ifdef ENABLE_TRANSPARENCY 2540# if ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT) 2541 if (bg_flags & BG_IS_TRANSPARENT)
2522 { 2542 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2543 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2544 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525 2545
2526 transparent = true; 2546 transparent = true;
2527 } 2547 }
2528 else 2548 else
2529# endif 2549# endif
2530 { 2550 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2552 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2533 } 2553 }
2534 } 2554 }
2535 else 2555 else
2536#endif 2556#endif
2537 { 2557 {
2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2559 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 } 2560 }
2541 2561
2542 XClearWindow (dpy, parent[0]); 2562 XClearWindow (dpy, parent);
2543 2563
2544 if (scrollBar.win) 2564 if (scrollBar.win)
2545 { 2565 {
2546 if (transparent) 2566 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else 2568 else
2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2550 scrollBar.state = STATE_IDLE; 2570 scrollBar.state = SB_STATE_IDLE;
2551 scrollBar.show (0); 2571 scrollBar.show (0);
2552 } 2572 }
2553 2573
2554 if (refresh) 2574 if (refresh)
2555 { 2575 {
… …
2620 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2640 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2621 srp[col] ^= rstyle; 2641 srp[col] ^= rstyle;
2622} 2642}
2623 2643
2624/* ------------------------------------------------------------------------- */ 2644/* ------------------------------------------------------------------------- */
2625void 2645void ecb_hot
2626rxvt_term::scr_reverse_selection () NOTHROW 2646rxvt_term::scr_reverse_selection () NOTHROW
2627{ 2647{
2628 if (selection.op 2648 if (selection.op
2629 && current_screen == selection.screen 2649 && current_screen == selection.screen
2630 && selection.end.row >= view_start) 2650 && selection.end.row >= view_start)
… …
2649 */ 2669 */
2650#if 0 2670#if 0
2651void 2671void
2652rxvt_term::scr_dump (int fd) NOTHROW 2672rxvt_term::scr_dump (int fd) NOTHROW
2653{ 2673{
2654 int row, wrote; 2674 // if this method is needed, it can be implemented by factoring the
2655 unsigned int width, towrite; 2675 // relevant code in scr_printscreen
2656 const char r1[] = "\n";
2657
2658 for (row = saveLines + top_row;
2659 row < saveLines + nrow - 1; row++)
2660 {
2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2662 : ncol;
2663 for (towrite = width; towrite; towrite -= wrote)
2664 {
2665 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2666 towrite);
2667 if (wrote < 0)
2668 return; /* XXX: death, no report */
2669 }
2670 if (row_buf[row].l >= 0)
2671 if (write (fd, r1, 1) <= 0)
2672 return; /* XXX: death, no report */
2673 }
2674} 2676}
2675#endif 2677#endif
2676 2678
2677/* ------------------------------------------------------------------------- * 2679/* ------------------------------------------------------------------------- *
2678 * CHARACTER SELECTION * 2680 * CHARACTER SELECTION *
2679 * ------------------------------------------------------------------------- */ 2681 * ------------------------------------------------------------------------- */
2680void 2682void
2681rxvt_term::selection_check (int check_more) NOTHROW 2683rxvt_term::selection_check (int check_more) NOTHROW
2682{ 2684{
2683 row_col_t pos;
2684
2685 if (!selection.op) 2685 if (!selection.op)
2686 return; 2686 return;
2687 2687
2688 pos.row = pos.col = 0;
2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2688 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2692 || (check_more == 1 2691 || (check_more == 1
2693 && current_screen == selection.screen 2692 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2693 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2694 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696 || (check_more == 2
2697 && ROWCOL_IS_BEFORE (selection.beg, pos)
2698 && ROWCOL_IS_AFTER (selection.end, pos))
2699 || (check_more == 3
2700 && ROWCOL_IS_AFTER (selection.end, pos))
2701 || (check_more == 4 /* screen width change */
2702 && (selection.beg.row != selection.end.row
2703 || selection.end.col > ncol)))
2704 CLEAR_SELECTION (); 2695 CLEAR_ALL_SELECTION ();
2705} 2696}
2706 2697
2707/* ------------------------------------------------------------------------- */ 2698/* ------------------------------------------------------------------------- */
2708/* 2699/*
2709 * Paste a selection direct to the command fd 2700 * Paste a selection direct to the command fd
… …
2715 for (unsigned int i = 0; i < len; i++) 2706 for (unsigned int i = 0; i < len; i++)
2716 if (data[i] == C0_LF) 2707 if (data[i] == C0_LF)
2717 data[i] = C0_CR; 2708 data[i] = C0_CR;
2718 2709
2719 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~"); 2711 tt_printf ("\x1b[200~");
2721 2712
2722 tt_write (data, len); 2713 tt_write (data, len);
2723 2714
2724 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2725 tt_printf ("\e[201~"); 2716 tt_printf ("\x1b[201~");
2726} 2717}
2727 2718
2728void 2719void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW 2720rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{ 2721{
… …
2734 tt_paste (data, len); 2725 tt_paste (data, len);
2735} 2726}
2736 2727
2737/* ------------------------------------------------------------------------- */ 2728/* ------------------------------------------------------------------------- */
2738/* 2729/*
2739 * Respond to a notification that a primary selection has been sent 2730 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2740 * EXT: SelectionNotify 2731 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2741 */ 2732 * as fallback
2742void
2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2744{
2745 if (prop == None) /* check for failed XConvertSelection */
2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2752 if ((selection_type & Sel_CompoundText))
2753 {
2754 selection_type = 0;
2755 selection_request_other (XA_STRING, selnum);
2756 }
2757
2758 if ((selection_type & Sel_UTF8String))
2759 {
2760 selection_type = Sel_CompoundText;
2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2762 }
2763
2764 return;
2765 }
2766
2767 unsigned long bytes_after;
2768 XTextProperty ct;
2769
2770 if (XGetWindowProperty (dpy, win, prop,
2771 0, PROP_SIZE / 4,
2772 delete_prop, AnyPropertyType,
2773 &ct.encoding, &ct.format,
2774 &ct.nitems, &bytes_after,
2775 &ct.value) != Success)
2776 {
2777 ct.value = 0;
2778 goto bailout;
2779 }
2780
2781 if (ct.encoding == None)
2782 goto bailout;
2783
2784 if (bytes_after)
2785 {
2786 // fetch and append remaining data
2787 XTextProperty ct2;
2788
2789 if (XGetWindowProperty (dpy, win, prop,
2790 ct.nitems / 4, (bytes_after + 3) / 4,
2791 delete_prop, AnyPropertyType,
2792 &ct2.encoding, &ct2.format,
2793 &ct2.nitems, &bytes_after,
2794 &ct2.value) != Success)
2795 goto bailout;
2796
2797 // realloc should be compatible to XFree, here, and elsewhere, too
2798 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2800 ct.nitems += ct2.nitems;
2801
2802 XFree (ct2.value);
2803 }
2804
2805 if (ct.value == 0)
2806 goto bailout;
2807
2808 if (ct.encoding == xa[XA_INCR])
2809 {
2810 // INCR selection, start handshake
2811 if (!delete_prop)
2812 XDeleteProperty (dpy, win, prop);
2813
2814 selection_wait = Sel_incr;
2815 incr_buf_fill = 0;
2816 incr_ev.start (10);
2817
2818 goto bailout;
2819 }
2820
2821 if (ct.nitems == 0)
2822 {
2823 if (selection_wait == Sel_incr)
2824 {
2825 XFree (ct.value);
2826
2827 // finally complete, now paste the whole thing
2828 selection_wait = Sel_normal;
2829 ct.value = (unsigned char *)incr_buf;
2830 ct.nitems = incr_buf_fill;
2831 incr_buf = 0;
2832 incr_buf_size = 0;
2833 incr_ev.stop ();
2834 }
2835 else
2836 {
2837 if (selection_wait == Sel_normal
2838 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2839 {
2840 /*
2841 * pass through again trying CUT_BUFFER0 if we've come from
2842 * XConvertSelection () but nothing was presented
2843 */
2844 selection_paste (display->root, XA_CUT_BUFFER0, false);
2845 }
2846
2847 goto bailout;
2848 }
2849 }
2850 else if (selection_wait == Sel_incr)
2851 {
2852 incr_ev.start (10);
2853
2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2855 {
2856 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2858 }
2859
2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2861 incr_buf_fill += ct.nitems;
2862
2863 goto bailout;
2864 }
2865
2866 char **cl;
2867 int cr;
2868
2869#if !ENABLE_MINIMAL
2870 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2871 // so recode it manually
2872 if (ct.encoding == xa[XA_UTF8_STRING])
2873 {
2874 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2875 char *s = rxvt_wcstombs (w);
2876 free (w);
2877 // TODO: strlen == only the first element will be converted. well...
2878 paste (s, strlen (s));
2879 free (s);
2880 }
2881 else
2882#endif
2883 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2884 && cl)
2885 {
2886 for (int i = 0; i < cr; i++)
2887 paste (cl[i], strlen (cl[i]));
2888
2889 XFreeStringList (cl);
2890 }
2891 else
2892 paste ((char *)ct.value, ct.nitems); // paste raw
2893
2894bailout:
2895 XFree (ct.value);
2896
2897 if (selection_wait == Sel_normal)
2898 selection_wait = Sel_none;
2899}
2900
2901void
2902rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2903{
2904 selection_wait = Sel_none;
2905
2906 incr_buf_size = 0;
2907 free (incr_buf);
2908
2909 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2910}
2911
2912void
2913rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2914{
2915 if (prop == None || selection_wait != Sel_incr)
2916 return;
2917
2918 selection_paste (win, prop, true);
2919}
2920
2921/* ------------------------------------------------------------------------- */
2922/*
2923 * Request the current selection:
2924 * Order: > internal selection if available
2925 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2926 * > CUT_BUFFER0
2927 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2928 * will auto fallback to CUT_BUFFER0
2929 * EXT: button 2 release 2733 * EXT: button 2 release
2930 */ 2734 */
2931void 2735void
2932rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2736rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2933{ 2737{
2934 if (selection.text && selnum == Sel_Primary) 2738 if (!selection_req)
2935 {
2936 /* internal selection */
2937 char *str = rxvt_wcstombs (selection.text, selection.len);
2938 paste (str, strlen (str));
2939 free (str);
2940 return;
2941 } 2739 {
2942 else 2740 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2741 selection_req->run ();
2943 { 2742 }
2944 selection_request_time = tm;
2945 selection_wait = Sel_normal;
2946
2947#if X_HAVE_UTF8_STRING
2948 selection_type = Sel_UTF8String;
2949 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2950 return;
2951#else
2952 selection_type = Sel_CompoundText;
2953 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2954 return;
2955#endif
2956 }
2957
2958 selection_wait = Sel_none; /* don't loop in selection_paste () */
2959 selection_paste (display->root, XA_CUT_BUFFER0, false);
2960}
2961
2962int
2963rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2964{
2965 Atom sel;
2966
2967 selection_type |= selnum;
2968
2969 if (selnum == Sel_Primary)
2970 sel = XA_PRIMARY;
2971 else if (selnum == Sel_Secondary)
2972 sel = XA_SECONDARY;
2973 else
2974 sel = xa[XA_CLIPBOARD];
2975
2976 if (XGetSelectionOwner (dpy, sel) != None)
2977 {
2978 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2979 vt, selection_request_time);
2980 return 1;
2981 }
2982
2983 return 0;
2984} 2743}
2985 2744
2986/* ------------------------------------------------------------------------- */ 2745/* ------------------------------------------------------------------------- */
2987/* 2746/*
2988 * Clear all selected text 2747 * Clear all selected text
… …
3182/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
3183/* 2942/*
3184 * Mark or select text based upon number of clicks: 1, 2, or 3 2943 * Mark or select text based upon number of clicks: 1, 2, or 3
3185 * EXT: button 1 press 2944 * EXT: button 1 press
3186 */ 2945 */
3187void 2946void ecb_cold
3188rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2947rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3189{ 2948{
3190 clicks = ((clicks - 1) % 3) + 1; 2949 clicks = ((clicks - 1) % 3) + 1;
3191 selection.clicks = clicks; /* save clicks so extend will work */ 2950 selection.clicks = clicks; /* save clicks so extend will work */
3192 2951
… …
3211 2970
3212/* ------------------------------------------------------------------------- */ 2971/* ------------------------------------------------------------------------- */
3213/* 2972/*
3214 * Mark a selection at the specified col/row 2973 * Mark a selection at the specified col/row
3215 */ 2974 */
3216void 2975void ecb_cold
3217rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2976rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3218{ 2977{
3219 want_refresh = 1; 2978 want_refresh = 1;
3220 2979
3221 selection.mark.row = row + view_start; 2980 selection.mark.row = row + view_start;
… …
3248/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3007/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3249#define DELIMIT_TEXT(x) \ 3008#define DELIMIT_TEXT(x) \
3250 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3009 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3251#define DELIMIT_REND(x) 1 3010#define DELIMIT_REND(x) 1
3252 3011
3253void 3012void ecb_cold
3254rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3013rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3255{ 3014{
3256 int col, row, dirnadd, tcol, trow, w1, w2; 3015 int col, row, dirnadd, tcol, trow, w1, w2;
3257 row_col_t bound; 3016 row_col_t bound;
3258 text_t *stp; 3017 text_t *stp;
… …
3332 * EXT: button 3 press; button 1 or 3 drag 3091 * EXT: button 3 press; button 1 or 3 drag
3333 * flag == 0 ==> button 1 3092 * flag == 0 ==> button 1
3334 * flag == 1 ==> button 3 press 3093 * flag == 1 ==> button 3 press
3335 * flag == 2 ==> button 3 motion 3094 * flag == 2 ==> button 3 motion
3336 */ 3095 */
3337void 3096void ecb_cold
3338rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3097rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3339{ 3098{
3340 int col = clamp (Pixel2Col (x), 0, ncol); 3099 int col = clamp (Pixel2Col (x), 0, ncol);
3341 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3100 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3342 3101
… …
3368 3127
3369/* ------------------------------------------------------------------------- */ 3128/* ------------------------------------------------------------------------- */
3370/* 3129/*
3371 * Extend the selection to the specified col/row 3130 * Extend the selection to the specified col/row
3372 */ 3131 */
3373void 3132void ecb_cold
3374rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3133rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3375{ 3134{
3376 row_col_t pos; 3135 row_col_t pos;
3377 enum { 3136 enum {
3378 LEFT, RIGHT 3137 LEFT, RIGHT
… …
3569 ::swap (selection.beg.col, selection.end.col); 3328 ::swap (selection.beg.col, selection.end.col);
3570#endif 3329#endif
3571} 3330}
3572 3331
3573#if !ENABLE_MINIMAL 3332#if !ENABLE_MINIMAL
3574void 3333void ecb_cold
3575rxvt_term::selection_remove_trailing_spaces () NOTHROW 3334rxvt_term::selection_remove_trailing_spaces () NOTHROW
3576{ 3335{
3577 int32_t end_col, end_row; 3336 int32_t end_col, end_row;
3578 text_t *stp; 3337 text_t *stp;
3579 3338
… …
3617/* ------------------------------------------------------------------------- */ 3376/* ------------------------------------------------------------------------- */
3618/* 3377/*
3619 * Double click on button 3 when already selected 3378 * Double click on button 3 when already selected
3620 * EXT: button 3 double click 3379 * EXT: button 3 double click
3621 */ 3380 */
3622void 3381void ecb_cold
3623rxvt_term::selection_rotate (int x, int y) NOTHROW 3382rxvt_term::selection_rotate (int x, int y) NOTHROW
3624{ 3383{
3625 selection.clicks = selection.clicks % 3 + 1; 3384 selection.clicks = selection.clicks % 3 + 1;
3626 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3385 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3627} 3386}
… …
3629/* ------------------------------------------------------------------------- */ 3388/* ------------------------------------------------------------------------- */
3630/* 3389/*
3631 * Respond to a request for our current selection 3390 * Respond to a request for our current selection
3632 * EXT: SelectionRequest 3391 * EXT: SelectionRequest
3633 */ 3392 */
3634void 3393void ecb_cold
3635rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3394rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3636{ 3395{
3396 Atom property = rq.property == None ? rq.target : rq.property;
3637 XSelectionEvent ev; 3397 XSelectionEvent ev;
3638 3398
3639 ev.type = SelectionNotify; 3399 ev.type = SelectionNotify;
3640 ev.property = None; 3400 ev.property = None;
3641 ev.display = rq.display; 3401 ev.display = rq.display;
… …
3656 *target++ = xa[XA_COMPOUND_TEXT]; 3416 *target++ = xa[XA_COMPOUND_TEXT];
3657#if X_HAVE_UTF8_STRING 3417#if X_HAVE_UTF8_STRING
3658 *target++ = xa[XA_UTF8_STRING]; 3418 *target++ = xa[XA_UTF8_STRING];
3659#endif 3419#endif
3660 3420
3661 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3421 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3662 32, PropModeReplace, 3422 32, PropModeReplace,
3663 (unsigned char *)target_list, target - target_list); 3423 (unsigned char *)target_list, target - target_list);
3664 ev.property = rq.property; 3424 ev.property = property;
3665 } 3425 }
3666#if TODO // TODO 3426#if TODO // TODO
3667 else if (rq.target == xa[XA_MULTIPLE]) 3427 else if (rq.target == xa[XA_MULTIPLE])
3668 { 3428 {
3669 /* TODO: Handle MULTIPLE */ 3429 /* TODO: Handle MULTIPLE */
3670 } 3430 }
3671#endif 3431#endif
3672 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3432 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3673 { 3433 {
3674 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3434 XChangeProperty (dpy, rq.requestor, property, rq.target,
3675 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3435 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3676 ev.property = rq.property; 3436 ev.property = property;
3677 } 3437 }
3678 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3438 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3679 { 3439 {
3680 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3440 XChangeProperty (dpy, rq.requestor, property, rq.target,
3681 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3441 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3682 ev.property = rq.property; 3442 ev.property = property;
3683 } 3443 }
3684 else if (rq.target == XA_STRING 3444 else if (rq.target == XA_STRING
3685 || rq.target == xa[XA_TEXT] 3445 || rq.target == xa[XA_TEXT]
3686 || rq.target == xa[XA_COMPOUND_TEXT] 3446 || rq.target == xa[XA_COMPOUND_TEXT]
3687 || rq.target == xa[XA_UTF8_STRING] 3447 || rq.target == xa[XA_UTF8_STRING]
… …
3758 ct.value = (unsigned char *)cl; 3518 ct.value = (unsigned char *)cl;
3759 ct.nitems = selectlen; 3519 ct.nitems = selectlen;
3760 ct.encoding = target; 3520 ct.encoding = target;
3761 } 3521 }
3762 3522
3763 XChangeProperty (dpy, rq.requestor, rq.property, 3523 XChangeProperty (dpy, rq.requestor, property,
3764 ct.encoding, 8, PropModeReplace, 3524 ct.encoding, 8, PropModeReplace,
3765 ct.value, (int)ct.nitems); 3525 ct.value, (int)ct.nitems);
3766 ev.property = rq.property; 3526 ev.property = property;
3767 3527
3768 if (freect) 3528 if (freect)
3769 XFree (ct.value); 3529 XFree (ct.value);
3770 } 3530 }
3771 3531
3772 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3532 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3773} 3533}
3774 3534
3775/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3776#ifdef USE_XIM 3536#if USE_XIM
3777void 3537void ecb_cold
3778rxvt_term::im_set_position (XPoint &pos) NOTHROW 3538rxvt_term::im_set_position (XPoint &pos) NOTHROW
3779{ 3539{
3780 XWindowAttributes xwa; 3540 XWindowAttributes xwa;
3781 3541
3782 XGetWindowAttributes (dpy, vt, &xwa); 3542 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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