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.342 by root, Thu Jul 1 20:02:43 2010 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <inttypes.h> 32#include <inttypes.h>
32 33
33#include "salloc.C" // HACK, should be a seperate compile! 34static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
41/* ------------------------------------------------------------------------- */ 41/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 42#define TABSIZE 8 /* default tab size */
45 43
46/* ------------------------------------------------------------------------- * 44/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 45 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 46 * ------------------------------------------------------------------------- */
… …
99 97
100/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
101void 99void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 101{
104 if (!l.t) 102 if (!l.valid ())
105 { 103 {
106 lalloc (l); 104 l.alloc ();
107 col = 0; 105 col = 0;
108 width = ncol; 106 width = ncol;
109 } 107 }
110 108
111 l.touch (); 109 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 141 col--;
144 142
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
145
146 l.touch ();
147 147
148 // found start, nuke 148 // found start, nuke
149 do { 149 do {
150 l.t[col] = ' '; 150 l.t[col] = ' ';
151 l.r[col] = rend; 151 l.r[col] = rend;
152 col++; 152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
154} 154}
155 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
156/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
159 169
160void 170void
171rxvt_term::scr_alloc () NOTHROW
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
161rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
162{ 216{
217#if ENABLE_OVERLAY
218 scr_overlay_off ();
219#endif
220
163 view_start = 0; 221 view_start = 0;
164 num_scr = 0; 222 num_scr = 0;
165 223
166 if (ncol == 0) 224 if (ncol == 0)
167 ncol = 80; 225 ncol = 80;
… …
187 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
188 246
189 screen.tscroll = 0; 247 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
191 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
192 if (!row_buf) 258 if (!prev_row_buf)
193 { 259 {
194 /*
195 * first time called so just malloc everything: don't rely on realloc
196 */
197 top_row = 0; 260 top_row = 0;
198 term_start = 0; 261 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 262
214 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
240 { 289 {
241 /* 290 /*
242 * add or delete rows as appropriate 291 * add or delete rows as appropriate
243 */ 292 */
244 293
245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247
248#if 0
249 if (nrow < prev_nrow)
250 {
251 for (int row = nrow; row < prev_nrow; row++)
252 {
253 lfree (swap_buf [row]);
254 lfree (drawn_buf[row]);
255 }
256 }
257#endif
258
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 295
262 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
263 { 297 {
264 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
265 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
266 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
267 301
268 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
269 { 303 }
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 }
273
274 line_t *old_buf = row_buf;
275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 304
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
280 308
… …
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 317
290 do 318 do
291 { 319 {
292 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
293 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
294 int plines = 1; 322 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 324
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 326 {
299 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
300 328
301 plines++; 329 plines++;
302 llen += prev_ncol; 330 llen += prev_ncol;
… …
315 343
316 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
318 { 346 {
319 qline = row_buf + qrow; 347 qline = row_buf + qrow;
320 lalloc (*qline); 348 qline->alloc (); // redundant with next line
321 qline->l = ncol; 349 qline->l = ncol;
322 qline->is_longer (1); 350 qline->is_longer (1);
323 351
324 int qcol = 0; 352 int qcol = 0;
325 353
… …
340 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
341 // least. 369 // least.
342 if (prow == ocur.row) 370 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
344 372
345 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
346 374
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 376
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 399 {
372 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
373 401
374 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
375 { 403 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
378 406
379 qline = pline; 407 copy_line (dst, src);
380 lresize (qline);
381 } 408 }
382 409
383 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 412
388 term_start = 0; 413 term_start = 0;
389 } 414 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 415
395 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 418 }
398 419
420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
399 free (tabs); 429 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
401 431
402 for (int col = ncol; --col; ) 432 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
404 434
405 CLEAR_ALL_SELECTION (); 435 CLEAR_ALL_SELECTION ();
406 436
407 prev_nrow = nrow; 437 prev_nrow = nrow;
… …
410 tt_winch (); 440 tt_winch ();
411 441
412 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413} 443}
414 444
415/* ------------------------------------------------------------------------- */ 445void ecb_cold
416/*
417 * Free everything. That way malloc debugging can find leakage.
418 */
419void
420rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () NOTHROW
421{ 447{
422 if (row_buf) 448 chunk_free (chunk, chunk_size);
423 { 449 chunk = 0;
424 delete talloc; talloc = 0; 450 row_buf = 0;
425 delete ralloc; ralloc = 0;
426 451
427 free (row_buf);
428 free (swap_buf);
429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
432 free (tabs); 452 free (tabs);
433 tabs = 0; 453 tabs = 0;
434 }
435} 454}
436 455
437/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
438/* 457/*
439 * Hard/Soft reset 458 * Hard/Soft reset
440 */ 459 */
441void 460void ecb_cold
442rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
443{ 462{
444 scr_release (); 463 scr_release ();
464
445 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false; 466 rvideo_mode = false;
447 scr_soft_reset (); 467 scr_soft_reset ();
448 scr_reset (); 468 scr_reset ();
449 469
450 scr_clear (true); 470 scr_clear (true);
451 scr_refresh (); 471 scr_refresh ();
452} 472}
453 473
454void 474void ecb_cold
455rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () NOTHROW
456{ 476{
457 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
459 scr_overlay_off (); 479 scr_overlay_off ();
460#endif 480#endif
… …
515 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
516 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
517} 537}
518 538
519void 539void
520rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () NOTHROW
521{ 541{
522 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
523 return; 543 return;
524 544
525 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
544 return; 564 return;
545 565
546 want_refresh = 1; 566 want_refresh = 1;
547 view_start = 0; 567 view_start = 0;
548 568
549 selection_check (2); /* check for boundary cross */ 569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
550 575
551 current_screen = scrn; 576 current_screen = scrn;
552 577
553#if NSCREENS 578#if NSCREENS
554 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
620/* 645/*
621 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
622 * count positive ==> scroll up 647 * count positive ==> scroll up
623 * count negative ==> scroll down 648 * count negative ==> scroll down
624 */ 649 */
625int 650int ecb_hot
626rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
627{ 652{
628 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
629 return 0; 654 return 0;
630 655
… …
633 658
634 if (count > 0 659 if (count > 0
635 && row1 == 0 660 && row1 == 0
636 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
637 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
638 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
639
640 // scroll everything up 'count' lines
641 term_start = (term_start + count) % total_rows;
642 666
643 // sever bottommost line 667 // sever bottommost line
644 { 668 {
645 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
646 l.is_longer (0); 670 l.is_longer (0);
647 l.touch (); 671 l.touch ();
648 } 672 }
649 673
674 // scroll everything up 'count' lines
675 term_start = (term_start + count) % total_rows;
676
677 // now copy lines below the scroll region bottom to the
678 // bottom of the screen again, so they look as if they
679 // hadn't moved.
680 for (int i = nrow; --i > row2; )
681 {
682 line_t &l1 = ROW(i - count);
683 line_t &l2 = ROW(i);
684
685 ::swap (l1, l2);
686 l2.touch ();
687 }
688
650 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
651 for (int i = count; i--; ) 690 for (int i = count; i--; )
652 { 691 {
653 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
654 693
655 // optimize if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
657 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 696 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
658 { 697 {
659 scr_blank_line (l, 0, l.l, rstyle); 698 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0; 699 l.l = 0;
… …
662 } 701 }
663 else 702 else
664 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
665 } 704 }
666 705
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
679 // move and/or clear selection, if any 706 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
681 { 709 {
682 selection.beg.row -= count; 710 selection.beg.row -= count;
683 selection.end.row -= count; 711 selection.end.row -= count;
684 selection.mark.row -= count; 712 selection.mark.row -= count;
685 713
686 if (selection.beg.row < top_row 714 selection_check (0);
687 || selection.end.row < top_row
688 || selection.mark.row < top_row)
689 {
690 CLEAR_ALL_SELECTION ();
691 selection.op = SELECTION_CLEAR;
692 }
693 } 715 }
694 716
695 // finally move the view window, if desired 717 // finally move the view window, if desired
696 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
697 && view_start != 0 719 && view_start != 0
698 && view_start != -saveLines) 720 && view_start != -saveLines)
699 scr_page (UP, count); 721 scr_page (count);
700 722
701 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
702 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
703 } 725 }
704 else 726 else
… …
727 } 749 }
728 750
729 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
730 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
731 753
754 // sever line above scroll region
755 if (row1)
756 {
757 line_t &l = ROW(row1 - 1);
758 l.is_longer (0);
759 l.touch ();
760 }
761
732 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
733 763
734 min_it (count, rows); 764 min_it (count, rows);
735 765
736 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
737 767
738 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
739 { 769 {
740 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
741 771
… …
743 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
744 } 774 }
745 775
746 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
747 ROW(row1 + row) = temp_buf [row]; 777 ROW(row1 + row) = temp_buf [row];
778
779 // sever bottommost line
780 {
781 line_t &l = ROW(row2);
782 l.is_longer (0);
783 l.touch ();
784 }
748 } 785 }
749 786
750 return count; 787 return count;
751} 788}
752 789
753/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
754/* 791/*
755 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
756 */ 793 */
757void 794void ecb_hot
758rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
759{ 796{
760 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
761 return; 798 return;
762 799
763 unsigned char checksel; 800 bool checksel;
764 unicode_t c; 801 unicode_t c;
765 int ncol = this->ncol; 802 int ncol = this->ncol;
766 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
767 804
768 want_refresh = 1; 805 want_refresh = 1;
… …
794 831
795 while (str < strend) 832 while (str < strend)
796 { 833 {
797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
798 835
799 if (expect_false (c < 0x20)) 836 if (ecb_unlikely (c < 0x20))
800 if (c == C0_LF) 837 if (c == C0_LF)
801 { 838 {
802 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
803 840
804 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
823 { 860 {
824 scr_tab (1, true); 861 scr_tab (1, true);
825 continue; 862 continue;
826 } 863 }
827 864
828 if (expect_false ( 865 if (ecb_unlikely (
829 checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
831 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 )) 869 ))
833 { 870 {
… …
838 * should be a similar check. 875 * should be a similar check.
839 */ 876 */
840 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
841 } 878 }
842 879
843 if (expect_false (screen.flags & Screen_WrapNext)) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
844 { 881 {
845 scr_do_wrap (); 882 scr_do_wrap ();
846 883
847 line->l = ncol; 884 line->l = ncol;
848 line->is_longer (1); 885 line->is_longer (1);
… …
850 row = screen.cur.row; 887 row = screen.cur.row;
851 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
852 } 889 }
853 890
854 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
856 c = 0xfffd; 893 c = 0xfffd;
857 894
858 // rely on wcwidth to tell us the character width, do wcwidth before 895 // rely on wcwidth to tell us the character width, do wcwidth before
859 // further replacements, as wcwidth might return -1 for the line 896 // further replacements, as wcwidth might return -1 for the line
860 // drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
861 // locale. 898 // locale.
862 int width = WCWIDTH (c); 899 int width = WCWIDTH (c);
863 900
864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
865 { 902 {
866 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
867 // 5f-7e standard vt100 904 // 5f-7e standard vt100
868 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
869 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
882 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
883 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
884 } 921 }
885 } 922 }
886 923
887 if (expect_false (screen.flags & Screen_Insert)) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
888 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
889 926
890 if (width != 0) 927 if (width != 0)
891 { 928 {
892#if !UNICODE_3 929#if !UNICODE_3
… …
897# else 934# else
898 c = 0xfffd; 935 c = 0xfffd;
899# endif 936# endif
900#endif 937#endif
901 938
939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
940
941 // if the character doesn't fit into the remaining columns...
942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
943 {
944 if (screen.flags & Screen_Autowrap)
945 {
946 // ... artificially enlargen the previous one
947 c = NOCHAR;
948 // and try the same character next loop iteration
949 --str;
950 }
951 else
952 screen.cur.col = ncol - width;
953 }
954
902 // nuke the character at this position, if required 955 // nuke the character at this position, if required
903 if (expect_false ( 956 // due to wonderful coincidences everywhere else in this loop
957 // we never have to check for overwriting a wide char itself,
958 // only its tail.
904 line->t[screen.cur.col] == NOCHAR 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
905 || (screen.cur.col < ncol - 1
906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col); 960 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 {
915 // ... artificially enlargen the previous one
916 c = NOCHAR;
917 // and try the same character next loop iteration
918 --str;
919 }
920 961
921 line->touch (); 962 line->touch ();
922 963
923 do 964 do
924 { 965 {
925 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
926 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
927 968
928 if (expect_true (screen.cur.col < ncol - 1)) 969 if (ecb_likely (screen.cur.col < ncol - 1))
929 screen.cur.col++; 970 screen.cur.col++;
930 else 971 else
931 { 972 {
932 line->l = ncol; 973 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 975 screen.flags |= Screen_WrapNext;
935 break; 976
977 goto end_of_line;
936 } 978 }
937 979
938 c = NOCHAR; 980 c = NOCHAR;
939 } 981 }
940 while (expect_false (--width > 0)); 982 while (ecb_unlikely (--width > 0));
941 983
942 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
944 { 986 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 987 line->t[c] = ' ';
950 line->r[c] = rend; 988 line->r[c] = rend;
951 }
952 } 989 }
990
991end_of_line:
992 ;
953 } 993 }
954#if ENABLE_COMBINING 994#if ENABLE_COMBINING
955 else // width == 0 995 else // width == 0
956 { 996 {
957 if (c != 0xfeff) // ignore BOM 997 if (c != 0xfeff) // ignore BOM
… …
972 } 1012 }
973 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
975 { 1015 {
976 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
978 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
979 } 1019 }
980 else 1020 else
981 continue; 1021 continue;
982 1022
983 linep->touch (); 1023 linep->touch ();
… …
1020 1060
1021 want_refresh = 1; 1061 want_refresh = 1;
1022#endif 1062#endif
1023 } 1063 }
1024 } 1064 }
1065 else if (screen.flags & Screen_WrapNext)
1066 screen.flags &= ~Screen_WrapNext;
1025 else 1067 else
1026 scr_gotorc (0, -1, RELATIVE); 1068 scr_gotorc (0, -1, RELATIVE);
1027} 1069}
1028 1070
1029/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
… …
1107 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1108 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1109 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1110 */ 1152 */
1111#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1112void 1154void ecb_cold
1113rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1114{ 1156{
1115 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1116 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1117 else 1159 else
… …
1124 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1125 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1126 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1127 */ 1169 */
1128#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1129void 1171void ecb_cold
1130rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1131{ 1173{
1132 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1133 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1134 else 1176 else
… …
1199 * direction should be UP or DN 1241 * direction should be UP or DN
1200 */ 1242 */
1201void 1243void
1202rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1203{ 1245{
1204 int dirn;
1205
1206 want_refresh = 1; 1246 want_refresh = 1;
1207 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1208 1248
1209 dirn = ((direction == UP) ? 1 : -1);
1210
1211 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1212 1250
1213 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1214 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1215 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1216 else 1254 else
1217 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1218 1256
1219 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1220 selection_check (0); 1258 selection_check (0);
1221} 1259}
1222 1260
… …
1285 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1286} 1324}
1287 1325
1288/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1289/* 1327/*
1290 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1291 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1292 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1293 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1294 */ 1332 */
1295void 1333void
… …
1304 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1305 1343
1306 switch (mode) 1344 switch (mode)
1307 { 1345 {
1308 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1309 selection_check (1);
1310 scr_erase_line (0); 1347 scr_erase_line (0);
1311 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1312 num = nrow - row; 1349 num = nrow - row;
1313 break; 1350 break;
1314 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1315 selection_check (3);
1316 scr_erase_line (1); 1352 scr_erase_line (1);
1317 row = 0; 1353 row = 0;
1318 num = screen.cur.row; 1354 num = screen.cur.row;
1319 break; 1355 break;
1320 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1321 selection_check (3);
1322 row = 0; 1357 row = 0;
1323 num = nrow; 1358 num = nrow;
1324 break; 1359 break;
1325 default: 1360 default:
1326 return; 1361 return;
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1370 if (row >= nrow) /* Out Of Bounds */
1336 return; 1371 return;
1337 1372
1338 min_it (num, nrow - row); 1373 min_it (num, nrow - row);
1339 1374
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1343 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1375 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1376 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1377 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1378 {
1347 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1348 1380
1349 if (mapped && !view_start) 1381 if (mapped)
1350 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1352 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1353 } 1385 }
1354 else 1386 else
1355 { 1387 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1389
1358 if (mapped && !view_start) 1390 if (mapped)
1359 { 1391 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1364 (unsigned int)width, 1396 (unsigned int)vt_width,
1365 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1366 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 } 1400 }
1369 } 1401 }
1370 1402
1371 for (; num--; row++) 1403 for (; num--; row++)
1372 { 1404 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1405 scr_blank_screen_mem (ROW(row), rstyle);
1374 1406
1375 if (!view_start) 1407 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1408 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1409 }
1378} 1410}
1379 1411
1380#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1381void 1413void
… …
1391/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1392/* 1424/*
1393 * Fill the screen with `E's 1425 * Fill the screen with `E's
1394 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1395 */ 1427 */
1396void 1428void ecb_cold
1397rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1398{ 1430{
1399 rend_t fs; 1431 rend_t fs;
1400 1432
1401 want_refresh = 1; 1433 want_refresh = 1;
1402 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1403 1435
1404 num_scr_allow = 0; 1436 num_scr_allow = 0;
1405 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1406 1442
1407 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1408 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1409 { 1445 {
1410 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1561/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1562/* 1598/*
1563 * Set the scrolling region 1599 * Set the scrolling region
1564 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1565 */ 1601 */
1566void 1602void ecb_cold
1567rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1568{ 1604{
1569 max_it (top, 0); 1605 max_it (top, 0);
1570 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1571 1607
… …
1581/* 1617/*
1582 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1583 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1584 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1585 */ 1621 */
1586void 1622void ecb_cold
1587rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) NOTHROW
1588{ 1624{
1589 want_refresh = 1; 1625 want_refresh = 1;
1590 1626
1591 if (mode) 1627 if (mode)
… …
1598/* 1634/*
1599 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1600 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1601 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1602 */ 1638 */
1603void 1639void ecb_cold
1604rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) NOTHROW
1605{ 1641{
1606 if (mode) 1642 if (mode)
1607 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1608 else 1644 else
… …
1617 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1618 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1619 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1620 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1621 */ 1657 */
1622void 1658void ecb_cold
1623rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) NOTHROW
1624{ 1660{
1625 if (mode) 1661 if (mode)
1626 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1627 else 1663 else
… …
1634/* 1670/*
1635 * Set insert/replace mode 1671 * Set insert/replace mode
1636 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1637 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1638 */ 1674 */
1639void 1675void ecb_cold
1640rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) NOTHROW
1641{ 1677{
1642 if (mode) 1678 if (mode)
1643 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1644 else 1680 else
… …
1650 * Set/Unset tabs 1686 * Set/Unset tabs
1651 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1652 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1653 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1654 */ 1690 */
1655void 1691void ecb_cold
1656rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) NOTHROW
1657{ 1693{
1658 if (mode < 0) 1694 if (mode < 0)
1659 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1660 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
… …
1679 if (rvideo_state != on) 1715 if (rvideo_state != on)
1680 { 1716 {
1681 rvideo_state = on; 1717 rvideo_state = on;
1682 1718
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1719 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1720#ifdef HAVE_IMG
1685 if (bgPixmap.pixmap == None) 1721 if (bg_img == 0)
1686#endif 1722#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1723 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1724
1689 XGCValues gcvalue; 1725 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1726 gcvalue.foreground = pix_colors[Color_fg];
… …
1699/* ------------------------------------------------------------------------- */ 1735/* ------------------------------------------------------------------------- */
1700/* 1736/*
1701 * Report current cursor position 1737 * Report current cursor position
1702 * XTERM_SEQ: Report position: ESC [ 6 n 1738 * XTERM_SEQ: Report position: ESC [ 6 n
1703 */ 1739 */
1704void 1740void ecb_cold
1705rxvt_term::scr_report_position () NOTHROW 1741rxvt_term::scr_report_position () NOTHROW
1706{ 1742{
1707 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1743 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1708} 1744}
1709 1745
… …
1712 * ------------------------------------------------------------------------- */ 1748 * ------------------------------------------------------------------------- */
1713 1749
1714/* 1750/*
1715 * Set font style 1751 * Set font style
1716 */ 1752 */
1717void 1753void ecb_cold
1718rxvt_term::set_font_style () NOTHROW 1754rxvt_term::set_font_style () NOTHROW
1719{ 1755{
1720#if 0 1756#if 0
1721 switch (charsets [screen.charset]) 1757 switch (charsets [screen.charset])
1722 { 1758 {
… …
1744 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1780 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1745 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1781 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1746 * XTERM_SEQ: Invoke G2 character set: ESC N 1782 * XTERM_SEQ: Invoke G2 character set: ESC N
1747 * XTERM_SEQ: Invoke G3 character set: ESC O 1783 * XTERM_SEQ: Invoke G3 character set: ESC O
1748 */ 1784 */
1749void 1785void ecb_cold
1750rxvt_term::scr_charset_choose (int set) NOTHROW 1786rxvt_term::scr_charset_choose (int set) NOTHROW
1751{ 1787{
1752 screen.charset = set; 1788 screen.charset = set;
1753 set_font_style (); 1789 set_font_style ();
1754} 1790}
… …
1775 * ------------------------------------------------------------------------- */ 1811 * ------------------------------------------------------------------------- */
1776 1812
1777/* 1813/*
1778 * refresh matching text. 1814 * refresh matching text.
1779 */ 1815 */
1780bool 1816bool ecb_cold
1781rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1817rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1782{ 1818{
1783 bool found = false; 1819 bool found = false;
1784 1820
1785 for (int i = 0; i < nrow; i++) 1821 for (int i = 0; i < nrow; i++)
… …
1804 PART_BEG = 0, 1840 PART_BEG = 0,
1805 PART_END, 1841 PART_END,
1806 RC_COUNT 1842 RC_COUNT
1807}; 1843};
1808 1844
1809void 1845void ecb_hot
1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1846rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1811{ 1847{
1812 int i; 1848 int i;
1813 row_col_t rc[RC_COUNT]; 1849 row_col_t rc[RC_COUNT];
1814 1850
… …
1851 * Refresh the entire screen 1887 * Refresh the entire screen
1852 */ 1888 */
1853void 1889void
1854rxvt_term::scr_touch (bool refresh) NOTHROW 1890rxvt_term::scr_touch (bool refresh) NOTHROW
1855{ 1891{
1856 scr_expose (0, 0, width, height, refresh); 1892 scr_expose (0, 0, vt_width, vt_height, refresh);
1857} 1893}
1858 1894
1859/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1860/* 1896/*
1861 * Move the display so that the line represented by scrollbar value Y is at 1897 * Move the display so that the line represented by scrollbar value Y is at
1862 * the top of the screen 1898 * the top of the screen
1863 */ 1899 */
1864void 1900void
1865rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1866{ 1902{
1867 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1903 // lerp (y, 0, len, top_row, nrow - 1)
1904 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1868} 1905}
1869 1906
1870/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1871/* 1908/*
1872 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1873 * direction should be UP or DN 1910 * direction should be UP or DN
1874 */ 1911 */
1875bool 1912bool
1876rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1877{ 1914{
1878 int new_view_start =
1879 direction == UP ? view_start - nlines
1880 : view_start + nlines;
1881
1882 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1883} 1916}
1884 1917
1885bool 1918bool
1886rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1887{ 1920{
… …
1917 1950
1918# ifndef NO_MAPALERT 1951# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1952# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1953 if (option (Opt_mapAlert))
1921# endif 1954# endif
1922 XMapWindow (dpy, parent[0]); 1955 XMapWindow (dpy, parent);
1923# endif 1956# endif
1924 1957
1925# if ENABLE_FRILLS 1958# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1959 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1960 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1973 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1974#endif
1942} 1975}
1943 1976
1944/* ------------------------------------------------------------------------- */ 1977/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */ 1978void ecb_cold
1946void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1979rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1980{
1949#ifdef PRINTPIPE 1981#ifdef PRINTPIPE
1950 int nrows, row_start; 1982 int nrows, row_start;
1951 FILE *fd = popen_printer (); 1983 FILE *fd = popen_printer ();
… …
2000/* 2032/*
2001 * Refresh the screen 2033 * Refresh the screen
2002 * drawn_text/drawn_rend contain the screen information before the update. 2034 * drawn_text/drawn_rend contain the screen information before the update.
2003 * screen.text/screen.rend contain what the screen will change to. 2035 * screen.text/screen.rend contain what the screen will change to.
2004 */ 2036 */
2005void 2037void ecb_hot
2006rxvt_term::scr_refresh () NOTHROW 2038rxvt_term::scr_refresh () NOTHROW
2007{ 2039{
2008 int16_t col, row, /* column/row we're processing */ 2040 int16_t col, row, /* column/row we're processing */
2009 ocrow; /* old cursor row */ 2041 ocrow; /* old cursor row */
2010 int i; /* tmp */ 2042 int i; /* tmp */
2011#ifndef NO_CURSORCOLOR
2012 rend_t cc1; /* store colours at cursor position (s) */
2013#endif
2014 rend_t *crp; // cursor rendition pointer
2015 rend_t ccol1, /* Cursor colour */ 2043 rend_t ccol1, /* Cursor colour */
2016 ccol2; /* Cursor colour2 */ 2044 ccol2; /* Cursor colour2 */
2045 rend_t cur_rend;
2046 int cur_col;
2047 int cursorwidth;
2017 2048
2018 want_refresh = 0; /* screen is current */ 2049 want_refresh = 0; /* screen is current */
2019 2050
2020 if (refresh_type == NO_REFRESH || !mapped) 2051 if (refresh_type == NO_REFRESH || !mapped)
2021 return; 2052 return;
… …
2024 * A: set up vars 2055 * A: set up vars
2025 */ 2056 */
2026 refresh_count = 0; 2057 refresh_count = 0;
2027 2058
2028 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2060 bool have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2031 have_bg = bgPixmap.pixmap != None; 2062 have_bg = bg_img != 0;
2032#endif 2063#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2065
2035 /* 2066 /*
2036 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
… …
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY 2072#if ENABLE_OVERLAY
2042 scr_swap_overlay (); 2073 scr_swap_overlay ();
2043#endif 2074#endif
2044 2075
2045 char showcursor = screen.flags & Screen_VisibleCursor; 2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2046 2077
2047 /* 2078 /*
2048 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2049 */ 2080 */
2050 { 2081 {
2051 unsigned char setoldcursor;
2052
2053#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2083 if (hidden_cursor)
2055 showcursor = 0; 2084 showcursor = 0;
2056#endif 2085#endif
2057 2086
… …
2060 int col = screen.cur.col; 2089 int col = screen.cur.col;
2061 2090
2062 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2063 col--; 2092 col--;
2064 2093
2094 cursorwidth = 1;
2095 while (col + cursorwidth < ncol
2096 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2097 cursorwidth++;
2098
2065 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2066 2101
2067#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2068 cc1 = *crp & (RS_fgMask | RS_bgMask);
2069 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2070 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2071 else 2105 else
2072#endif 2106#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2085 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2086#else 2120#else
2087 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2088#endif 2122#endif
2089 2123
2090 if (focus) 2124 if (focus && cursor_type == 0)
2091 { 2125 {
2092 if (option (Opt_cursorUnderline)) 2126 rend_t rend = cur_rend;
2093 *crp ^= RS_Uline; 2127
2094 else
2095 {
2096 *crp ^= RS_RVid; 2128 rend ^= RS_RVid;
2097 *crp = SET_FGCOLOR (*crp, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2098 *crp = SET_BGCOLOR (*crp, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2099 } 2131
2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2100 } 2133 }
2101 } 2134 }
2102 2135
2103 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2104 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2105 if (ocrow != -1) 2138 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2139
2140 // save the current cursor coordinates if the cursor is visible
2141 // and either the window is unfocused or the cursor style is
2142 // underline or vertical bar, so as to clear the outline cursor in
2143 // the next refresh if the cursor moves or becomes invisible
2144 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2106 { 2145 {
2107 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2108 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2109 {
2110 if (ocrow < nrow
2111 && oldcursor.col < ncol)
2112 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2113
2114 if (focus || !showcursor)
2115 oldcursor.row = -1;
2116 else
2117 setoldcursor = 1;
2118 }
2119 } 2148 }
2120 else if (!focus) 2149 else
2121 setoldcursor = 1;
2122
2123 if (setoldcursor)
2124 {
2125 if (screen.cur.row - view_start >= nrow)
2126 oldcursor.row = -1; 2150 oldcursor.row = -1;
2127 else
2128 {
2129 oldcursor.row = screen.cur.row - view_start;
2130 oldcursor.col = screen.cur.col;
2131 }
2132 }
2133 } 2151 }
2134 2152
2135#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2136 /* 2154 /*
2137 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
… …
2143 { 2161 {
2144 int16_t nits; 2162 int16_t nits;
2145 int i = num_scr; 2163 int i = num_scr;
2146 int j; 2164 int j;
2147 int len, wlen; 2165 int len, wlen;
2148 dLocal (int, num_scr);
2149 2166
2150 j = nrow; 2167 j = nrow;
2151 wlen = len = -1; 2168 wlen = len = -1;
2152 row = i > 0 ? 0 : j - 1; 2169 row = i > 0 ? 0 : j - 1;
2153 2170
… …
2219 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2220 2237
2221 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2222 { 2239 {
2223 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2224 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2225 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2226 || (stp[col] == ' ' /* space w/ no background change */
2227 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2228 continue; 2242 continue;
2229 2243
2230 // redraw one or more characters 2244 // redraw one or more characters
2231 2245
2232 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2247 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2248 --col;
2235 2249
2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2250 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2251 text_t *text = stp + col;
2238 int count = 1; 2252 int count = 1;
… …
2276 2290
2277 col--; /* went one too far. move back */ 2291 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2292 count -= i; /* dump any matching trailing chars */
2279 2293
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2294 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2295 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2296 count++, i--;
2283 2297
2284 /* 2298 /*
2285 * Determine the attributes for the string 2299 * Determine the attributes for the string
2286 */ 2300 */
2287 int fore = fgcolor_of (rend); // desired foreground 2301 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2302 int back = bgcolor_of (rend); // desired background
2289 2303
2290 // only do special processing if any attributes are set, which is unlikely 2304 // only do special processing if any attributes are set, which is unlikely
2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2305 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2306 {
2293 bool invert = rend & RS_RVid; 2307 bool invert = rend & RS_RVid;
2294 2308
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2309#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2310 if (rend & RS_Bold && fore == Color_fg)
… …
2385 /* 2399 /*
2386 * Actually do the drawing of the string here 2400 * Actually do the drawing of the string here
2387 */ 2401 */
2388 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2402 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2389 2403
2390 if (expect_true (have_bg && back == Color_bg)) 2404 if (ecb_likely (have_bg && back == Color_bg))
2391 { 2405 {
2392 // this is very ugly, maybe push it into ->draw? 2406 // this is very ugly, maybe push it into ->draw?
2393 2407
2394 for (i = 0; i < count; i++) /* don't draw empty strings */ 2408 for (i = 0; i < count; i++) /* don't draw empty strings */
2395 if (text[i] != ' ') 2409 if (text[i] != ' ')
… …
2402 did_clear: ; 2416 did_clear: ;
2403 } 2417 }
2404 else 2418 else
2405 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2406 2420
2407 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2408 { 2422 {
2423 if (showcursor && focus && row == screen.cur.row
2424 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2425 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426 else
2409#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2410 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2411 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2412 else 2430 else
2413#endif 2431#endif
… …
2425 */ 2443 */
2426 if (showcursor) 2444 if (showcursor)
2427 { 2445 {
2428 if (focus) 2446 if (focus)
2429 { 2447 {
2430 if (option (Opt_cursorUnderline)) 2448 if (cursor_type == 0)
2431 *crp ^= RS_Uline; 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2432 else 2450 else if (oldcursor.row >= 0)
2433 { 2451 {
2434 *crp ^= RS_RVid; 2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2435#ifndef NO_CURSORCOLOR 2453 if (cursor_type == 1)
2436 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 XFillRectangle (dpy, vt, gc,
2437#endif 2455 Col2Pixel (cur_col),
2456 Row2Pixel (oldcursor.row + 1) - 2,
2457 Width2Pixel (1),
2458 2);
2459 else
2460 XFillRectangle (dpy, vt, gc,
2461 Col2Pixel (cur_col),
2462 Row2Pixel (oldcursor.row),
2463 2,
2464 Height2Pixel (1));
2438 } 2465 }
2439 } 2466 }
2440 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2441 { 2468 {
2442 int cursorwidth = 1;
2443 int col = oldcursor.col;
2444
2445 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2446 col--;
2447
2448 while (col + cursorwidth < ncol
2449 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2450 cursorwidth++;
2451
2452#ifndef NO_CURSORCOLOR
2453 if (ISSET_PIXCOLOR (Color_cursor))
2454 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2455 else
2456#endif
2457 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2458 2470
2459 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
2460 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2461 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2462 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2463 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2464 } 2476 }
2465 } 2477 }
2466 2478
2467 /* 2479 /*
2468 * H: cleanup selection 2480 * H: cleanup selection
… …
2477 screen.flags = old_screen_flags; 2489 screen.flags = old_screen_flags;
2478 num_scr = 0; 2490 num_scr = 0;
2479 num_scr_allow = 1; 2491 num_scr_allow = 1;
2480} 2492}
2481 2493
2482void 2494void ecb_cold
2483rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2495rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2484{ 2496{
2485 if (!l.t) 2497 if (!l.valid ())
2486 return; 2498 return;
2487 2499
2488 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2500 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2489 2501
2490 for (int i = ncol; i--; ) 2502 for (int i = ncol; i--; )
2491 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2503 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2492} 2504}
2493 2505
2494void 2506void ecb_cold
2495rxvt_term::scr_remap_chars () NOTHROW 2507rxvt_term::scr_remap_chars () NOTHROW
2496{ 2508{
2497 for (int i = total_rows; i--; ) 2509 for (int i = total_rows; i--; )
2498 scr_remap_chars (row_buf [i]); 2510 scr_remap_chars (row_buf [i]);
2499 2511
… …
2502 scr_remap_chars (drawn_buf [i]); 2514 scr_remap_chars (drawn_buf [i]);
2503 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2504 } 2516 }
2505} 2517}
2506 2518
2507void 2519void ecb_cold
2508rxvt_term::scr_recolour () NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2509{ 2521{
2510#ifdef HAVE_BG_PIXMAP 2522 bool transparent = false;
2511 bgPixmap.apply ();
2512#else
2513 2523
2524#ifdef HAVE_IMG
2525 if (bg_img != 0)
2526 {
2527# if ENABLE_TRANSPARENCY
2528 if (bg_flags & BG_IS_TRANSPARENT)
2529 {
2530 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2531 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2532
2533 transparent = true;
2534 }
2535 else
2536# endif
2537 {
2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2539 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2540 }
2541 }
2542 else
2543#endif
2544 {
2514 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2545 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2515 XClearWindow (dpy, parent[0]);
2516 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2547 }
2517 2548
2518 if (scrollBar.win) 2549 XClearWindow (dpy, parent);
2550
2551 if (scrollBar.state && scrollBar.win)
2519 { 2552 {
2553 if (transparent)
2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2555 else
2520 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2521 scrollBar.state = STATE_IDLE; 2557 scrollBar.state = SB_STATE_IDLE;
2522 scrollBar.show (0); 2558 scrollBar.show (0);
2523 } 2559 }
2524 2560
2525#endif 2561 if (refresh)
2526 2562 {
2527 /* bgPixmap.apply () does not do the following : */
2528 scr_clear (); 2563 scr_clear ();
2529 scr_touch (true); 2564 scr_touch (true);
2565 }
2530 want_refresh = 1; 2566 want_refresh = 1;
2531} 2567}
2532 2568
2533/* ------------------------------------------------------------------------- */ 2569/* ------------------------------------------------------------------------- */
2534void 2570void
… …
2591 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2627 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2592 srp[col] ^= rstyle; 2628 srp[col] ^= rstyle;
2593} 2629}
2594 2630
2595/* ------------------------------------------------------------------------- */ 2631/* ------------------------------------------------------------------------- */
2596void 2632void ecb_hot
2597rxvt_term::scr_reverse_selection () NOTHROW 2633rxvt_term::scr_reverse_selection () NOTHROW
2598{ 2634{
2599 if (selection.op 2635 if (selection.op
2600 && current_screen == selection.screen 2636 && current_screen == selection.screen
2601 && selection.end.row >= view_start) 2637 && selection.end.row >= view_start)
… …
2620 */ 2656 */
2621#if 0 2657#if 0
2622void 2658void
2623rxvt_term::scr_dump (int fd) NOTHROW 2659rxvt_term::scr_dump (int fd) NOTHROW
2624{ 2660{
2625 int row, wrote; 2661 // if this method is needed, it can be implemented by factoring the
2626 unsigned int width, towrite; 2662 // relevant code in scr_printscreen
2627 char r1[] = "\n";
2628
2629 for (row = saveLines + top_row;
2630 row < saveLines + nrow - 1; row++)
2631 {
2632 width = row_buf[row].l >= 0 ? row_buf[row].l
2633 : ncol;
2634 for (towrite = width; towrite; towrite -= wrote)
2635 {
2636 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2637 towrite);
2638 if (wrote < 0)
2639 return; /* XXX: death, no report */
2640 }
2641 if (row_buf[row].l >= 0)
2642 if (write (fd, r1, 1) <= 0)
2643 return; /* XXX: death, no report */
2644 }
2645} 2663}
2646#endif 2664#endif
2647 2665
2648/* ------------------------------------------------------------------------- * 2666/* ------------------------------------------------------------------------- *
2649 * CHARACTER SELECTION * 2667 * CHARACTER SELECTION *
2650 * ------------------------------------------------------------------------- */ 2668 * ------------------------------------------------------------------------- */
2651void 2669void
2652rxvt_term::selection_check (int check_more) NOTHROW 2670rxvt_term::selection_check (int check_more) NOTHROW
2653{ 2671{
2654 row_col_t pos;
2655
2656 if (!selection.op) 2672 if (!selection.op)
2657 return; 2673 return;
2658 2674
2659 pos.row = pos.col = 0;
2660 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2675 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2661 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2676 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2662 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2677 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2663 || (check_more == 1 2678 || (check_more == 1
2664 && current_screen == selection.screen 2679 && current_screen == selection.screen
2665 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2666 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2681 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2667 || (check_more == 2
2668 && ROWCOL_IS_BEFORE (selection.beg, pos)
2669 && ROWCOL_IS_AFTER (selection.end, pos))
2670 || (check_more == 3
2671 && ROWCOL_IS_AFTER (selection.end, pos))
2672 || (check_more == 4 /* screen width change */
2673 && (selection.beg.row != selection.end.row
2674 || selection.end.col > ncol)))
2675 CLEAR_SELECTION (); 2682 CLEAR_ALL_SELECTION ();
2683}
2684
2685void
2686rxvt_term::selection_changed () NOTHROW
2687{
2688 line_t &r1 = ROW (selection.beg.row);
2689 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2690 ++selection.beg.col;
2691
2692 line_t &r2 = ROW (selection.end.row);
2693 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2694 ++selection.end.col;
2695
2696 want_refresh = 1;
2676} 2697}
2677 2698
2678/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2679/* 2700/*
2680 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
2681 */ 2702 */
2682void 2703void
2683rxvt_term::paste (char *data, unsigned int len) NOTHROW 2704rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2684{ 2705{
2685 /* convert normal newline chars into common keyboard Return key sequence */ 2706 /* convert normal newline chars into common keyboard Return key sequence */
2686 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2687 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2688 data[i] = C0_CR; 2709 data[i] = C0_CR;
2689 2710
2690 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2691 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2692 2713
2693 tt_write (data, len); 2714 tt_write (data, len);
2694 2715
2695 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2697} 2718}
2698 2719
2699/* ------------------------------------------------------------------------- */
2700/*
2701 * Respond to a notification that a primary selection has been sent
2702 * EXT: SelectionNotify
2703 */
2704void 2720void
2705rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{ 2722{
2707 if (prop == None) /* check for failed XConvertSelection */ 2723 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2708 {
2709 if ((selection_type & Sel_CompoundText))
2710 {
2711 int selnum = selection_type & Sel_whereMask;
2712
2713 selection_type = 0;
2714 if (selnum != Sel_direct)
2715 selection_request_other (XA_STRING, selnum);
2716 }
2717
2718 if ((selection_type & Sel_UTF8String))
2719 {
2720 int selnum = selection_type & Sel_whereMask;
2721
2722 selection_type = Sel_CompoundText;
2723 if (selnum != Sel_direct)
2724 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2725 else
2726 selection_type = 0;
2727 }
2728
2729 return;
2730 }
2731
2732 unsigned long bytes_after;
2733 XTextProperty ct;
2734
2735 if (XGetWindowProperty (dpy, win, prop,
2736 0, PROP_SIZE / 4,
2737 delete_prop, AnyPropertyType,
2738 &ct.encoding, &ct.format,
2739 &ct.nitems, &bytes_after,
2740 &ct.value) != Success)
2741 {
2742 ct.value = 0;
2743 goto bailout;
2744 }
2745
2746 if (ct.encoding == None)
2747 goto bailout;
2748
2749 if (bytes_after)
2750 {
2751 // fetch and append remaining data
2752 XTextProperty ct2;
2753
2754 if (XGetWindowProperty (dpy, win, prop,
2755 ct.nitems / 4, (bytes_after + 3) / 4,
2756 delete_prop, AnyPropertyType,
2757 &ct2.encoding, &ct2.format,
2758 &ct2.nitems, &bytes_after,
2759 &ct2.value) != Success)
2760 goto bailout;
2761
2762 // realloc should be compatible to XFree, here, and elsewhere, too
2763 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2764 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2765 ct.nitems += ct2.nitems;
2766
2767 XFree (ct2.value);
2768 }
2769
2770 if (ct.value == 0)
2771 goto bailout;
2772
2773 if (ct.encoding == xa[XA_INCR])
2774 {
2775 // INCR selection, start handshake
2776 if (!delete_prop)
2777 XDeleteProperty (dpy, win, prop);
2778
2779 selection_wait = Sel_incr;
2780 incr_buf_fill = 0;
2781 incr_ev.start (10);
2782
2783 goto bailout;
2784 }
2785
2786 if (ct.nitems == 0)
2787 {
2788 if (selection_wait == Sel_incr)
2789 {
2790 XFree (ct.value);
2791
2792 // finally complete, now paste the whole thing
2793 selection_wait = Sel_normal;
2794 ct.value = (unsigned char *)incr_buf;
2795 ct.nitems = incr_buf_fill;
2796 incr_buf = 0;
2797 incr_buf_size = 0;
2798 incr_ev.stop ();
2799 }
2800 else
2801 {
2802 if (selection_wait == Sel_normal
2803 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2804 {
2805 /*
2806 * pass through again trying CUT_BUFFER0 if we've come from
2807 * XConvertSelection () but nothing was presented
2808 */
2809 selection_paste (display->root, XA_CUT_BUFFER0, False);
2810 }
2811
2812 goto bailout;
2813 }
2814 }
2815 else if (selection_wait == Sel_incr)
2816 {
2817 incr_ev.start (10);
2818
2819 while (incr_buf_fill + ct.nitems > incr_buf_size)
2820 {
2821 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2822 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2823 }
2824
2825 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2826 incr_buf_fill += ct.nitems;
2827
2828 goto bailout;
2829 }
2830
2831 char **cl;
2832 int cr;
2833
2834#if !ENABLE_MINIMAL
2835 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2836 // so recode it manually
2837 if (ct.encoding == xa[XA_UTF8_STRING])
2838 {
2839 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2840 char *s = rxvt_wcstombs (w);
2841 free (w);
2842 // TODO: strlen == only the first element will be converted. well...
2843 paste (s, strlen (s));
2844 free (s);
2845 }
2846 else
2847#endif
2848 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2849 && cl)
2850 {
2851 for (int i = 0; i < cr; i++)
2852 paste (cl[i], strlen (cl[i]));
2853
2854 XFreeStringList (cl);
2855 }
2856 else
2857 paste ((char *)ct.value, ct.nitems); // paste raw
2858
2859bailout:
2860 XFree (ct.value);
2861
2862 if (selection_wait == Sel_normal)
2863 selection_wait = Sel_none;
2864}
2865
2866void
2867rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2868{
2869 selection_wait = Sel_none;
2870
2871 incr_buf_size = 0;
2872 free (incr_buf);
2873
2874 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2875}
2876
2877void
2878rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2879{
2880 if (prop == None || selection_wait != Sel_incr)
2881 return; 2724 return;
2882 2725
2883 selection_paste (win, prop, true); 2726 tt_paste (data, len);
2884} 2727}
2885 2728
2886/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2887/* 2730/*
2888 * Request the current selection: 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2889 * Order: > internal selection if available 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2890 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2733 * as fallback
2891 * > CUT_BUFFER0
2892 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2893 * will auto fallback to CUT_BUFFER0
2894 * EXT: button 2 release 2734 * EXT: button 2 release
2895 */ 2735 */
2896void 2736void
2897rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2898{ 2738{
2899 if (selection.text && selnum == Sel_Primary) 2739 if (!selection_req)
2900 {
2901 /* internal selection */
2902 char *str = rxvt_wcstombs (selection.text, selection.len);
2903 paste (str, strlen (str));
2904 free (str);
2905 return;
2906 } 2740 {
2907 else 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2742 selection_req->run ();
2908 { 2743 }
2909 selection_request_time = tm;
2910 selection_wait = Sel_normal;
2911
2912#if X_HAVE_UTF8_STRING
2913 selection_type = Sel_UTF8String;
2914 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2915 return;
2916#else
2917 selection_type = Sel_CompoundText;
2918 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2919 return;
2920#endif
2921 }
2922
2923 selection_wait = Sel_none; /* don't loop in selection_paste () */
2924 selection_paste (display->root, XA_CUT_BUFFER0, false);
2925}
2926
2927int
2928rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2929{
2930 Atom sel;
2931
2932 selection_type |= selnum;
2933
2934 if (selnum == Sel_Primary)
2935 sel = XA_PRIMARY;
2936 else if (selnum == Sel_Secondary)
2937 sel = XA_SECONDARY;
2938 else
2939 sel = xa[XA_CLIPBOARD];
2940
2941 if (XGetSelectionOwner (dpy, sel) != None)
2942 {
2943 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2944 vt, selection_request_time);
2945 return 1;
2946 }
2947
2948 return 0;
2949} 2744}
2950 2745
2951/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2952/* 2747/*
2953 * Clear all selected text 2748 * Clear all selected text
… …
2976 if (display->clipboard_owner == this) 2771 if (display->clipboard_owner == this)
2977 display->clipboard_owner = 0; 2772 display->clipboard_owner = 0;
2978 } 2773 }
2979} 2774}
2980 2775
2981void
2982rxvt_term::clipboard_copy (Time tm)
2983{
2984 if (selection.len > 0)
2985 {
2986 free (selection.clip_text);
2987 selection.clip_len = selection.len;
2988 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2989 memcpy (selection.clip_text, selection.text,
2990 sizeof (wchar_t) * selection.clip_len);
2991 selection_grab (tm, true);
2992 }
2993}
2994
2995/* ------------------------------------------------------------------------- */ 2776/* ------------------------------------------------------------------------- */
2996/* 2777/*
2997 * Copy a selection into the cut buffer 2778 * Copy a selection into the cut buffer
2998 * EXT: button 1 or 3 release 2779 * EXT: button 1 or 3 release
2999 */ 2780 */
3000void 2781void
3001rxvt_term::selection_make (Time tm) 2782rxvt_term::selection_make (Time tm)
3002{ 2783{
3003 int i; 2784 int size;
3004 wchar_t *new_selection_text; 2785 wchar_t *new_selection_text;
3005 text_t *t; 2786 text_t *t;
3006 2787
3007 switch (selection.op) 2788 switch (selection.op)
3008 { 2789 {
… …
3024 return; /* nothing selected, go away */ 2805 return; /* nothing selected, go away */
3025 2806
3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2807 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3027 return; 2808 return;
3028 2809
3029 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2810 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2811 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3031 2812
3032 int ofs = 0; 2813 int ofs = 0;
3033 int extra = 0; 2814 int extra = 0;
3034 2815
3035 int col = selection.beg.col; 2816 int col = selection.beg.col;
… …
3041 { 2822 {
3042#if !ENABLE_MINIMAL 2823#if !ENABLE_MINIMAL
3043 if (selection.rect) 2824 if (selection.rect)
3044 { 2825 {
3045 col = selection.beg.col; 2826 col = selection.beg.col;
3046 end_col = ncol + 1; 2827 end_col = selection.end.col;
3047 } 2828 }
3048 else 2829 else
3049#endif 2830#endif
3050 end_col = ROW(row).l; 2831 end_col = ROW(row).l;
3051 2832
3052 col = max (col, 0); 2833 col = max (col, 0);
3053 2834
3054 if (row == selection.end.row 2835 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 2836 min_it (end_col, selection.end.col);
3060 2837
3061 t = ROW(row).t + col; 2838 t = ROW(row).t + col;
3062 2839
3063 for (; col < end_col; col++) 2840 for (; col < end_col; col++)
… …
3071 2848
3072 extra -= (len - 1); 2849 extra -= (len - 1);
3073 2850
3074 if (extra < 0) 2851 if (extra < 0)
3075 { 2852 {
3076 extra += i; 2853 extra += size;
3077 i += i; 2854 size += size;
3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2855 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3079 } 2856 }
3080 2857
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2858 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 2859 }
3083#endif 2860#endif
… …
3095 2872
3096 new_selection_text[ofs++] = C0_LF; 2873 new_selection_text[ofs++] = C0_LF;
3097 } 2874 }
3098 else 2875 else
3099#endif 2876#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row) 2877 if (!ROW(row).is_longer ()
2878 && (row != selection.end.row || end_col != selection.end.col)
2879 && (row != selection.beg.row || selection.beg.col < ncol))
3101 new_selection_text[ofs++] = C0_LF; 2880 new_selection_text[ofs++] = C0_LF;
3102 } 2881 }
3103
3104 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF;
3106 2882
3107 new_selection_text[ofs] = 0; 2883 new_selection_text[ofs] = 0;
3108 2884
3109 if (ofs == 0) 2885 if (ofs == 0)
3110 { 2886 {
… …
3166/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
3167/* 2943/*
3168 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
3169 * EXT: button 1 press 2945 * EXT: button 1 press
3170 */ 2946 */
3171void 2947void ecb_cold
3172rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3173{ 2949{
3174 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
3175 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
3176 2952
… …
3195 2971
3196/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
3197/* 2973/*
3198 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
3199 */ 2975 */
3200void 2976void ecb_cold
3201rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3202{ 2978{
3203 want_refresh = 1; 2979 want_refresh = 1;
3204 2980
3205 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3228 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3229 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3230 */ 3006 */
3231 3007
3232/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3233#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3234 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3235#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3236 3012
3237void 3013void ecb_cold
3238rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3239{ 3015{
3240 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3241 row_col_t bound; 3017 row_col_t bound;
3242 text_t *stp; 3018 text_t *stp;
… …
3316 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3317 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3318 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3319 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3320 */ 3096 */
3321void 3097void ecb_cold
3322rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3323{ 3099{
3324 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3325 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3326 3102
… …
3352 3128
3353/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3354/* 3130/*
3355 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3356 */ 3132 */
3357void 3133void ecb_cold
3358rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3359{ 3135{
3360 row_col_t pos; 3136 row_col_t pos;
3361 enum { 3137 enum {
3362 LEFT, RIGHT 3138 LEFT, RIGHT
3363 } closeto = RIGHT; 3139 } closeto = RIGHT;
3364
3365 want_refresh = 1;
3366 3140
3367 switch (selection.op) 3141 switch (selection.op)
3368 { 3142 {
3369 case SELECTION_INIT: 3143 case SELECTION_INIT:
3370 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
… …
3550 3324
3551#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3552 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3553 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3554#endif 3328#endif
3329
3330 selection_changed ();
3555} 3331}
3556 3332
3557#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3558void 3334void ecb_cold
3559rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3560{ 3336{
3561 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3562 text_t *stp; 3338 text_t *stp;
3563 3339
… …
3601/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3602/* 3378/*
3603 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3604 * EXT: button 3 double click 3380 * EXT: button 3 double click
3605 */ 3381 */
3606void 3382void ecb_cold
3607rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3608{ 3384{
3609 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3610 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3611} 3387}
… …
3613/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3614/* 3390/*
3615 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3616 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3617 */ 3393 */
3618void 3394void ecb_cold
3619rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3620{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3621 XSelectionEvent ev; 3398 XSelectionEvent ev;
3622 3399
3623 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3624 ev.property = None; 3401 ev.property = None;
3625 ev.display = rq.display; 3402 ev.display = rq.display;
… …
3640 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3641#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3642 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3643#endif 3420#endif
3644 3421
3645 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3646 32, PropModeReplace, 3423 32, PropModeReplace,
3647 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3648 ev.property = rq.property; 3425 ev.property = property;
3649 } 3426 }
3650#if TODO // TODO 3427#if TODO // TODO
3651 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3652 { 3429 {
3653 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3654 } 3431 }
3655#endif 3432#endif
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3657 { 3434 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property; 3437 ev.property = property;
3661 } 3438 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 { 3440 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3666 ev.property = rq.property; 3443 ev.property = property;
3667 } 3444 }
3668 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3669 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3670 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3671 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
… …
3742 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3743 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3744 ct.encoding = target; 3521 ct.encoding = target;
3745 } 3522 }
3746 3523
3747 XChangeProperty (dpy, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3748 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3749 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3750 ev.property = rq.property; 3527 ev.property = property;
3751 3528
3752 if (freect) 3529 if (freect)
3753 XFree (ct.value); 3530 XFree (ct.value);
3754 } 3531 }
3755 3532
3756 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3757} 3534}
3758 3535
3759/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3760#ifdef USE_XIM 3537#if USE_XIM
3761void 3538void ecb_cold
3762rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3763{ 3540{
3764 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3765 3542
3766 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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