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.334 by sf-exg, Sun Feb 14 11:04:11 2010 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 12 07:54:15 2013 UTC

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

Diff Legend

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