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.352 by root, Fri Oct 15 20:52:15 2010 UTC vs.
Revision 1.427 by sf-exg, Sat Dec 29 15:59:51 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;
407 421
408 CLEAR_ALL_SELECTION (); 422 CLEAR_ALL_SELECTION ();
409 423
410 prev_nrow = nrow; 424 prev_nrow = nrow;
… …
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;
… …
917 else 938 else
918 screen.cur.col = ncol - width; 939 screen.cur.col = ncol - width;
919 } 940 }
920 941
921 // nuke the character at this position, if required 942 // nuke the character at this position, if required
922 if (expect_false ( 943 // due to wonderful coincidences everywhere else in this loop
944 // we never have to check for overwriting a wide char itself,
945 // only its tail.
923 line->t[screen.cur.col] == NOCHAR 946 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 || (screen.cur.col < ncol - 1
925 && line->t[screen.cur.col + 1] == NOCHAR)
926 ))
927 scr_kill_char (*line, screen.cur.col); 947 scr_kill_char (*line, screen.cur.col);
928 948
929 line->touch (); 949 line->touch ();
930 950
931 do 951 do
932 { 952 {
933 line->t[screen.cur.col] = c; 953 line->t[screen.cur.col] = c;
934 line->r[screen.cur.col] = rend; 954 line->r[screen.cur.col] = rend;
935 955
936 if (expect_true (screen.cur.col < ncol - 1)) 956 if (ecb_likely (screen.cur.col < ncol - 1))
937 screen.cur.col++; 957 screen.cur.col++;
938 else 958 else
939 { 959 {
940 line->l = ncol; 960 line->l = ncol;
941 if (screen.flags & Screen_Autowrap) 961 if (screen.flags & Screen_Autowrap)
… …
944 goto end_of_line; 964 goto end_of_line;
945 } 965 }
946 966
947 c = NOCHAR; 967 c = NOCHAR;
948 } 968 }
949 while (expect_false (--width > 0)); 969 while (ecb_unlikely (--width > 0));
950 970
951 // pad with spaces when overwriting wide character with smaller one 971 // pad with spaces when overwriting wide character with smaller one
952 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++)
953 { 973 {
954 line->t[c] = ' '; 974 line->t[c] = ' ';
955 line->r[c] = rend; 975 line->r[c] = rend;
956 } 976 }
957 977
… …
1116 * XTERM_SEQ: ESC 6 1136 * XTERM_SEQ: ESC 6
1117 * 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
1118 * in that row right. Clear left column. 1138 * in that row right. Clear left column.
1119 */ 1139 */
1120#if !ENABLE_MINIMAL 1140#if !ENABLE_MINIMAL
1121void 1141void ecb_cold
1122rxvt_term::scr_backindex () NOTHROW 1142rxvt_term::scr_backindex () NOTHROW
1123{ 1143{
1124 if (screen.cur.col > 0) 1144 if (screen.cur.col > 0)
1125 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1126 else 1146 else
… …
1133 * XTERM_SEQ: ESC 9 1153 * XTERM_SEQ: ESC 9
1134 * 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
1135 * in that row left. Clear right column. 1155 * in that row left. Clear right column.
1136 */ 1156 */
1137#if !ENABLE_MINIMAL 1157#if !ENABLE_MINIMAL
1138void 1158void ecb_cold
1139rxvt_term::scr_forwardindex () NOTHROW 1159rxvt_term::scr_forwardindex () NOTHROW
1140{ 1160{
1141 if (screen.cur.col < ncol - 1) 1161 if (screen.cur.col < ncol - 1)
1142 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1162 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1143 else 1163 else
… …
1294 scr_blank_line (line, col, num, rstyle); 1314 scr_blank_line (line, col, num, rstyle);
1295} 1315}
1296 1316
1297/* ------------------------------------------------------------------------- */ 1317/* ------------------------------------------------------------------------- */
1298/* 1318/*
1299 * Erase part of whole of the screen 1319 * Erase part or whole of the screen
1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1320 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1321 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1322 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303 */ 1323 */
1304void 1324void
… …
1313 ZERO_SCROLLBACK (); 1333 ZERO_SCROLLBACK ();
1314 1334
1315 switch (mode) 1335 switch (mode)
1316 { 1336 {
1317 case 0: /* erase to end of screen */ 1337 case 0: /* erase to end of screen */
1318 selection_check (1);
1319 scr_erase_line (0); 1338 scr_erase_line (0);
1320 row = screen.cur.row + 1; /* possible OOB */ 1339 row = screen.cur.row + 1; /* possible OOB */
1321 num = nrow - row; 1340 num = nrow - row;
1322 break; 1341 break;
1323 case 1: /* erase to beginning of screen */ 1342 case 1: /* erase to beginning of screen */
1324 selection_check (3);
1325 scr_erase_line (1); 1343 scr_erase_line (1);
1326 row = 0; 1344 row = 0;
1327 num = screen.cur.row; 1345 num = screen.cur.row;
1328 break; 1346 break;
1329 case 2: /* erase whole screen */ 1347 case 2: /* erase whole screen */
1330 selection_check (3);
1331 row = 0; 1348 row = 0;
1332 num = nrow; 1349 num = nrow;
1333 break; 1350 break;
1334 default: 1351 default:
1335 return; 1352 return;
… …
1352 { 1369 {
1353 ren = DEFAULT_RSTYLE; 1370 ren = DEFAULT_RSTYLE;
1354 1371
1355 if (mapped) 1372 if (mapped)
1356 XClearArea (dpy, vt, 0, 1373 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1374 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1375 (unsigned int)Height2Pixel (num), False);
1359 } 1376 }
1360 else 1377 else
1361 { 1378 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1365 { 1382 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1383 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1384 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1385 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1386 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1387 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1388 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1389 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1390 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1391 }
1375 } 1392 }
… …
1397/* ------------------------------------------------------------------------- */ 1414/* ------------------------------------------------------------------------- */
1398/* 1415/*
1399 * Fill the screen with `E's 1416 * Fill the screen with `E's
1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1417 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1401 */ 1418 */
1402void 1419void ecb_cold
1403rxvt_term::scr_E () NOTHROW 1420rxvt_term::scr_E () NOTHROW
1404{ 1421{
1405 rend_t fs; 1422 rend_t fs;
1406 1423
1407 want_refresh = 1; 1424 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1425 ZERO_SCROLLBACK ();
1409 1426
1410 num_scr_allow = 0; 1427 num_scr_allow = 0;
1411 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 ();
1412 1433
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1434 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1435 for (int row = nrow; row--; )
1415 { 1436 {
1416 line_t &line = ROW(row); 1437 line_t &line = ROW(row);
… …
1567/* ------------------------------------------------------------------------- */ 1588/* ------------------------------------------------------------------------- */
1568/* 1589/*
1569 * Set the scrolling region 1590 * Set the scrolling region
1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1591 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571 */ 1592 */
1572void 1593void ecb_cold
1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1594rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574{ 1595{
1575 max_it (top, 0); 1596 max_it (top, 0);
1576 min_it (bot, nrow - 1); 1597 min_it (bot, nrow - 1);
1577 1598
… …
1587/* 1608/*
1588 * Make the cursor visible/invisible 1609 * Make the cursor visible/invisible
1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1610 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1611 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591 */ 1612 */
1592void 1613void ecb_cold
1593rxvt_term::scr_cursor_visible (int mode) NOTHROW 1614rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594{ 1615{
1595 want_refresh = 1; 1616 want_refresh = 1;
1596 1617
1597 if (mode) 1618 if (mode)
… …
1604/* 1625/*
1605 * Set/unset automatic wrapping 1626 * Set/unset automatic wrapping
1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1627 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1628 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608 */ 1629 */
1609void 1630void ecb_cold
1610rxvt_term::scr_autowrap (int mode) NOTHROW 1631rxvt_term::scr_autowrap (int mode) NOTHROW
1611{ 1632{
1612 if (mode) 1633 if (mode)
1613 screen.flags |= Screen_Autowrap; 1634 screen.flags |= Screen_Autowrap;
1614 else 1635 else
… …
1623 * 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
1624 * and the cursor cannot be moved outside. 1645 * and the cursor cannot be moved outside.
1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1646 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1647 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627 */ 1648 */
1628void 1649void ecb_cold
1629rxvt_term::scr_relative_origin (int mode) NOTHROW 1650rxvt_term::scr_relative_origin (int mode) NOTHROW
1630{ 1651{
1631 if (mode) 1652 if (mode)
1632 screen.flags |= Screen_Relative; 1653 screen.flags |= Screen_Relative;
1633 else 1654 else
… …
1640/* 1661/*
1641 * Set insert/replace mode 1662 * Set insert/replace mode
1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1663 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1664 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644 */ 1665 */
1645void 1666void ecb_cold
1646rxvt_term::scr_insert_mode (int mode) NOTHROW 1667rxvt_term::scr_insert_mode (int mode) NOTHROW
1647{ 1668{
1648 if (mode) 1669 if (mode)
1649 screen.flags |= Screen_Insert; 1670 screen.flags |= Screen_Insert;
1650 else 1671 else
… …
1656 * Set/Unset tabs 1677 * Set/Unset tabs
1657 * XTERM_SEQ: Set tab at current column : ESC H 1678 * XTERM_SEQ: Set tab at current column : ESC H
1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1679 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1680 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660 */ 1681 */
1661void 1682void ecb_cold
1662rxvt_term::scr_set_tab (int mode) NOTHROW 1683rxvt_term::scr_set_tab (int mode) NOTHROW
1663{ 1684{
1664 if (mode < 0) 1685 if (mode < 0)
1665 memset (tabs, 0, ncol); 1686 memset (tabs, 0, ncol);
1666 else if (screen.cur.col < ncol) 1687 else if (screen.cur.col < ncol)
… …
1685 if (rvideo_state != on) 1706 if (rvideo_state != on)
1686 { 1707 {
1687 rvideo_state = on; 1708 rvideo_state = on;
1688 1709
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_IMG
1691 if (bgPixmap.pixmap == None) 1712 if (bg_img == 0)
1692#endif 1713#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1715
1695 XGCValues gcvalue; 1716 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1717 gcvalue.foreground = pix_colors[Color_fg];
… …
1705/* ------------------------------------------------------------------------- */ 1726/* ------------------------------------------------------------------------- */
1706/* 1727/*
1707 * Report current cursor position 1728 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1729 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1730 */
1710void 1731void ecb_cold
1711rxvt_term::scr_report_position () NOTHROW 1732rxvt_term::scr_report_position () NOTHROW
1712{ 1733{
1713 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);
1714} 1735}
1715 1736
… …
1718 * ------------------------------------------------------------------------- */ 1739 * ------------------------------------------------------------------------- */
1719 1740
1720/* 1741/*
1721 * Set font style 1742 * Set font style
1722 */ 1743 */
1723void 1744void ecb_cold
1724rxvt_term::set_font_style () NOTHROW 1745rxvt_term::set_font_style () NOTHROW
1725{ 1746{
1726#if 0 1747#if 0
1727 switch (charsets [screen.charset]) 1748 switch (charsets [screen.charset])
1728 { 1749 {
… …
1750 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1771 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1772 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1773 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1774 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1775 */
1755void 1776void ecb_cold
1756rxvt_term::scr_charset_choose (int set) NOTHROW 1777rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1778{
1758 screen.charset = set; 1779 screen.charset = set;
1759 set_font_style (); 1780 set_font_style ();
1760} 1781}
… …
1781 * ------------------------------------------------------------------------- */ 1802 * ------------------------------------------------------------------------- */
1782 1803
1783/* 1804/*
1784 * refresh matching text. 1805 * refresh matching text.
1785 */ 1806 */
1786bool 1807bool ecb_cold
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1808rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1809{
1789 bool found = false; 1810 bool found = false;
1790 1811
1791 for (int i = 0; i < nrow; i++) 1812 for (int i = 0; i < nrow; i++)
… …
1810 PART_BEG = 0, 1831 PART_BEG = 0,
1811 PART_END, 1832 PART_END,
1812 RC_COUNT 1833 RC_COUNT
1813}; 1834};
1814 1835
1815void 1836void ecb_hot
1816rxvt_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
1817{ 1838{
1818 int i; 1839 int i;
1819 row_col_t rc[RC_COUNT]; 1840 row_col_t rc[RC_COUNT];
1820 1841
… …
1857 * Refresh the entire screen 1878 * Refresh the entire screen
1858 */ 1879 */
1859void 1880void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1881rxvt_term::scr_touch (bool refresh) NOTHROW
1861{ 1882{
1862 scr_expose (0, 0, width, height, refresh); 1883 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1884}
1864 1885
1865/* ------------------------------------------------------------------------- */ 1886/* ------------------------------------------------------------------------- */
1866/* 1887/*
1867 * 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
… …
1923 1944
1924# ifndef NO_MAPALERT 1945# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1946# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1947 if (option (Opt_mapAlert))
1927# endif 1948# endif
1928 XMapWindow (dpy, parent[0]); 1949 XMapWindow (dpy, parent);
1929# endif 1950# endif
1930 1951
1931# if ENABLE_FRILLS 1952# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1953 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1954 set_urgency (1);
… …
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1967 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1947#endif 1968#endif
1948} 1969}
1949 1970
1950/* ------------------------------------------------------------------------- */ 1971/* ------------------------------------------------------------------------- */
1951/* ARGSUSED */ 1972void ecb_cold
1952void
1953rxvt_term::scr_printscreen (int fullhist) NOTHROW 1973rxvt_term::scr_printscreen (int fullhist) NOTHROW
1954{ 1974{
1955#ifdef PRINTPIPE 1975#ifdef PRINTPIPE
1956 int nrows, row_start; 1976 int nrows, row_start;
1957 FILE *fd = popen_printer (); 1977 FILE *fd = popen_printer ();
… …
2006/* 2026/*
2007 * Refresh the screen 2027 * Refresh the screen
2008 * drawn_text/drawn_rend contain the screen information before the update. 2028 * drawn_text/drawn_rend contain the screen information before the update.
2009 * screen.text/screen.rend contain what the screen will change to. 2029 * screen.text/screen.rend contain what the screen will change to.
2010 */ 2030 */
2011void 2031void ecb_hot
2012rxvt_term::scr_refresh () NOTHROW 2032rxvt_term::scr_refresh () NOTHROW
2013{ 2033{
2014 int16_t col, row, /* column/row we're processing */ 2034 int16_t col, row, /* column/row we're processing */
2015 ocrow; /* old cursor row */ 2035 ocrow; /* old cursor row */
2016 int i; /* tmp */ 2036 int i; /* tmp */
… …
2030 * A: set up vars 2050 * A: set up vars
2031 */ 2051 */
2032 refresh_count = 0; 2052 refresh_count = 0;
2033 2053
2034 unsigned int old_screen_flags = screen.flags; 2054 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0; 2055 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_IMG
2037 have_bg = bgPixmap.pixmap != None; 2057 have_bg = bg_img != 0;
2038#endif 2058#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2060
2041 /* 2061 /*
2042 * B: reverse any characters which are selected 2062 * B: reverse any characters which are selected
… …
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY 2067#if ENABLE_OVERLAY
2048 scr_swap_overlay (); 2068 scr_swap_overlay ();
2049#endif 2069#endif
2050 2070
2051 char showcursor = screen.flags & Screen_VisibleCursor; 2071 bool showcursor = screen.flags & Screen_VisibleCursor;
2052 2072
2053 /* 2073 /*
2054 * C: set the cursor character (s) 2074 * C: set the cursor character (s)
2055 */ 2075 */
2056 { 2076 {
2057 unsigned char setoldcursor; 2077 bool setoldcursor;
2058 2078
2059#ifdef CURSOR_BLINK 2079#ifdef CURSOR_BLINK
2060 if (hidden_cursor) 2080 if (hidden_cursor)
2061 showcursor = 0; 2081 showcursor = 0;
2062#endif 2082#endif
… …
2149 { 2169 {
2150 int16_t nits; 2170 int16_t nits;
2151 int i = num_scr; 2171 int i = num_scr;
2152 int j; 2172 int j;
2153 int len, wlen; 2173 int len, wlen;
2154 dLocal (int, num_scr);
2155 2174
2156 j = nrow; 2175 j = nrow;
2157 wlen = len = -1; 2176 wlen = len = -1;
2158 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2159 2178
… …
2234 continue; 2253 continue;
2235 2254
2236 // redraw one or more characters 2255 // redraw one or more characters
2237 2256
2238 // seek to the beginning of wide characters 2257 // seek to the beginning of wide characters
2239 while (expect_false (stp[col] == NOCHAR && col > 0)) 2258 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2240 --col; 2259 --col;
2241 2260
2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2261 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2243 text_t *text = stp + col; 2262 text_t *text = stp + col;
2244 int count = 1; 2263 int count = 1;
… …
2282 2301
2283 col--; /* went one too far. move back */ 2302 col--; /* went one too far. move back */
2284 count -= i; /* dump any matching trailing chars */ 2303 count -= i; /* dump any matching trailing chars */
2285 2304
2286 // sometimes we optimize away the trailing NOCHAR's, add them back 2305 // sometimes we optimize away the trailing NOCHAR's, add them back
2287 while (expect_false (i && text[count] == NOCHAR)) 2306 while (ecb_unlikely (i && text[count] == NOCHAR))
2288 count++, i--; 2307 count++, i--;
2289 2308
2290 /* 2309 /*
2291 * Determine the attributes for the string 2310 * Determine the attributes for the string
2292 */ 2311 */
2293 int fore = fgcolor_of (rend); // desired foreground 2312 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2313 int back = bgcolor_of (rend); // desired background
2295 2314
2296 // 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
2297 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2316 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298 { 2317 {
2299 bool invert = rend & RS_RVid; 2318 bool invert = rend & RS_RVid;
2300 2319
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2320#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2321 if (rend & RS_Bold && fore == Color_fg)
… …
2391 /* 2410 /*
2392 * Actually do the drawing of the string here 2411 * Actually do the drawing of the string here
2393 */ 2412 */
2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2413 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2395 2414
2396 if (expect_true (have_bg && back == Color_bg)) 2415 if (ecb_likely (have_bg && back == Color_bg))
2397 { 2416 {
2398 // this is very ugly, maybe push it into ->draw? 2417 // this is very ugly, maybe push it into ->draw?
2399 2418
2400 for (i = 0; i < count; i++) /* don't draw empty strings */ 2419 for (i = 0; i < count; i++) /* don't draw empty strings */
2401 if (text[i] != ' ') 2420 if (text[i] != ' ')
… …
2408 did_clear: ; 2427 did_clear: ;
2409 } 2428 }
2410 else 2429 else
2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2430 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2412 2431
2413 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2432 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2414 { 2433 {
2415#if ENABLE_FRILLS 2434#if ENABLE_FRILLS
2416 if (ISSET_PIXCOLOR (Color_underline)) 2435 if (ISSET_PIXCOLOR (Color_underline))
2417 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2436 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2418 else 2437 else
… …
2464 2483
2465 XDrawRectangle (dpy, vt, gc, 2484 XDrawRectangle (dpy, vt, gc,
2466 Col2Pixel (col), 2485 Col2Pixel (col),
2467 Row2Pixel (oldcursor.row), 2486 Row2Pixel (oldcursor.row),
2468 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2487 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2469 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2488 (unsigned int) (Height2Pixel (1) - 1));
2470 } 2489 }
2471 } 2490 }
2472 2491
2473 /* 2492 /*
2474 * H: cleanup selection 2493 * H: cleanup selection
… …
2483 screen.flags = old_screen_flags; 2502 screen.flags = old_screen_flags;
2484 num_scr = 0; 2503 num_scr = 0;
2485 num_scr_allow = 1; 2504 num_scr_allow = 1;
2486} 2505}
2487 2506
2488void 2507void ecb_cold
2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2508rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2490{ 2509{
2491 if (!l.t) 2510 if (!l.valid ())
2492 return; 2511 return;
2493 2512
2494 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
2495 2514
2496 for (int i = ncol; i--; ) 2515 for (int i = ncol; i--; )
2497 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]));
2498} 2517}
2499 2518
2500void 2519void ecb_cold
2501rxvt_term::scr_remap_chars () NOTHROW 2520rxvt_term::scr_remap_chars () NOTHROW
2502{ 2521{
2503 for (int i = total_rows; i--; ) 2522 for (int i = total_rows; i--; )
2504 scr_remap_chars (row_buf [i]); 2523 scr_remap_chars (row_buf [i]);
2505 2524
… …
2508 scr_remap_chars (drawn_buf [i]); 2527 scr_remap_chars (drawn_buf [i]);
2509 scr_remap_chars (swap_buf [i]); 2528 scr_remap_chars (swap_buf [i]);
2510 } 2529 }
2511} 2530}
2512 2531
2513void 2532void ecb_cold
2514rxvt_term::scr_recolour () NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2515{ 2534{
2516#ifdef HAVE_BG_PIXMAP 2535 bool transparent = false;
2517 bgPixmap.apply ();
2518#else
2519 2536
2537#ifdef HAVE_IMG
2538 if (bg_img != 0)
2539 {
2540# if ENABLE_TRANSPARENCY
2541 if (bg_flags & BG_IS_TRANSPARENT)
2542 {
2543 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2544 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2545
2546 transparent = true;
2547 }
2548 else
2549# endif
2550 {
2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2552 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2553 }
2554 }
2555 else
2556#endif
2557 {
2520 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2521 XClearWindow (dpy, parent[0]);
2522 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2559 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2560 }
2561
2562 XClearWindow (dpy, parent);
2523 2563
2524 if (scrollBar.win) 2564 if (scrollBar.win)
2525 { 2565 {
2566 if (transparent)
2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2568 else
2526 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2527 scrollBar.state = STATE_IDLE; 2570 scrollBar.state = SB_STATE_IDLE;
2528 scrollBar.show (0); 2571 scrollBar.show (0);
2529 } 2572 }
2530 2573
2531#endif 2574 if (refresh)
2532 2575 {
2533 /* bgPixmap.apply () does not do the following : */
2534 scr_clear (); 2576 scr_clear ();
2535 scr_touch (true); 2577 scr_touch (true);
2578 }
2536 want_refresh = 1; 2579 want_refresh = 1;
2537} 2580}
2538 2581
2539/* ------------------------------------------------------------------------- */ 2582/* ------------------------------------------------------------------------- */
2540void 2583void
… …
2597 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2640 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2598 srp[col] ^= rstyle; 2641 srp[col] ^= rstyle;
2599} 2642}
2600 2643
2601/* ------------------------------------------------------------------------- */ 2644/* ------------------------------------------------------------------------- */
2602void 2645void ecb_hot
2603rxvt_term::scr_reverse_selection () NOTHROW 2646rxvt_term::scr_reverse_selection () NOTHROW
2604{ 2647{
2605 if (selection.op 2648 if (selection.op
2606 && current_screen == selection.screen 2649 && current_screen == selection.screen
2607 && selection.end.row >= view_start) 2650 && selection.end.row >= view_start)
… …
2626 */ 2669 */
2627#if 0 2670#if 0
2628void 2671void
2629rxvt_term::scr_dump (int fd) NOTHROW 2672rxvt_term::scr_dump (int fd) NOTHROW
2630{ 2673{
2631 int row, wrote; 2674 // if this method is needed, it can be implemented by factoring the
2632 unsigned int width, towrite; 2675 // relevant code in scr_printscreen
2633 char r1[] = "\n";
2634
2635 for (row = saveLines + top_row;
2636 row < saveLines + nrow - 1; row++)
2637 {
2638 width = row_buf[row].l >= 0 ? row_buf[row].l
2639 : ncol;
2640 for (towrite = width; towrite; towrite -= wrote)
2641 {
2642 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2643 towrite);
2644 if (wrote < 0)
2645 return; /* XXX: death, no report */
2646 }
2647 if (row_buf[row].l >= 0)
2648 if (write (fd, r1, 1) <= 0)
2649 return; /* XXX: death, no report */
2650 }
2651} 2676}
2652#endif 2677#endif
2653 2678
2654/* ------------------------------------------------------------------------- * 2679/* ------------------------------------------------------------------------- *
2655 * CHARACTER SELECTION * 2680 * CHARACTER SELECTION *
2656 * ------------------------------------------------------------------------- */ 2681 * ------------------------------------------------------------------------- */
2657void 2682void
2658rxvt_term::selection_check (int check_more) NOTHROW 2683rxvt_term::selection_check (int check_more) NOTHROW
2659{ 2684{
2660 row_col_t pos;
2661
2662 if (!selection.op) 2685 if (!selection.op)
2663 return; 2686 return;
2664 2687
2665 pos.row = pos.col = 0;
2666 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2688 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2667 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2668 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2669 || (check_more == 1 2691 || (check_more == 1
2670 && current_screen == selection.screen 2692 && current_screen == selection.screen
2671 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2693 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2672 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2694 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2673 || (check_more == 2
2674 && ROWCOL_IS_BEFORE (selection.beg, pos)
2675 && ROWCOL_IS_AFTER (selection.end, pos))
2676 || (check_more == 3
2677 && ROWCOL_IS_AFTER (selection.end, pos))
2678 || (check_more == 4 /* screen width change */
2679 && (selection.beg.row != selection.end.row
2680 || selection.end.col > ncol)))
2681 CLEAR_SELECTION (); 2695 CLEAR_ALL_SELECTION ();
2682} 2696}
2683 2697
2684/* ------------------------------------------------------------------------- */ 2698/* ------------------------------------------------------------------------- */
2685/* 2699/*
2686 * Paste a selection direct to the command fd 2700 * Paste a selection direct to the command fd
… …
2692 for (unsigned int i = 0; i < len; i++) 2706 for (unsigned int i = 0; i < len; i++)
2693 if (data[i] == C0_LF) 2707 if (data[i] == C0_LF)
2694 data[i] = C0_CR; 2708 data[i] = C0_CR;
2695 2709
2696 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[200~"); 2711 tt_printf ("\x1b[200~");
2698 2712
2699 tt_write (data, len); 2713 tt_write (data, len);
2700 2714
2701 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2702 tt_printf ("\e[201~"); 2716 tt_printf ("\x1b[201~");
2703} 2717}
2704 2718
2705void 2719void
2706rxvt_term::paste (char *data, unsigned int len) NOTHROW 2720rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{ 2721{
… …
2711 tt_paste (data, len); 2725 tt_paste (data, len);
2712} 2726}
2713 2727
2714/* ------------------------------------------------------------------------- */ 2728/* ------------------------------------------------------------------------- */
2715/* 2729/*
2716 * Respond to a notification that a primary selection has been sent 2730 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2717 * EXT: SelectionNotify 2731 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2718 */ 2732 * as fallback
2719void
2720rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2721{
2722 if (prop == None) /* check for failed XConvertSelection */
2723 {
2724 if ((selection_type & Sel_CompoundText))
2725 {
2726 int selnum = selection_type & Sel_whereMask;
2727
2728 selection_type = 0;
2729 if (selnum != Sel_direct)
2730 selection_request_other (XA_STRING, selnum);
2731 }
2732
2733 if ((selection_type & Sel_UTF8String))
2734 {
2735 int selnum = selection_type & Sel_whereMask;
2736
2737 selection_type = Sel_CompoundText;
2738 if (selnum != Sel_direct)
2739 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2740 else
2741 selection_type = 0;
2742 }
2743
2744 return;
2745 }
2746
2747 unsigned long bytes_after;
2748 XTextProperty ct;
2749
2750 if (XGetWindowProperty (dpy, win, prop,
2751 0, PROP_SIZE / 4,
2752 delete_prop, AnyPropertyType,
2753 &ct.encoding, &ct.format,
2754 &ct.nitems, &bytes_after,
2755 &ct.value) != Success)
2756 {
2757 ct.value = 0;
2758 goto bailout;
2759 }
2760
2761 if (ct.encoding == None)
2762 goto bailout;
2763
2764 if (bytes_after)
2765 {
2766 // fetch and append remaining data
2767 XTextProperty ct2;
2768
2769 if (XGetWindowProperty (dpy, win, prop,
2770 ct.nitems / 4, (bytes_after + 3) / 4,
2771 delete_prop, AnyPropertyType,
2772 &ct2.encoding, &ct2.format,
2773 &ct2.nitems, &bytes_after,
2774 &ct2.value) != Success)
2775 goto bailout;
2776
2777 // realloc should be compatible to XFree, here, and elsewhere, too
2778 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2779 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2780 ct.nitems += ct2.nitems;
2781
2782 XFree (ct2.value);
2783 }
2784
2785 if (ct.value == 0)
2786 goto bailout;
2787
2788 if (ct.encoding == xa[XA_INCR])
2789 {
2790 // INCR selection, start handshake
2791 if (!delete_prop)
2792 XDeleteProperty (dpy, win, prop);
2793
2794 selection_wait = Sel_incr;
2795 incr_buf_fill = 0;
2796 incr_ev.start (10);
2797
2798 goto bailout;
2799 }
2800
2801 if (ct.nitems == 0)
2802 {
2803 if (selection_wait == Sel_incr)
2804 {
2805 XFree (ct.value);
2806
2807 // finally complete, now paste the whole thing
2808 selection_wait = Sel_normal;
2809 ct.value = (unsigned char *)incr_buf;
2810 ct.nitems = incr_buf_fill;
2811 incr_buf = 0;
2812 incr_buf_size = 0;
2813 incr_ev.stop ();
2814 }
2815 else
2816 {
2817 if (selection_wait == Sel_normal
2818 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2819 {
2820 /*
2821 * pass through again trying CUT_BUFFER0 if we've come from
2822 * XConvertSelection () but nothing was presented
2823 */
2824 selection_paste (display->root, XA_CUT_BUFFER0, False);
2825 }
2826
2827 goto bailout;
2828 }
2829 }
2830 else if (selection_wait == Sel_incr)
2831 {
2832 incr_ev.start (10);
2833
2834 while (incr_buf_fill + ct.nitems > incr_buf_size)
2835 {
2836 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2837 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2838 }
2839
2840 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2841 incr_buf_fill += ct.nitems;
2842
2843 goto bailout;
2844 }
2845
2846 char **cl;
2847 int cr;
2848
2849#if !ENABLE_MINIMAL
2850 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2851 // so recode it manually
2852 if (ct.encoding == xa[XA_UTF8_STRING])
2853 {
2854 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2855 char *s = rxvt_wcstombs (w);
2856 free (w);
2857 // TODO: strlen == only the first element will be converted. well...
2858 paste (s, strlen (s));
2859 free (s);
2860 }
2861 else
2862#endif
2863 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2864 && cl)
2865 {
2866 for (int i = 0; i < cr; i++)
2867 paste (cl[i], strlen (cl[i]));
2868
2869 XFreeStringList (cl);
2870 }
2871 else
2872 paste ((char *)ct.value, ct.nitems); // paste raw
2873
2874bailout:
2875 XFree (ct.value);
2876
2877 if (selection_wait == Sel_normal)
2878 selection_wait = Sel_none;
2879}
2880
2881void
2882rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2883{
2884 selection_wait = Sel_none;
2885
2886 incr_buf_size = 0;
2887 free (incr_buf);
2888
2889 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2890}
2891
2892void
2893rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2894{
2895 if (prop == None || selection_wait != Sel_incr)
2896 return;
2897
2898 selection_paste (win, prop, true);
2899}
2900
2901/* ------------------------------------------------------------------------- */
2902/*
2903 * Request the current selection:
2904 * Order: > internal selection if available
2905 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2906 * > CUT_BUFFER0
2907 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2908 * will auto fallback to CUT_BUFFER0
2909 * EXT: button 2 release 2733 * EXT: button 2 release
2910 */ 2734 */
2911void 2735void
2912rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2736rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2913{ 2737{
2914 if (selection.text && selnum == Sel_Primary) 2738 if (!selection_req)
2915 {
2916 /* internal selection */
2917 char *str = rxvt_wcstombs (selection.text, selection.len);
2918 paste (str, strlen (str));
2919 free (str);
2920 return;
2921 } 2739 {
2922 else 2740 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2741 selection_req->run ();
2923 { 2742 }
2924 selection_request_time = tm;
2925 selection_wait = Sel_normal;
2926
2927#if X_HAVE_UTF8_STRING
2928 selection_type = Sel_UTF8String;
2929 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2930 return;
2931#else
2932 selection_type = Sel_CompoundText;
2933 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2934 return;
2935#endif
2936 }
2937
2938 selection_wait = Sel_none; /* don't loop in selection_paste () */
2939 selection_paste (display->root, XA_CUT_BUFFER0, false);
2940}
2941
2942int
2943rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2944{
2945 Atom sel;
2946
2947 selection_type |= selnum;
2948
2949 if (selnum == Sel_Primary)
2950 sel = XA_PRIMARY;
2951 else if (selnum == Sel_Secondary)
2952 sel = XA_SECONDARY;
2953 else
2954 sel = xa[XA_CLIPBOARD];
2955
2956 if (XGetSelectionOwner (dpy, sel) != None)
2957 {
2958 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2959 vt, selection_request_time);
2960 return 1;
2961 }
2962
2963 return 0;
2964} 2743}
2965 2744
2966/* ------------------------------------------------------------------------- */ 2745/* ------------------------------------------------------------------------- */
2967/* 2746/*
2968 * Clear all selected text 2747 * Clear all selected text
… …
2999 * EXT: button 1 or 3 release 2778 * EXT: button 1 or 3 release
3000 */ 2779 */
3001void 2780void
3002rxvt_term::selection_make (Time tm) 2781rxvt_term::selection_make (Time tm)
3003{ 2782{
3004 int i; 2783 int size;
3005 wchar_t *new_selection_text; 2784 wchar_t *new_selection_text;
3006 text_t *t; 2785 text_t *t;
3007 2786
3008 switch (selection.op) 2787 switch (selection.op)
3009 { 2788 {
… …
3025 return; /* nothing selected, go away */ 2804 return; /* nothing selected, go away */
3026 2805
3027 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2806 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3028 return; 2807 return;
3029 2808
3030 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2809 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3031 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2810 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3032 2811
3033 int ofs = 0; 2812 int ofs = 0;
3034 int extra = 0; 2813 int extra = 0;
3035 2814
3036 int col = selection.beg.col; 2815 int col = selection.beg.col;
… …
3042 { 2821 {
3043#if !ENABLE_MINIMAL 2822#if !ENABLE_MINIMAL
3044 if (selection.rect) 2823 if (selection.rect)
3045 { 2824 {
3046 col = selection.beg.col; 2825 col = selection.beg.col;
3047 end_col = ncol + 1; 2826 end_col = selection.end.col;
3048 } 2827 }
3049 else 2828 else
3050#endif 2829#endif
3051 end_col = ROW(row).l; 2830 end_col = ROW(row).l;
3052 2831
3053 col = max (col, 0); 2832 col = max (col, 0);
3054 2833
3055 if (row == selection.end.row 2834 if (row == selection.end.row)
3056#if !ENABLE_MINIMAL
3057 || selection.rect
3058#endif
3059 )
3060 min_it (end_col, selection.end.col); 2835 min_it (end_col, selection.end.col);
3061 2836
3062 t = ROW(row).t + col; 2837 t = ROW(row).t + col;
3063 2838
3064 for (; col < end_col; col++) 2839 for (; col < end_col; col++)
… …
3072 2847
3073 extra -= (len - 1); 2848 extra -= (len - 1);
3074 2849
3075 if (extra < 0) 2850 if (extra < 0)
3076 { 2851 {
3077 extra += i; 2852 extra += size;
3078 i += i; 2853 size += size;
3079 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2854 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3080 } 2855 }
3081 2856
3082 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2857 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3083 } 2858 }
3084#endif 2859#endif
… …
3096 2871
3097 new_selection_text[ofs++] = C0_LF; 2872 new_selection_text[ofs++] = C0_LF;
3098 } 2873 }
3099 else 2874 else
3100#endif 2875#endif
3101 if (!ROW(row).is_longer () && row != selection.end.row) 2876 if (!ROW(row).is_longer ()
2877 && (row != selection.end.row || end_col != selection.end.col)
2878 && (row != selection.beg.row || selection.beg.col < ncol))
3102 new_selection_text[ofs++] = C0_LF; 2879 new_selection_text[ofs++] = C0_LF;
3103 } 2880 }
3104
3105 if (end_col != selection.end.col)
3106 new_selection_text[ofs++] = C0_LF;
3107 2881
3108 new_selection_text[ofs] = 0; 2882 new_selection_text[ofs] = 0;
3109 2883
3110 if (ofs == 0) 2884 if (ofs == 0)
3111 { 2885 {
… …
3167/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
3168/* 2942/*
3169 * 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
3170 * EXT: button 1 press 2944 * EXT: button 1 press
3171 */ 2945 */
3172void 2946void ecb_cold
3173rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2947rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3174{ 2948{
3175 clicks = ((clicks - 1) % 3) + 1; 2949 clicks = ((clicks - 1) % 3) + 1;
3176 selection.clicks = clicks; /* save clicks so extend will work */ 2950 selection.clicks = clicks; /* save clicks so extend will work */
3177 2951
… …
3196 2970
3197/* ------------------------------------------------------------------------- */ 2971/* ------------------------------------------------------------------------- */
3198/* 2972/*
3199 * Mark a selection at the specified col/row 2973 * Mark a selection at the specified col/row
3200 */ 2974 */
3201void 2975void ecb_cold
3202rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2976rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3203{ 2977{
3204 want_refresh = 1; 2978 want_refresh = 1;
3205 2979
3206 selection.mark.row = row + view_start; 2980 selection.mark.row = row + view_start;
… …
3233/* 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 */
3234#define DELIMIT_TEXT(x) \ 3008#define DELIMIT_TEXT(x) \
3235 (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)))
3236#define DELIMIT_REND(x) 1 3010#define DELIMIT_REND(x) 1
3237 3011
3238void 3012void ecb_cold
3239rxvt_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
3240{ 3014{
3241 int col, row, dirnadd, tcol, trow, w1, w2; 3015 int col, row, dirnadd, tcol, trow, w1, w2;
3242 row_col_t bound; 3016 row_col_t bound;
3243 text_t *stp; 3017 text_t *stp;
… …
3317 * EXT: button 3 press; button 1 or 3 drag 3091 * EXT: button 3 press; button 1 or 3 drag
3318 * flag == 0 ==> button 1 3092 * flag == 0 ==> button 1
3319 * flag == 1 ==> button 3 press 3093 * flag == 1 ==> button 3 press
3320 * flag == 2 ==> button 3 motion 3094 * flag == 2 ==> button 3 motion
3321 */ 3095 */
3322void 3096void ecb_cold
3323rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3097rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3324{ 3098{
3325 int col = clamp (Pixel2Col (x), 0, ncol); 3099 int col = clamp (Pixel2Col (x), 0, ncol);
3326 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3100 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3327 3101
… …
3353 3127
3354/* ------------------------------------------------------------------------- */ 3128/* ------------------------------------------------------------------------- */
3355/* 3129/*
3356 * Extend the selection to the specified col/row 3130 * Extend the selection to the specified col/row
3357 */ 3131 */
3358void 3132void ecb_cold
3359rxvt_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
3360{ 3134{
3361 row_col_t pos; 3135 row_col_t pos;
3362 enum { 3136 enum {
3363 LEFT, RIGHT 3137 LEFT, RIGHT
… …
3554 ::swap (selection.beg.col, selection.end.col); 3328 ::swap (selection.beg.col, selection.end.col);
3555#endif 3329#endif
3556} 3330}
3557 3331
3558#if !ENABLE_MINIMAL 3332#if !ENABLE_MINIMAL
3559void 3333void ecb_cold
3560rxvt_term::selection_remove_trailing_spaces () NOTHROW 3334rxvt_term::selection_remove_trailing_spaces () NOTHROW
3561{ 3335{
3562 int32_t end_col, end_row; 3336 int32_t end_col, end_row;
3563 text_t *stp; 3337 text_t *stp;
3564 3338
… …
3602/* ------------------------------------------------------------------------- */ 3376/* ------------------------------------------------------------------------- */
3603/* 3377/*
3604 * Double click on button 3 when already selected 3378 * Double click on button 3 when already selected
3605 * EXT: button 3 double click 3379 * EXT: button 3 double click
3606 */ 3380 */
3607void 3381void ecb_cold
3608rxvt_term::selection_rotate (int x, int y) NOTHROW 3382rxvt_term::selection_rotate (int x, int y) NOTHROW
3609{ 3383{
3610 selection.clicks = selection.clicks % 3 + 1; 3384 selection.clicks = selection.clicks % 3 + 1;
3611 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3385 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3612} 3386}
… …
3614/* ------------------------------------------------------------------------- */ 3388/* ------------------------------------------------------------------------- */
3615/* 3389/*
3616 * Respond to a request for our current selection 3390 * Respond to a request for our current selection
3617 * EXT: SelectionRequest 3391 * EXT: SelectionRequest
3618 */ 3392 */
3619void 3393void ecb_cold
3620rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3394rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3621{ 3395{
3396 Atom property = rq.property == None ? rq.target : rq.property;
3622 XSelectionEvent ev; 3397 XSelectionEvent ev;
3623 3398
3624 ev.type = SelectionNotify; 3399 ev.type = SelectionNotify;
3625 ev.property = None; 3400 ev.property = None;
3626 ev.display = rq.display; 3401 ev.display = rq.display;
… …
3641 *target++ = xa[XA_COMPOUND_TEXT]; 3416 *target++ = xa[XA_COMPOUND_TEXT];
3642#if X_HAVE_UTF8_STRING 3417#if X_HAVE_UTF8_STRING
3643 *target++ = xa[XA_UTF8_STRING]; 3418 *target++ = xa[XA_UTF8_STRING];
3644#endif 3419#endif
3645 3420
3646 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3421 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3647 32, PropModeReplace, 3422 32, PropModeReplace,
3648 (unsigned char *)target_list, target - target_list); 3423 (unsigned char *)target_list, target - target_list);
3649 ev.property = rq.property; 3424 ev.property = property;
3650 } 3425 }
3651#if TODO // TODO 3426#if TODO // TODO
3652 else if (rq.target == xa[XA_MULTIPLE]) 3427 else if (rq.target == xa[XA_MULTIPLE])
3653 { 3428 {
3654 /* TODO: Handle MULTIPLE */ 3429 /* TODO: Handle MULTIPLE */
3655 } 3430 }
3656#endif 3431#endif
3657 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)
3658 { 3433 {
3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3434 XChangeProperty (dpy, rq.requestor, property, rq.target,
3660 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3435 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property; 3436 ev.property = property;
3662 } 3437 }
3663 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)
3664 { 3439 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3440 XChangeProperty (dpy, rq.requestor, property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3441 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3667 ev.property = rq.property; 3442 ev.property = property;
3668 } 3443 }
3669 else if (rq.target == XA_STRING 3444 else if (rq.target == XA_STRING
3670 || rq.target == xa[XA_TEXT] 3445 || rq.target == xa[XA_TEXT]
3671 || rq.target == xa[XA_COMPOUND_TEXT] 3446 || rq.target == xa[XA_COMPOUND_TEXT]
3672 || rq.target == xa[XA_UTF8_STRING] 3447 || rq.target == xa[XA_UTF8_STRING]
… …
3743 ct.value = (unsigned char *)cl; 3518 ct.value = (unsigned char *)cl;
3744 ct.nitems = selectlen; 3519 ct.nitems = selectlen;
3745 ct.encoding = target; 3520 ct.encoding = target;
3746 } 3521 }
3747 3522
3748 XChangeProperty (dpy, rq.requestor, rq.property, 3523 XChangeProperty (dpy, rq.requestor, property,
3749 ct.encoding, 8, PropModeReplace, 3524 ct.encoding, 8, PropModeReplace,
3750 ct.value, (int)ct.nitems); 3525 ct.value, (int)ct.nitems);
3751 ev.property = rq.property; 3526 ev.property = property;
3752 3527
3753 if (freect) 3528 if (freect)
3754 XFree (ct.value); 3529 XFree (ct.value);
3755 } 3530 }
3756 3531
3757 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3532 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3758} 3533}
3759 3534
3760/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3761#ifdef USE_XIM 3536#if USE_XIM
3762void 3537void ecb_cold
3763rxvt_term::im_set_position (XPoint &pos) NOTHROW 3538rxvt_term::im_set_position (XPoint &pos) NOTHROW
3764{ 3539{
3765 XWindowAttributes xwa; 3540 XWindowAttributes xwa;
3766 3541
3767 XGetWindowAttributes (dpy, vt, &xwa); 3542 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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