ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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