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.329 by root, Sat Dec 26 10:24:04 2009 UTC vs.
Revision 1.455 by sf-exg, Wed Sep 30 12:57:04 2015 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 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 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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;
… …
231 selection.text = NULL; 279 selection.text = NULL;
232 selection.len = 0; 280 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 281 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 282 selection.screen = PRIMARY;
235 selection.clicks = 0; 283 selection.clicks = 0;
284 selection.clip_text = NULL;
285 selection.clip_len = 0;
236 } 286 }
237 else 287 else
238 { 288 {
239 /* 289 /*
240 * add or delete rows as appropriate 290 * add or delete rows as appropriate
241 */ 291 */
242 292
243 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
244 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
245
246#if 0
247 if (nrow < prev_nrow)
248 {
249 for (int row = nrow; row < prev_nrow; row++)
250 {
251 lfree (swap_buf [row]);
252 lfree (drawn_buf[row]);
253 }
254 }
255#endif
256
257 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
258 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
259 294
260 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
261 { 296 {
262 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
264 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
265 300
266 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
267 { 302 }
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 }
271
272 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
274 303
275 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
276 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
278 307
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 316
288 do 317 do
289 { 318 {
290 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
291 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292 int plines = 1; 321 int plines = 1;
293 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
294 323
295 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 ())
296 { 325 {
297 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
298 327
299 plines++; 328 plines++;
300 llen += prev_ncol; 329 llen += prev_ncol;
… …
313 342
314 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
315 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
316 { 345 {
317 qline = row_buf + qrow; 346 qline = row_buf + qrow;
318 lalloc (*qline); 347 qline->alloc (); // redundant with next line
319 qline->l = ncol; 348 qline->l = ncol;
320 qline->is_longer (1); 349 qline->is_longer (1);
321 350
322 int qcol = 0; 351 int qcol = 0;
323 352
… …
338 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
339 // least. 368 // least.
340 if (prow == ocur.row) 369 if (prow == ocur.row)
341 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
342 371
343 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
344 373
345 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
346 375
347 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
348 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
369 { 398 {
370 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
371 400
372 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
373 { 402 {
374 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)];
375 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
376 405
377 qline = pline; 406 copy_line (dst, src);
378 lresize (qline);
379 } 407 }
380 408
381 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
382 {
383 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
384 }
385 411
386 term_start = 0; 412 term_start = 0;
387 } 413 }
388
389 free (old_buf);
390 delete old_ta;
391 delete old_ra;
392 414
393 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
394 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
395 } 417 }
396 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
397 free (tabs); 428 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
399 430
400 for (int col = ncol; --col; ) 431 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
402 433
403 CLEAR_ALL_SELECTION (); 434 CLEAR_ALL_SELECTION ();
404 435
405 prev_nrow = nrow; 436 prev_nrow = nrow;
… …
408 tt_winch (); 439 tt_winch ();
409 440
410 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
411} 442}
412 443
413/* ------------------------------------------------------------------------- */ 444void ecb_cold
414/*
415 * Free everything. That way malloc debugging can find leakage.
416 */
417void
418rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
419{ 446{
420 if (row_buf) 447 chunk_free (chunk, chunk_size);
421 { 448 chunk = 0;
422 delete talloc; talloc = 0; 449 row_buf = 0;
423 delete ralloc; ralloc = 0;
424 450
425 free (row_buf);
426 free (swap_buf);
427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
430 free (tabs); 451 free (tabs);
431 tabs = 0; 452 tabs = 0;
432 }
433} 453}
434 454
435/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
436/* 456/*
437 * Hard/Soft reset 457 * Hard/Soft reset
438 */ 458 */
439void 459void ecb_cold
440rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
441{ 461{
442 scr_release (); 462 scr_release ();
463
443 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false; 465 rvideo_mode = false;
445 scr_soft_reset (); 466 scr_soft_reset ();
446 scr_reset (); 467 scr_reset ();
447 468
448 scr_clear (true); 469 scr_clear (true);
449 scr_refresh (); 470 scr_refresh ();
450} 471}
451 472
452void 473void ecb_cold
453rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
454{ 475{
455 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
457 scr_overlay_off (); 478 scr_overlay_off ();
458#endif 479#endif
… …
513 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
514 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
515} 536}
516 537
517void 538void
518rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
519{ 540{
520 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
521 return; 542 return;
522 543
523 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
542 return; 563 return;
543 564
544 want_refresh = 1; 565 want_refresh = 1;
545 view_start = 0; 566 view_start = 0;
546 567
547 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 ();
548 574
549 int i = current_screen; current_screen = scrn; scrn = i; 575 current_screen = scrn;
550 576
551#if NSCREENS 577#if NSCREENS
552 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
553 { 579 {
554 num_scr = 0; 580 num_scr = 0;
… …
618/* 644/*
619 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
620 * count positive ==> scroll up 646 * count positive ==> scroll up
621 * count negative ==> scroll down 647 * count negative ==> scroll down
622 */ 648 */
623int 649int ecb_hot
624rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
625{ 651{
626 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
627 return 0; 653 return 0;
628 654
… …
631 657
632 if (count > 0 658 if (count > 0
633 && row1 == 0 659 && row1 == 0
634 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
635 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
636 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
637
638 // scroll everything up 'count' lines
639 term_start = (term_start + count) % total_rows;
640 665
641 // sever bottommost line 666 // sever bottommost line
642 { 667 {
643 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
644 l.is_longer (0); 669 l.is_longer (0);
645 l.touch (); 670 l.touch ();
646 } 671 }
647 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
648 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
649 for (int i = count; i--; ) 689 for (int i = count; i--; )
650 { 690 {
651 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
652 692
653 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem 694 // could be rolled into scr_blank_screen_mem
655 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)))
656 { 696 {
657 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
658 l.l = 0; 698 l.l = 0;
… …
660 } 700 }
661 else 701 else
662 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
663 } 703 }
664 704
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
677 // move and/or clear selection, if any 705 // move and/or clear selection, if any
678 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
679 { 708 {
680 selection.beg.row -= count; 709 selection.beg.row -= count;
681 selection.end.row -= count; 710 selection.end.row -= count;
682 selection.mark.row -= count; 711 selection.mark.row -= count;
683 712
684 if (selection.beg.row < top_row 713 selection_check (0);
685 || selection.end.row < top_row
686 || selection.mark.row < top_row)
687 {
688 CLEAR_ALL_SELECTION ();
689 selection.op = SELECTION_CLEAR;
690 }
691 } 714 }
692 715
693 // finally move the view window, if desired 716 // finally move the view window, if desired
694 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
695 && view_start != 0 718 && view_start != 0
696 && view_start != -saveLines) 719 && view_start != -saveLines)
697 scr_page (UP, count); 720 scr_page (count);
698 721
699 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
700 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));
701 } 724 }
702 else 725 else
… …
725 } 748 }
726 749
727 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
728 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
729 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
730 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
731 762
732 min_it (count, rows); 763 min_it (count, rows);
733 764
734 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
735 766
736 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
737 { 768 {
738 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
739 770
… …
741 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
742 } 773 }
743 774
744 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
745 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 }
746 } 784 }
747 785
748 return count; 786 return count;
749} 787}
750 788
751/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
752/* 790/*
753 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
754 */ 792 */
755void 793void ecb_hot
756rxvt_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
757{ 795{
758 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
759 return; 797 return;
760 798
761 unsigned char checksel; 799 bool checksel;
762 unicode_t c; 800 unicode_t c;
763 int ncol = this->ncol; 801 int ncol = this->ncol;
764 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
765 803
766 want_refresh = 1; 804 want_refresh = 1;
… …
792 830
793 while (str < strend) 831 while (str < strend)
794 { 832 {
795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
796 834
797 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
798 if (c == C0_LF) 836 if (c == C0_LF)
799 { 837 {
800 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
801 839
802 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
821 { 859 {
822 scr_tab (1, true); 860 scr_tab (1, true);
823 continue; 861 continue;
824 } 862 }
825 863
826 if (expect_false ( 864 if (ecb_unlikely (
827 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
829 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 )) 868 ))
831 { 869 {
… …
836 * should be a similar check. 874 * should be a similar check.
837 */ 875 */
838 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
839 } 877 }
840 878
841 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
842 { 880 {
843 scr_do_wrap (); 881 scr_do_wrap ();
844 882
845 line->l = ncol; 883 line->l = ncol;
846 line->is_longer (1); 884 line->is_longer (1);
… …
848 row = screen.cur.row; 886 row = screen.cur.row;
849 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
850 } 888 }
851 889
852 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
854 c = 0xfffd; 892 c = 0xfffd;
855 893
856 // 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
857 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
858 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
859 // locale. 897 // locale.
860 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
861 899
862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
863 { 901 {
864 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
865 // 5f-7e standard vt100 903 // 5f-7e standard vt100
866 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
867 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
880 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
881 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
882 } 920 }
883 } 921 }
884 922
885 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
886 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
887 925
888 if (width != 0) 926 if (width != 0)
889 { 927 {
890#if !UNICODE_3 928#if !UNICODE_3
… …
895# else 933# else
896 c = 0xfffd; 934 c = 0xfffd;
897# endif 935# endif
898#endif 936#endif
899 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
900 // nuke the character at this position, if required 954 // nuke the character at this position, if required
901 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.
902 line->t[screen.cur.col] == NOCHAR 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
903 || (screen.cur.col < ncol - 1
904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col); 959 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 960
919 line->touch (); 961 line->touch ();
920 962
921 do 963 do
922 { 964 {
923 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
924 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
925 967
926 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
927 screen.cur.col++; 969 screen.cur.col++;
928 else 970 else
929 { 971 {
930 line->l = ncol; 972 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 974 screen.flags |= Screen_WrapNext;
933 break; 975
976 goto end_of_line;
934 } 977 }
935 978
936 c = NOCHAR; 979 c = NOCHAR;
937 } 980 }
938 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
939 982
940 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
942 { 985 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 986 line->t[c] = ' ';
948 line->r[c] = rend; 987 line->r[c] = rend;
949 }
950 } 988 }
989
990end_of_line:
991 ;
951 } 992 }
952#if ENABLE_COMBINING 993#if ENABLE_COMBINING
953 else // width == 0 994 else // width == 0
954 { 995 {
955 if (c != 0xfeff) // ignore BOM 996 if (c != 0xfeff) // ignore BOM
… …
970 } 1011 }
971 else if (screen.cur.row > 0 1012 else if (screen.cur.row > 0
972 && ROW(screen.cur.row - 1).is_longer ()) 1013 && ROW(screen.cur.row - 1).is_longer ())
973 { 1014 {
974 linep = &ROW(screen.cur.row - 1); 1015 linep = &ROW(screen.cur.row - 1);
975 tp = line->t + ncol - 1; 1016 tp = linep->t + ncol - 1;
976 rp = line->r + ncol - 1; 1017 rp = linep->r + ncol - 1;
977 } 1018 }
978 else 1019 else
979 continue; 1020 continue;
980 1021
981 linep->touch (); 1022 linep->touch ();
… …
1018 1059
1019 want_refresh = 1; 1060 want_refresh = 1;
1020#endif 1061#endif
1021 } 1062 }
1022 } 1063 }
1064 else if (screen.flags & Screen_WrapNext)
1065 screen.flags &= ~Screen_WrapNext;
1023 else 1066 else
1024 scr_gotorc (0, -1, RELATIVE); 1067 scr_gotorc (0, -1, RELATIVE);
1025} 1068}
1026 1069
1027/* ------------------------------------------------------------------------- */ 1070/* ------------------------------------------------------------------------- */
… …
1105 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1106 * 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
1107 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1108 */ 1151 */
1109#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1110void 1153void ecb_cold
1111rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1112{ 1155{
1113 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1115 else 1158 else
… …
1122 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1123 * 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
1124 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1125 */ 1168 */
1126#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1127void 1170void ecb_cold
1128rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1129{ 1172{
1130 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1132 else 1175 else
… …
1197 * direction should be UP or DN 1240 * direction should be UP or DN
1198 */ 1241 */
1199void 1242void
1200rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1201{ 1244{
1202 int dirn;
1203
1204 want_refresh = 1; 1245 want_refresh = 1;
1205 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1206 1247
1207 dirn = ((direction == UP) ? 1 : -1);
1208
1209 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1210 1249
1211 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1212 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1213 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1214 else 1253 else
1215 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1216 1255
1217 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1218 selection_check (0); 1257 selection_check (0);
1219} 1258}
1220 1259
… …
1283 scr_blank_line (line, col, num, rstyle); 1322 scr_blank_line (line, col, num, rstyle);
1284} 1323}
1285 1324
1286/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
1287/* 1326/*
1288 * Erase part of whole of the screen 1327 * Erase part or whole of the screen
1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1328 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1329 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1330 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1292 */ 1331 */
1293void 1332void
… …
1302 ZERO_SCROLLBACK (); 1341 ZERO_SCROLLBACK ();
1303 1342
1304 switch (mode) 1343 switch (mode)
1305 { 1344 {
1306 case 0: /* erase to end of screen */ 1345 case 0: /* erase to end of screen */
1307 selection_check (1);
1308 scr_erase_line (0); 1346 scr_erase_line (0);
1309 row = screen.cur.row + 1; /* possible OOB */ 1347 row = screen.cur.row + 1; /* possible OOB */
1310 num = nrow - row; 1348 num = nrow - row;
1311 break; 1349 break;
1312 case 1: /* erase to beginning of screen */ 1350 case 1: /* erase to beginning of screen */
1313 selection_check (3);
1314 scr_erase_line (1); 1351 scr_erase_line (1);
1315 row = 0; 1352 row = 0;
1316 num = screen.cur.row; 1353 num = screen.cur.row;
1317 break; 1354 break;
1318 case 2: /* erase whole screen */ 1355 case 2: /* erase whole screen */
1319 selection_check (3);
1320 row = 0; 1356 row = 0;
1321 num = nrow; 1357 num = nrow;
1322 break; 1358 break;
1323 default: 1359 default:
1324 return; 1360 return;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1369 if (row >= nrow) /* Out Of Bounds */
1334 return; 1370 return;
1335 1371
1336 min_it (num, nrow - row); 1372 min_it (num, nrow - row);
1337 1373
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1374 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1375 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1376 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1377 {
1345 ren = DEFAULT_RSTYLE; 1378 ren = DEFAULT_RSTYLE;
1346 1379
1347 if (mapped && !view_start) 1380 if (mapped)
1348 XClearArea (dpy, vt, 0, 1381 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1382 Row2Pixel (row - view_start), (unsigned int)vt_width,
1350 (unsigned int)Height2Pixel (num), False); 1383 (unsigned int)Height2Pixel (num), False);
1351 } 1384 }
1352 else 1385 else
1353 { 1386 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1387 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1388
1356 if (mapped && !view_start) 1389 if (mapped)
1357 { 1390 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1391 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1392 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1393 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1394 0, Row2Pixel (row - view_start),
1362 (unsigned int)width, 1395 (unsigned int)vt_width,
1363 (unsigned int)Height2Pixel (num)); 1396 (unsigned int)Height2Pixel (num));
1364 gcvalue.foreground = pix_colors[Color_fg]; 1397 gcvalue.foreground = pix_colors[Color_fg];
1365 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1398 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 } 1399 }
1367 } 1400 }
1368 1401
1369 for (; num--; row++) 1402 for (; num--; row++)
1370 { 1403 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1404 scr_blank_screen_mem (ROW(row), rstyle);
1372 1405
1373 if (!view_start) 1406 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1407 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1408 }
1376} 1409}
1377 1410
1378#if !ENABLE_MINIMAL 1411#if !ENABLE_MINIMAL
1379void 1412void
… …
1389/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1390/* 1423/*
1391 * Fill the screen with `E's 1424 * Fill the screen with `E's
1392 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1425 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1393 */ 1426 */
1394void 1427void ecb_cold
1395rxvt_term::scr_E () NOTHROW 1428rxvt_term::scr_E () NOTHROW
1396{ 1429{
1397 rend_t fs; 1430 rend_t fs;
1398 1431
1399 want_refresh = 1; 1432 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1433 ZERO_SCROLLBACK ();
1401 1434
1402 num_scr_allow = 0; 1435 num_scr_allow = 0;
1403 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 ();
1404 1441
1405 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1442 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1406 for (int row = nrow; row--; ) 1443 for (int row = nrow; row--; )
1407 { 1444 {
1408 line_t &line = ROW(row); 1445 line_t &line = ROW(row);
… …
1559/* ------------------------------------------------------------------------- */ 1596/* ------------------------------------------------------------------------- */
1560/* 1597/*
1561 * Set the scrolling region 1598 * Set the scrolling region
1562 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1599 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1563 */ 1600 */
1564void 1601void ecb_cold
1565rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1602rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1566{ 1603{
1567 max_it (top, 0); 1604 max_it (top, 0);
1568 min_it (bot, nrow - 1); 1605 min_it (bot, nrow - 1);
1569 1606
… …
1579/* 1616/*
1580 * Make the cursor visible/invisible 1617 * Make the cursor visible/invisible
1581 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1618 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1582 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1619 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1583 */ 1620 */
1584void 1621void ecb_cold
1585rxvt_term::scr_cursor_visible (int mode) NOTHROW 1622rxvt_term::scr_cursor_visible (int mode) NOTHROW
1586{ 1623{
1587 want_refresh = 1; 1624 want_refresh = 1;
1588 1625
1589 if (mode) 1626 if (mode)
… …
1596/* 1633/*
1597 * Set/unset automatic wrapping 1634 * Set/unset automatic wrapping
1598 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1635 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1599 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1636 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1600 */ 1637 */
1601void 1638void ecb_cold
1602rxvt_term::scr_autowrap (int mode) NOTHROW 1639rxvt_term::scr_autowrap (int mode) NOTHROW
1603{ 1640{
1604 if (mode) 1641 if (mode)
1605 screen.flags |= Screen_Autowrap; 1642 screen.flags |= Screen_Autowrap;
1606 else 1643 else
… …
1615 * 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
1616 * and the cursor cannot be moved outside. 1653 * and the cursor cannot be moved outside.
1617 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1654 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1618 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1655 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1619 */ 1656 */
1620void 1657void ecb_cold
1621rxvt_term::scr_relative_origin (int mode) NOTHROW 1658rxvt_term::scr_relative_origin (int mode) NOTHROW
1622{ 1659{
1623 if (mode) 1660 if (mode)
1624 screen.flags |= Screen_Relative; 1661 screen.flags |= Screen_Relative;
1625 else 1662 else
… …
1632/* 1669/*
1633 * Set insert/replace mode 1670 * Set insert/replace mode
1634 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1671 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1635 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1672 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1636 */ 1673 */
1637void 1674void ecb_cold
1638rxvt_term::scr_insert_mode (int mode) NOTHROW 1675rxvt_term::scr_insert_mode (int mode) NOTHROW
1639{ 1676{
1640 if (mode) 1677 if (mode)
1641 screen.flags |= Screen_Insert; 1678 screen.flags |= Screen_Insert;
1642 else 1679 else
… …
1648 * Set/Unset tabs 1685 * Set/Unset tabs
1649 * XTERM_SEQ: Set tab at current column : ESC H 1686 * XTERM_SEQ: Set tab at current column : ESC H
1650 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1687 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1651 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1688 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1652 */ 1689 */
1653void 1690void ecb_cold
1654rxvt_term::scr_set_tab (int mode) NOTHROW 1691rxvt_term::scr_set_tab (int mode) NOTHROW
1655{ 1692{
1656 if (mode < 0) 1693 if (mode < 0)
1657 memset (tabs, 0, ncol); 1694 memset (tabs, 0, ncol);
1658 else if (screen.cur.col < ncol) 1695 else if (screen.cur.col < ncol)
… …
1677 if (rvideo_state != on) 1714 if (rvideo_state != on)
1678 { 1715 {
1679 rvideo_state = on; 1716 rvideo_state = on;
1680 1717
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1719#ifdef HAVE_IMG
1683 if (bgPixmap.pixmap == None) 1720 if (bg_img == 0)
1684#endif 1721#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1722 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1723
1687 XGCValues gcvalue; 1724 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1725 gcvalue.foreground = pix_colors[Color_fg];
… …
1697/* ------------------------------------------------------------------------- */ 1734/* ------------------------------------------------------------------------- */
1698/* 1735/*
1699 * Report current cursor position 1736 * Report current cursor position
1700 * XTERM_SEQ: Report position: ESC [ 6 n 1737 * XTERM_SEQ: Report position: ESC [ 6 n
1701 */ 1738 */
1702void 1739void ecb_cold
1703rxvt_term::scr_report_position () NOTHROW 1740rxvt_term::scr_report_position () NOTHROW
1704{ 1741{
1705 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);
1706} 1743}
1707 1744
… …
1710 * ------------------------------------------------------------------------- */ 1747 * ------------------------------------------------------------------------- */
1711 1748
1712/* 1749/*
1713 * Set font style 1750 * Set font style
1714 */ 1751 */
1715void 1752void ecb_cold
1716rxvt_term::set_font_style () NOTHROW 1753rxvt_term::set_font_style () NOTHROW
1717{ 1754{
1718#if 0 1755#if 0
1719 switch (charsets [screen.charset]) 1756 switch (charsets [screen.charset])
1720 { 1757 {
… …
1742 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1779 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1743 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1780 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1744 * XTERM_SEQ: Invoke G2 character set: ESC N 1781 * XTERM_SEQ: Invoke G2 character set: ESC N
1745 * XTERM_SEQ: Invoke G3 character set: ESC O 1782 * XTERM_SEQ: Invoke G3 character set: ESC O
1746 */ 1783 */
1747void 1784void ecb_cold
1748rxvt_term::scr_charset_choose (int set) NOTHROW 1785rxvt_term::scr_charset_choose (int set) NOTHROW
1749{ 1786{
1750 screen.charset = set; 1787 screen.charset = set;
1751 set_font_style (); 1788 set_font_style ();
1752} 1789}
… …
1773 * ------------------------------------------------------------------------- */ 1810 * ------------------------------------------------------------------------- */
1774 1811
1775/* 1812/*
1776 * refresh matching text. 1813 * refresh matching text.
1777 */ 1814 */
1778bool 1815bool ecb_cold
1779rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1816rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1780{ 1817{
1781 bool found = false; 1818 bool found = false;
1782 1819
1783 for (int i = 0; i < nrow; i++) 1820 for (int i = 0; i < nrow; i++)
… …
1802 PART_BEG = 0, 1839 PART_BEG = 0,
1803 PART_END, 1840 PART_END,
1804 RC_COUNT 1841 RC_COUNT
1805}; 1842};
1806 1843
1807void 1844void ecb_hot
1808rxvt_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
1809{ 1846{
1810 int i; 1847 int i;
1811 row_col_t rc[RC_COUNT]; 1848 row_col_t rc[RC_COUNT];
1812 1849
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1869 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1870 {
1834 min_it (rc[i].col, ncol - 1); 1871 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1872 min_it (rc[i].row, nrow - 1);
1836 } 1873 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1874
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1875 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1876 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1877
1841 num_scr_allow = 0; 1878 num_scr_allow = 0;
1842 1879
… …
1849 * Refresh the entire screen 1886 * Refresh the entire screen
1850 */ 1887 */
1851void 1888void
1852rxvt_term::scr_touch (bool refresh) NOTHROW 1889rxvt_term::scr_touch (bool refresh) NOTHROW
1853{ 1890{
1854 scr_expose (0, 0, width, height, refresh); 1891 scr_expose (0, 0, vt_width, vt_height, refresh);
1855} 1892}
1856 1893
1857/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1858/* 1895/*
1859 * 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
1860 * the top of the screen 1897 * the top of the screen
1861 */ 1898 */
1862void 1899void
1863rxvt_term::scr_move_to (int y, int len) NOTHROW 1900rxvt_term::scr_move_to (int y, int len) NOTHROW
1864{ 1901{
1865 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);
1866} 1904}
1867 1905
1868/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1869/* 1907/*
1870 * Page the screen up/down nlines 1908 * Page the screen up/down nlines
1871 * direction should be UP or DN 1909 * direction should be UP or DN
1872 */ 1910 */
1873bool 1911bool
1874rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1912rxvt_term::scr_page (int nlines) NOTHROW
1875{ 1913{
1876 int new_view_start =
1877 direction == UP ? view_start - nlines
1878 : view_start + nlines;
1879
1880 return scr_changeview (new_view_start); 1914 return scr_changeview (view_start - nlines);
1881} 1915}
1882 1916
1883bool 1917bool
1884rxvt_term::scr_changeview (int new_view_start) NOTHROW 1918rxvt_term::scr_changeview (int new_view_start) NOTHROW
1885{ 1919{
… …
1915 1949
1916# ifndef NO_MAPALERT 1950# ifndef NO_MAPALERT
1917# ifdef MAPALERT_OPTION 1951# ifdef MAPALERT_OPTION
1918 if (option (Opt_mapAlert)) 1952 if (option (Opt_mapAlert))
1919# endif 1953# endif
1920 XMapWindow (dpy, parent[0]); 1954 XMapWindow (dpy, parent);
1921# endif 1955# endif
1922 1956
1923# if ENABLE_FRILLS 1957# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell)) 1958 if (option (Opt_urgentOnBell))
1925 set_urgency (1); 1959 set_urgency (1);
… …
1933 1967
1934 bell_ev.start (VISUAL_BELL_DURATION); 1968 bell_ev.start (VISUAL_BELL_DURATION);
1935 } 1969 }
1936 else 1970 else
1937 XBell (dpy, 0); 1971 XBell (dpy, 0);
1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1938#endif 1973#endif
1939} 1974}
1940 1975
1941/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1942/* ARGSUSED */ 1977void ecb_cold
1943void
1944rxvt_term::scr_printscreen (int fullhist) NOTHROW 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1945{ 1979{
1946#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1947 int nrows, row_start; 1981 int nrows, row_start;
1948 FILE *fd = popen_printer (); 1982 FILE *fd = popen_printer ();
… …
1961 row_start = view_start; 1995 row_start = view_start;
1962 } 1996 }
1963 1997
1964 wctomb (0, 0); 1998 wctomb (0, 0);
1965 1999
1966 for (int r1 = 0; r1 < nrows; r1++) 2000 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1967 { 2001 {
1968 text_t *tp = ROW(r1).t; 2002 text_t *tp = ROW(r1).t;
1969 int len = ROW(r1).l; 2003 int len = ROW(r1).l;
1970 2004
1971 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2005 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1997/* 2031/*
1998 * Refresh the screen 2032 * Refresh the screen
1999 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
2000 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
2001 */ 2035 */
2002void 2036void ecb_hot
2003rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2004{ 2038{
2005 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2006 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2007 int i; /* tmp */ 2041 int i; /* tmp */
2008#ifndef NO_CURSORCOLOR
2009 rend_t cc1; /* store colours at cursor position (s) */
2010#endif
2011 rend_t *crp; // cursor rendition pointer
2012 rend_t ccol1, /* Cursor colour */ 2042 rend_t ccol1, /* Cursor colour */
2013 ccol2; /* Cursor colour2 */ 2043 ccol2; /* Cursor colour2 */
2044 rend_t cur_rend;
2045 int cur_col;
2046 int cursorwidth;
2014 2047
2015 want_refresh = 0; /* screen is current */ 2048 want_refresh = 0; /* screen is current */
2016 2049
2017 if (refresh_type == NO_REFRESH || !mapped) 2050 if (refresh_type == NO_REFRESH || !mapped)
2018 return; 2051 return;
… …
2021 * A: set up vars 2054 * A: set up vars
2022 */ 2055 */
2023 refresh_count = 0; 2056 refresh_count = 0;
2024 2057
2025 unsigned int old_screen_flags = screen.flags; 2058 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0; 2059 bool have_bg = 0;
2027#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2028 have_bg = bgPixmap.pixmap != None; 2061 have_bg = bg_img != 0;
2029#endif 2062#endif
2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2031 2064
2032 /* 2065 /*
2033 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
2037 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2070 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY 2071#if ENABLE_OVERLAY
2039 scr_swap_overlay (); 2072 scr_swap_overlay ();
2040#endif 2073#endif
2041 2074
2042 char showcursor = screen.flags & Screen_VisibleCursor; 2075 bool showcursor = screen.flags & Screen_VisibleCursor;
2043 2076
2044 /* 2077 /*
2045 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2046 */ 2079 */
2047 { 2080 {
2048 unsigned char setoldcursor;
2049
2050#ifdef CURSOR_BLINK 2081#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2082 if (hidden_cursor)
2052 showcursor = 0; 2083 showcursor = 0;
2053#endif 2084#endif
2054 2085
… …
2057 int col = screen.cur.col; 2088 int col = screen.cur.col;
2058 2089
2059 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2090 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2060 col--; 2091 col--;
2061 2092
2093 cursorwidth = 1;
2094 while (col + cursorwidth < ncol
2095 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2096 cursorwidth++;
2097
2062 crp = &ROW(screen.cur.row).r[col]; 2098 cur_rend = ROW(screen.cur.row).r[col];
2099 cur_col = col;
2063 2100
2064#ifndef NO_CURSORCOLOR 2101#ifndef NO_CURSORCOLOR
2065 cc1 = *crp & (RS_fgMask | RS_bgMask);
2066 if (ISSET_PIXCOLOR (Color_cursor)) 2102 if (ISSET_PIXCOLOR (Color_cursor))
2067 ccol1 = Color_cursor; 2103 ccol1 = Color_cursor;
2068 else 2104 else
2069#endif 2105#endif
2070#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2082 ccol2 = bgcolor_of (rstyle); 2118 ccol2 = bgcolor_of (rstyle);
2083#else 2119#else
2084 ccol2 = Color_bg; 2120 ccol2 = Color_bg;
2085#endif 2121#endif
2086 2122
2087 if (showcursor && focus) 2123 if (focus && cursor_type == 0)
2088 { 2124 {
2089 if (option (Opt_cursorUnderline)) 2125 rend_t rend = cur_rend;
2090 *crp ^= RS_Uline; 2126
2091 else
2092 {
2093 *crp ^= RS_RVid; 2127 rend ^= RS_RVid;
2094 *crp = SET_FGCOLOR (*crp, ccol1); 2128 rend = SET_FGCOLOR (rend, ccol1);
2095 *crp = SET_BGCOLOR (*crp, ccol2); 2129 rend = SET_BGCOLOR (rend, ccol2);
2096 } 2130
2131 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2097 } 2132 }
2098 } 2133 }
2099 2134
2100 /* make sure no outline cursor is left around */ 2135 /* make sure no outline cursor is left around */
2101 setoldcursor = 0; 2136 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2102 if (ocrow != -1) 2137 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2138
2139 // save the current cursor coordinates if the cursor is visible
2140 // and either the window is unfocused or the cursor style is
2141 // underline or vertical bar, so as to clear the outline cursor in
2142 // the next refresh if the cursor moves or becomes invisible
2143 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2103 { 2144 {
2104 if (screen.cur.row - view_start != ocrow 2145 oldcursor.row = screen.cur.row - view_start;
2105 || screen.cur.col != oldcursor.col) 2146 oldcursor.col = screen.cur.col;
2106 {
2107 if (ocrow < nrow
2108 && oldcursor.col < ncol)
2109 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2110
2111 if (focus || !showcursor)
2112 oldcursor.row = -1;
2113 else
2114 setoldcursor = 1;
2115 }
2116 } 2147 }
2117 else if (!focus) 2148 else
2118 setoldcursor = 1;
2119
2120 if (setoldcursor)
2121 {
2122 if (screen.cur.row - view_start >= nrow)
2123 oldcursor.row = -1; 2149 oldcursor.row = -1;
2124 else
2125 {
2126 oldcursor.row = screen.cur.row - view_start;
2127 oldcursor.col = screen.cur.col;
2128 }
2129 }
2130 } 2150 }
2131 2151
2132#ifndef NO_SLOW_LINK_SUPPORT 2152#ifndef NO_SLOW_LINK_SUPPORT
2133 /* 2153 /*
2134 * D: CopyArea pass - very useful for slower links 2154 * D: CopyArea pass - very useful for slower links
… …
2140 { 2160 {
2141 int16_t nits; 2161 int16_t nits;
2142 int i = num_scr; 2162 int i = num_scr;
2143 int j; 2163 int j;
2144 int len, wlen; 2164 int len, wlen;
2145 dLocal (int, num_scr);
2146 2165
2147 j = nrow; 2166 j = nrow;
2148 wlen = len = -1; 2167 wlen = len = -1;
2149 row = i > 0 ? 0 : j - 1; 2168 row = i > 0 ? 0 : j - 1;
2150 2169
… …
2216 int ypixel = (int)Row2Pixel (row); 2235 int ypixel = (int)Row2Pixel (row);
2217 2236
2218 for (col = 0; col < ncol; col++) 2237 for (col = 0; col < ncol; col++)
2219 { 2238 {
2220 /* compare new text with old - if exactly the same then continue */ 2239 /* compare new text with old - if exactly the same then continue */
2221 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2240 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2222 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2223 || (stp[col] == ' ' /* space w/ no background change */
2224 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2225 continue; 2241 continue;
2226 2242
2227 // redraw one or more characters 2243 // redraw one or more characters
2228 2244
2229 // seek to the beginning of wide characters 2245 // seek to the beginning of wide characters
2230 while (expect_false (stp[col] == NOCHAR && col > 0)) 2246 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2231 --col; 2247 --col;
2232 2248
2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2249 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2234 text_t *text = stp + col; 2250 text_t *text = stp + col;
2235 int count = 1; 2251 int count = 1;
2236 2252
2237 dtp[col] = stp[col]; 2253 dtp[col] = stp[col];
2238 drp[col] = rend; 2254 drp[col] = rend;
… …
2273 2289
2274 col--; /* went one too far. move back */ 2290 col--; /* went one too far. move back */
2275 count -= i; /* dump any matching trailing chars */ 2291 count -= i; /* dump any matching trailing chars */
2276 2292
2277 // sometimes we optimize away the trailing NOCHAR's, add them back 2293 // sometimes we optimize away the trailing NOCHAR's, add them back
2278 while (expect_false (i && text[count] == NOCHAR)) 2294 while (ecb_unlikely (i && text[count] == NOCHAR))
2279 count++, i--; 2295 count++, i--;
2280 2296
2281 /* 2297 /*
2282 * Determine the attributes for the string 2298 * Determine the attributes for the string
2283 */ 2299 */
2284 int fore = fgcolor_of (rend); // desired foreground 2300 int fore = fgcolor_of (rend); // desired foreground
2285 int back = bgcolor_of (rend); // desired background 2301 int back = bgcolor_of (rend); // desired background
2286 2302
2287 // only do special processing if any attributes are set, which is unlikely 2303 // only do special processing if any attributes are set, which is unlikely
2288 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2304 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2289 { 2305 {
2290 bool invert = rend & RS_RVid; 2306 bool invert = rend & RS_RVid;
2291 2307
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (rend & RS_Bold && fore == Color_fg) 2309 if (rend & RS_Bold && fore == Color_fg)
… …
2312 2328
2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2329 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2314 fore = Color_UL; 2330 fore = Color_UL;
2315#endif 2331#endif
2316 2332
2333#ifdef OPTION_HC
2334 if (rend & RS_Sel)
2335 {
2336 /* invert the column if no highlightColor is set or it is the
2337 * current cursor column */
2338 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2339 && ISSET_PIXCOLOR (Color_HC))
2340 {
2341 if (ISSET_PIXCOLOR (Color_HTC))
2342 fore = Color_HTC;
2343 // if invert is 0 reverse video is set so we use bg color as fg color
2344 else if (!invert)
2345 fore = back;
2346
2347 back = Color_HC;
2348 invert = 0;
2349 }
2350 }
2351#endif
2352
2317 if (invert) 2353 if (invert)
2318 { 2354 {
2319#ifdef OPTION_HC
2320 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2321 || !ISSET_PIXCOLOR (Color_HC))
2322#endif
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 ::swap (fore, back); 2355 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2330 2356
2331#ifndef NO_BOLD_UNDERLINE_REVERSE 2357#ifndef NO_BOLD_UNDERLINE_REVERSE
2332# ifndef OPTION_HC
2333 if (ISSET_PIXCOLOR (Color_RV))
2334 back = Color_RV;
2335# endif
2336 if (fore == back) 2358 if (fore == back)
2337 { 2359 {
2338 fore = Color_bg; 2360 fore = Color_bg;
2339 back = Color_fg; 2361 back = Color_fg;
2340 } 2362 }
… …
2376 /* 2398 /*
2377 * Actually do the drawing of the string here 2399 * Actually do the drawing of the string here
2378 */ 2400 */
2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2401 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2380 2402
2381 if (expect_true (have_bg && back == Color_bg)) 2403 if (ecb_likely (have_bg && back == Color_bg))
2382 { 2404 {
2383 // this is very ugly, maybe push it into ->draw? 2405 // this is very ugly, maybe push it into ->draw?
2384 2406
2385 for (i = 0; i < count; i++) /* don't draw empty strings */ 2407 for (i = 0; i < count; i++) /* don't draw empty strings */
2386 if (text[i] != ' ') 2408 if (text[i] != ' ')
… …
2393 did_clear: ; 2415 did_clear: ;
2394 } 2416 }
2395 else 2417 else
2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2418 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2397 2419
2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2420 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2399 { 2421 {
2422 if (showcursor && focus && row == screen.cur.row
2423 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2424 XSetForeground (dpy, gc, pix_colors[ccol1]);
2425 else
2400#if ENABLE_FRILLS 2426#if ENABLE_FRILLS
2401 if (ISSET_PIXCOLOR (Color_underline)) 2427 if (ISSET_PIXCOLOR (Color_underline))
2402 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2428 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2403 else 2429 else
2404#endif 2430#endif
… …
2416 */ 2442 */
2417 if (showcursor) 2443 if (showcursor)
2418 { 2444 {
2419 if (focus) 2445 if (focus)
2420 { 2446 {
2421 if (option (Opt_cursorUnderline)) 2447 if (cursor_type == 0)
2422 *crp ^= RS_Uline; 2448 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2423 else 2449 else if (oldcursor.row >= 0)
2424 { 2450 {
2425 *crp ^= RS_RVid; 2451 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426#ifndef NO_CURSORCOLOR 2452 if (cursor_type == 1)
2427 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2453 XFillRectangle (dpy, vt, gc,
2428#endif 2454 Col2Pixel (cur_col),
2455 Row2Pixel (oldcursor.row + 1) - 2,
2456 Width2Pixel (1),
2457 2);
2458 else
2459 XFillRectangle (dpy, vt, gc,
2460 Col2Pixel (cur_col),
2461 Row2Pixel (oldcursor.row),
2462 2,
2463 Height2Pixel (1));
2429 } 2464 }
2430 } 2465 }
2431 else if (oldcursor.row >= 0) 2466 else if (oldcursor.row >= 0)
2432 { 2467 {
2433 int cursorwidth = 1;
2434 int col = oldcursor.col;
2435
2436 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2437 col--;
2438
2439 while (col + cursorwidth < ncol
2440 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2441 cursorwidth++;
2442
2443#ifndef NO_CURSORCOLOR
2444 if (ISSET_PIXCOLOR (Color_cursor))
2445 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2446 else
2447#endif
2448 XSetForeground (dpy, gc, pix_colors[ccol1]); 2468 XSetForeground (dpy, gc, pix_colors[ccol1]);
2449 2469
2450 XDrawRectangle (dpy, vt, gc, 2470 XDrawRectangle (dpy, vt, gc,
2451 Col2Pixel (col), 2471 Col2Pixel (cur_col),
2452 Row2Pixel (oldcursor.row), 2472 Row2Pixel (oldcursor.row),
2453 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2473 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2454 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2474 (unsigned int) (Height2Pixel (1) - 1));
2455 } 2475 }
2456 } 2476 }
2457 2477
2458 /* 2478 /*
2459 * H: cleanup selection 2479 * H: cleanup selection
… …
2468 screen.flags = old_screen_flags; 2488 screen.flags = old_screen_flags;
2469 num_scr = 0; 2489 num_scr = 0;
2470 num_scr_allow = 1; 2490 num_scr_allow = 1;
2471} 2491}
2472 2492
2473void 2493void ecb_cold
2474rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2494rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2475{ 2495{
2476 if (!l.t) 2496 if (!l.valid ())
2477 return; 2497 return;
2478 2498
2479 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2499 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2480 2500
2481 for (int i = ncol; i--; ) 2501 for (int i = ncol; i--; )
2482 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2502 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2483} 2503}
2484 2504
2485void 2505void ecb_cold
2486rxvt_term::scr_remap_chars () NOTHROW 2506rxvt_term::scr_remap_chars () NOTHROW
2487{ 2507{
2488 for (int i = total_rows; i--; ) 2508 for (int i = total_rows; i--; )
2489 scr_remap_chars (row_buf [i]); 2509 scr_remap_chars (row_buf [i]);
2490 2510
… …
2493 scr_remap_chars (drawn_buf [i]); 2513 scr_remap_chars (drawn_buf [i]);
2494 scr_remap_chars (swap_buf [i]); 2514 scr_remap_chars (swap_buf [i]);
2495 } 2515 }
2496} 2516}
2497 2517
2498void 2518void ecb_cold
2499rxvt_term::scr_recolour () NOTHROW 2519rxvt_term::scr_recolor (bool refresh) NOTHROW
2500{ 2520{
2501#ifdef HAVE_BG_PIXMAP 2521 bool transparent = false;
2502 bgPixmap.apply ();
2503#else
2504 2522
2523#ifdef HAVE_IMG
2524 if (bg_img != 0)
2525 {
2526# if ENABLE_TRANSPARENCY
2527 if (bg_flags & BG_IS_TRANSPARENT)
2528 {
2529 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2530 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2531
2532 transparent = true;
2533 }
2534 else
2535# endif
2536 {
2537 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2538 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2539 }
2540 }
2541 else
2542#endif
2543 {
2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2506 XClearWindow (dpy, parent[0]);
2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2545 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2546 }
2508 2547
2509 if (scrollBar.win) 2548 XClearWindow (dpy, parent);
2549
2550 if (scrollBar.state && scrollBar.win)
2510 { 2551 {
2552 if (transparent)
2553 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2554 else
2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2555 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2512 scrollBar.state = STATE_IDLE; 2556 scrollBar.state = SB_STATE_IDLE;
2513 scrollBar.show (0); 2557 scrollBar.show (0);
2514 } 2558 }
2515 2559
2516#endif 2560 if (refresh)
2517 2561 {
2518 /* bgPixmap.apply () does not do the following : */
2519 scr_clear (); 2562 scr_clear ();
2520 scr_touch (true); 2563 scr_touch (true);
2564 }
2521 want_refresh = 1; 2565 want_refresh = 1;
2522} 2566}
2523 2567
2524/* ------------------------------------------------------------------------- */ 2568/* ------------------------------------------------------------------------- */
2525void 2569void
… …
2582 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2626 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2583 srp[col] ^= rstyle; 2627 srp[col] ^= rstyle;
2584} 2628}
2585 2629
2586/* ------------------------------------------------------------------------- */ 2630/* ------------------------------------------------------------------------- */
2587void 2631void ecb_hot
2588rxvt_term::scr_reverse_selection () NOTHROW 2632rxvt_term::scr_reverse_selection () NOTHROW
2589{ 2633{
2590 if (selection.op 2634 if (selection.op
2591 && current_screen == selection.screen 2635 && current_screen == selection.screen
2592 && selection.end.row >= view_start) 2636 && selection.end.row >= view_start)
2593 { 2637 {
2594#if !ENABLE_MINIMAL 2638#if !ENABLE_MINIMAL
2595 if (selection.rect) 2639 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2640 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2641 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2642 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2643 else
2600#endif 2644#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2645 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2646 selection.end.row, selection.end.col,
2603 RS_RVid); 2647 RS_Sel | RS_RVid);
2604 } 2648 }
2605} 2649}
2606 2650
2607/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2608/* 2652/*
… …
2611 */ 2655 */
2612#if 0 2656#if 0
2613void 2657void
2614rxvt_term::scr_dump (int fd) NOTHROW 2658rxvt_term::scr_dump (int fd) NOTHROW
2615{ 2659{
2616 int row, wrote; 2660 // if this method is needed, it can be implemented by factoring the
2617 unsigned int width, towrite; 2661 // relevant code in scr_printscreen
2618 char r1[] = "\n";
2619
2620 for (row = saveLines + top_row;
2621 row < saveLines + nrow - 1; row++)
2622 {
2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2624 : ncol;
2625 for (towrite = width; towrite; towrite -= wrote)
2626 {
2627 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2628 towrite);
2629 if (wrote < 0)
2630 return; /* XXX: death, no report */
2631 }
2632 if (row_buf[row].l >= 0)
2633 if (write (fd, r1, 1) <= 0)
2634 return; /* XXX: death, no report */
2635 }
2636} 2662}
2637#endif 2663#endif
2638 2664
2639/* ------------------------------------------------------------------------- * 2665/* ------------------------------------------------------------------------- *
2640 * CHARACTER SELECTION * 2666 * CHARACTER SELECTION *
2641 * ------------------------------------------------------------------------- */ 2667 * ------------------------------------------------------------------------- */
2642void 2668void
2643rxvt_term::selection_check (int check_more) NOTHROW 2669rxvt_term::selection_check (int check_more) NOTHROW
2644{ 2670{
2645 row_col_t pos;
2646
2647 if (!selection.op) 2671 if (!selection.op)
2648 return; 2672 return;
2649 2673
2650 pos.row = pos.col = 0;
2651 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2674 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2652 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2675 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2653 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2676 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2654 || (check_more == 1 2677 || (check_more == 1
2655 && current_screen == selection.screen 2678 && current_screen == selection.screen
2656 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2679 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2657 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2680 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2658 || (check_more == 2
2659 && ROWCOL_IS_BEFORE (selection.beg, pos)
2660 && ROWCOL_IS_AFTER (selection.end, pos))
2661 || (check_more == 3
2662 && ROWCOL_IS_AFTER (selection.end, pos))
2663 || (check_more == 4 /* screen width change */
2664 && (selection.beg.row != selection.end.row
2665 || selection.end.col > ncol)))
2666 CLEAR_SELECTION (); 2681 CLEAR_ALL_SELECTION ();
2682}
2683
2684void
2685rxvt_term::selection_changed () NOTHROW
2686{
2687 line_t &r1 = ROW (selection.beg.row);
2688 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2689 ++selection.beg.col;
2690
2691 line_t &r2 = ROW (selection.end.row);
2692 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2693 ++selection.end.col;
2694
2695 want_refresh = 1;
2667} 2696}
2668 2697
2669/* ------------------------------------------------------------------------- */ 2698/* ------------------------------------------------------------------------- */
2670/* 2699/*
2671 * Paste a selection direct to the command fd 2700 * Paste a selection direct to the command fd
2672 */ 2701 */
2673void 2702void
2674rxvt_term::paste (char *data, unsigned int len) NOTHROW 2703rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675{ 2704{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2705 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2706 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2707 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2708 data[i] = C0_CR;
2680 2709
2681 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~"); 2711 tt_printf ("\x1b[200~");
2683 2712
2684 tt_write (data, len); 2713 tt_write (data, len);
2685 2714
2686 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~"); 2716 tt_printf ("\x1b[201~");
2688} 2717}
2689 2718
2690/* ------------------------------------------------------------------------- */
2691/*
2692 * Respond to a notification that a primary selection has been sent
2693 * EXT: SelectionNotify
2694 */
2695void 2719void
2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2720rxvt_term::paste (char *data, unsigned int len) NOTHROW
2697{ 2721{
2698 if (prop == None) /* check for failed XConvertSelection */ 2722 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2699 {
2700 if ((selection_type & Sel_CompoundText))
2701 {
2702 int selnum = selection_type & Sel_whereMask;
2703
2704 selection_type = 0;
2705 if (selnum != Sel_direct)
2706 selection_request_other (XA_STRING, selnum);
2707 }
2708
2709 if ((selection_type & Sel_UTF8String))
2710 {
2711 int selnum = selection_type & Sel_whereMask;
2712
2713 selection_type = Sel_CompoundText;
2714 if (selnum != Sel_direct)
2715 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2716 else
2717 selection_type = 0;
2718 }
2719
2720 return;
2721 }
2722
2723 unsigned long bytes_after;
2724 XTextProperty ct;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 0, PROP_SIZE / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct.encoding, &ct.format,
2730 &ct.nitems, &bytes_after,
2731 &ct.value) != Success)
2732 {
2733 ct.value = 0;
2734 goto bailout;
2735 }
2736
2737 if (ct.encoding == None)
2738 goto bailout;
2739
2740 if (bytes_after)
2741 {
2742 // fetch and append remaining data
2743 XTextProperty ct2;
2744
2745 if (XGetWindowProperty (dpy, win, prop,
2746 ct.nitems / 4, (bytes_after + 3) / 4,
2747 delete_prop, AnyPropertyType,
2748 &ct2.encoding, &ct2.format,
2749 &ct2.nitems, &bytes_after,
2750 &ct2.value) != Success)
2751 goto bailout;
2752
2753 // realloc should be compatible to XFree, here, and elsewhere, too
2754 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2755 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2756 ct.nitems += ct2.nitems;
2757
2758 XFree (ct2.value);
2759 }
2760
2761 if (ct.value == 0)
2762 goto bailout;
2763
2764 if (ct.encoding == xa[XA_INCR])
2765 {
2766 // INCR selection, start handshake
2767 if (!delete_prop)
2768 XDeleteProperty (dpy, win, prop);
2769
2770 selection_wait = Sel_incr;
2771 incr_buf_fill = 0;
2772 incr_ev.start (10);
2773
2774 goto bailout;
2775 }
2776
2777 if (ct.nitems == 0)
2778 {
2779 if (selection_wait == Sel_incr)
2780 {
2781 XFree (ct.value);
2782
2783 // finally complete, now paste the whole thing
2784 selection_wait = Sel_normal;
2785 ct.value = (unsigned char *)incr_buf;
2786 ct.nitems = incr_buf_fill;
2787 incr_buf = 0;
2788 incr_buf_size = 0;
2789 incr_ev.stop ();
2790 }
2791 else
2792 {
2793 if (selection_wait == Sel_normal
2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2795 {
2796 /*
2797 * pass through again trying CUT_BUFFER0 if we've come from
2798 * XConvertSelection () but nothing was presented
2799 */
2800 selection_paste (display->root, XA_CUT_BUFFER0, False);
2801 }
2802
2803 goto bailout;
2804 }
2805 }
2806 else if (selection_wait == Sel_incr)
2807 {
2808 incr_ev.start (10);
2809
2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2811 {
2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2814 }
2815
2816 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2817 incr_buf_fill += ct.nitems;
2818
2819 goto bailout;
2820 }
2821
2822 char **cl;
2823 int cr;
2824
2825#if !ENABLE_MINIMAL
2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2827 // so recode it manually
2828 if (ct.encoding == xa[XA_UTF8_STRING])
2829 {
2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2831 char *s = rxvt_wcstombs (w);
2832 free (w);
2833 // TODO: strlen == only the first element will be converted. well...
2834 paste (s, strlen (s));
2835 free (s);
2836 }
2837 else
2838#endif
2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2840 && cl)
2841 {
2842 for (int i = 0; i < cr; i++)
2843 paste (cl[i], strlen (cl[i]));
2844
2845 XFreeStringList (cl);
2846 }
2847 else
2848 paste ((char *)ct.value, ct.nitems); // paste raw
2849
2850bailout:
2851 XFree (ct.value);
2852
2853 if (selection_wait == Sel_normal)
2854 selection_wait = Sel_none;
2855}
2856
2857void
2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2859{
2860 selection_wait = Sel_none;
2861
2862 incr_buf_size = 0;
2863 free (incr_buf);
2864
2865 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2866}
2867
2868void
2869rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2870{
2871 if (prop == None || selection_wait != Sel_incr)
2872 return; 2723 return;
2873 2724
2874 selection_paste (win, prop, true); 2725 tt_paste (data, len);
2875} 2726}
2876 2727
2877/* ------------------------------------------------------------------------- */ 2728/* ------------------------------------------------------------------------- */
2878/* 2729/*
2879 * Request the current selection: 2730 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2880 * Order: > internal selection if available 2731 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2732 * as fallback
2882 * > CUT_BUFFER0
2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2884 * will auto fallback to CUT_BUFFER0
2885 * EXT: button 2 release 2733 * EXT: button 2 release
2886 */ 2734 */
2887void 2735void
2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2736rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2889{ 2737{
2890 if (selection.text && selnum == Sel_Primary) 2738 if (!selection_req)
2891 {
2892 /* internal selection */
2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2894 paste (str, strlen (str));
2895 free (str);
2896 return;
2897 } 2739 {
2898 else 2740 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2741 selection_req->run ();
2899 { 2742 }
2900 selection_request_time = tm;
2901 selection_wait = Sel_normal;
2902
2903#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return;
2907#else
2908 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return;
2911#endif
2912 }
2913
2914 selection_wait = Sel_none; /* don't loop in selection_paste () */
2915 selection_paste (display->root, XA_CUT_BUFFER0, false);
2916}
2917
2918int
2919rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2920{
2921 Atom sel;
2922
2923 selection_type |= selnum;
2924
2925 if (selnum == Sel_Primary)
2926 sel = XA_PRIMARY;
2927 else if (selnum == Sel_Secondary)
2928 sel = XA_SECONDARY;
2929 else
2930 sel = xa[XA_CLIPBOARD];
2931
2932 if (XGetSelectionOwner (dpy, sel) != None)
2933 {
2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2935 vt, selection_request_time);
2936 return 1;
2937 }
2938
2939 return 0;
2940} 2743}
2941 2744
2942/* ------------------------------------------------------------------------- */ 2745/* ------------------------------------------------------------------------- */
2943/* 2746/*
2944 * Clear all selected text 2747 * Clear all selected text
2945 * EXT: SelectionClear 2748 * EXT: SelectionClear
2946 */ 2749 */
2947void 2750void
2948rxvt_term::selection_clear () NOTHROW 2751rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2752{
2753 if (!clipboard)
2754 {
2950 want_refresh = 1; 2755 want_refresh = 1;
2951 free (selection.text); 2756 free (selection.text);
2952 selection.text = NULL; 2757 selection.text = NULL;
2953 selection.len = 0; 2758 selection.len = 0;
2954 CLEAR_SELECTION (); 2759 CLEAR_SELECTION ();
2955 2760
2956 if (display->selection_owner == this) 2761 if (display->selection_owner == this)
2957 display->selection_owner = 0; 2762 display->selection_owner = 0;
2763 }
2764 else
2765 {
2766 free (selection.clip_text);
2767 selection.clip_text = NULL;
2768 selection.clip_len = 0;
2769
2770 if (display->clipboard_owner == this)
2771 display->clipboard_owner = 0;
2772 }
2958} 2773}
2959 2774
2960/* ------------------------------------------------------------------------- */ 2775/* ------------------------------------------------------------------------- */
2961/* 2776/*
2962 * Copy a selection into the cut buffer 2777 * Copy a selection into the cut buffer
2963 * EXT: button 1 or 3 release 2778 * EXT: button 1 or 3 release
2964 */ 2779 */
2965void 2780void
2966rxvt_term::selection_make (Time tm) 2781rxvt_term::selection_make (Time tm)
2967{ 2782{
2968 int i; 2783 int size;
2969 wchar_t *new_selection_text; 2784 wchar_t *new_selection_text;
2970 text_t *t; 2785 text_t *t;
2971 2786
2972 switch (selection.op) 2787 switch (selection.op)
2973 { 2788 {
… …
2989 return; /* nothing selected, go away */ 2804 return; /* nothing selected, go away */
2990 2805
2991 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2806 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2992 return; 2807 return;
2993 2808
2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2809 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2810 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2996 2811
2997 int ofs = 0; 2812 int ofs = 0;
2998 int extra = 0; 2813 int extra = 0;
2999 2814
3000 int col = selection.beg.col; 2815 int col = selection.beg.col;
… …
3006 { 2821 {
3007#if !ENABLE_MINIMAL 2822#if !ENABLE_MINIMAL
3008 if (selection.rect) 2823 if (selection.rect)
3009 { 2824 {
3010 col = selection.beg.col; 2825 col = selection.beg.col;
3011 end_col = ncol + 1; 2826 end_col = selection.end.col;
3012 } 2827 }
3013 else 2828 else
3014#endif 2829#endif
3015 end_col = ROW(row).l; 2830 end_col = ROW(row).l;
3016 2831
3017 col = max (col, 0); 2832 col = max (col, 0);
3018 2833
3019 if (row == selection.end.row 2834 if (row == selection.end.row)
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
3024 min_it (end_col, selection.end.col); 2835 min_it (end_col, selection.end.col);
3025 2836
3026 t = ROW(row).t + col; 2837 t = ROW(row).t + col;
3027 2838
3028 for (; col < end_col; col++) 2839 for (; col < end_col; col++)
… …
3036 2847
3037 extra -= (len - 1); 2848 extra -= (len - 1);
3038 2849
3039 if (extra < 0) 2850 if (extra < 0)
3040 { 2851 {
3041 extra += i; 2852 extra += size;
3042 i += i; 2853 size += size;
3043 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2854 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3044 } 2855 }
3045 2856
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2857 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 } 2858 }
3048#endif 2859#endif
… …
3060 2871
3061 new_selection_text[ofs++] = C0_LF; 2872 new_selection_text[ofs++] = C0_LF;
3062 } 2873 }
3063 else 2874 else
3064#endif 2875#endif
3065 if (!ROW(row).is_longer () && row != selection.end.row) 2876 if (!ROW(row).is_longer ()
2877 && (row != selection.end.row || end_col != selection.end.col)
2878 && (row != selection.beg.row || selection.beg.col < ncol))
3066 new_selection_text[ofs++] = C0_LF; 2879 new_selection_text[ofs++] = C0_LF;
3067 } 2880 }
3068
3069 if (end_col != selection.end.col)
3070 new_selection_text[ofs++] = C0_LF;
3071 2881
3072 new_selection_text[ofs] = 0; 2882 new_selection_text[ofs] = 0;
3073 2883
3074 if (ofs == 0) 2884 if (ofs == 0)
3075 { 2885 {
… …
3088 2898
3089 selection_grab (tm); 2899 selection_grab (tm);
3090} 2900}
3091 2901
3092bool 2902bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 2903rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 2904{
2905 Atom sel;
2906
2907 if (!clipboard)
2908 {
3095 selection_time = tm; 2909 selection_time = tm;
2910 sel = XA_PRIMARY;
2911 }
2912 else
2913 {
2914 clipboard_time = tm;
2915 sel = xa[XA_CLIPBOARD];
2916 }
3096 2917
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2918 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2919 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 2920 {
3100 display->set_selection_owner (this); 2921 display->set_selection_owner (this, clipboard);
3101 return true; 2922 return true;
3102 } 2923 }
3103 else 2924 else
3104 { 2925 {
3105 selection_clear (); 2926 selection_clear (clipboard);
3106 return false; 2927 return false;
3107 } 2928 }
3108 2929
3109#if 0 2930#if 0
3110 XTextProperty ct; 2931 XTextProperty ct;
… …
3120/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
3121/* 2942/*
3122 * Mark or select text based upon number of clicks: 1, 2, or 3 2943 * Mark or select text based upon number of clicks: 1, 2, or 3
3123 * EXT: button 1 press 2944 * EXT: button 1 press
3124 */ 2945 */
3125void 2946void ecb_cold
3126rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2947rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3127{ 2948{
3128 clicks = ((clicks - 1) % 3) + 1; 2949 clicks = ((clicks - 1) % 3) + 1;
3129 selection.clicks = clicks; /* save clicks so extend will work */ 2950 selection.clicks = clicks; /* save clicks so extend will work */
3130 2951
… …
3149 2970
3150/* ------------------------------------------------------------------------- */ 2971/* ------------------------------------------------------------------------- */
3151/* 2972/*
3152 * Mark a selection at the specified col/row 2973 * Mark a selection at the specified col/row
3153 */ 2974 */
3154void 2975void ecb_cold
3155rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2976rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3156{ 2977{
3157 want_refresh = 1; 2978 want_refresh = 1;
3158 2979
3159 selection.mark.row = row + view_start; 2980 selection.mark.row = row + view_start;
… …
3182 * Word select: select text for 2 clicks 3003 * Word select: select text for 2 clicks
3183 * We now only find out the boundary in one direction 3004 * We now only find out the boundary in one direction
3184 */ 3005 */
3185 3006
3186/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3007/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3187#define DELIMIT_TEXT(x) \ 3008#define DELIMIT_TEXT(x) \
3188 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3009 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3189#define DELIMIT_REND(x) 1 3010#define DELIMIT_REND(x) 1
3190 3011
3191void 3012void ecb_cold
3192rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3013rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3193{ 3014{
3194 int col, row, dirnadd, tcol, trow, w1, w2; 3015 int col, row, dirnadd, tcol, trow, w1, w2;
3195 row_col_t bound; 3016 row_col_t bound;
3196 text_t *stp; 3017 text_t *stp;
… …
3270 * EXT: button 3 press; button 1 or 3 drag 3091 * EXT: button 3 press; button 1 or 3 drag
3271 * flag == 0 ==> button 1 3092 * flag == 0 ==> button 1
3272 * flag == 1 ==> button 3 press 3093 * flag == 1 ==> button 3 press
3273 * flag == 2 ==> button 3 motion 3094 * flag == 2 ==> button 3 motion
3274 */ 3095 */
3275void 3096void ecb_cold
3276rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3097rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3277{ 3098{
3278 int col = clamp (Pixel2Col (x), 0, ncol); 3099 int col = clamp (Pixel2Col (x), 0, ncol);
3279 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3100 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3280 3101
… …
3306 3127
3307/* ------------------------------------------------------------------------- */ 3128/* ------------------------------------------------------------------------- */
3308/* 3129/*
3309 * Extend the selection to the specified col/row 3130 * Extend the selection to the specified col/row
3310 */ 3131 */
3311void 3132void ecb_cold
3312rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3133rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3313{ 3134{
3314 row_col_t pos; 3135 row_col_t pos;
3315 enum { 3136 enum {
3316 LEFT, RIGHT 3137 LEFT, RIGHT
3317 } closeto = RIGHT; 3138 } closeto = RIGHT;
3318
3319 want_refresh = 1;
3320 3139
3321 switch (selection.op) 3140 switch (selection.op)
3322 { 3141 {
3323 case SELECTION_INIT: 3142 case SELECTION_INIT:
3324 CLEAR_SELECTION (); 3143 CLEAR_SELECTION ();
… …
3504 3323
3505#if !ENABLE_MINIMAL 3324#if !ENABLE_MINIMAL
3506 if (selection.rect && selection.beg.col > selection.end.col) 3325 if (selection.rect && selection.beg.col > selection.end.col)
3507 ::swap (selection.beg.col, selection.end.col); 3326 ::swap (selection.beg.col, selection.end.col);
3508#endif 3327#endif
3328
3329 selection_changed ();
3509} 3330}
3510 3331
3511#if !ENABLE_MINIMAL 3332#if !ENABLE_MINIMAL
3512void 3333void ecb_cold
3513rxvt_term::selection_remove_trailing_spaces () NOTHROW 3334rxvt_term::selection_remove_trailing_spaces () NOTHROW
3514{ 3335{
3515 int32_t end_col, end_row; 3336 int32_t end_col, end_row;
3516 text_t *stp; 3337 text_t *stp;
3517 3338
… …
3555/* ------------------------------------------------------------------------- */ 3376/* ------------------------------------------------------------------------- */
3556/* 3377/*
3557 * Double click on button 3 when already selected 3378 * Double click on button 3 when already selected
3558 * EXT: button 3 double click 3379 * EXT: button 3 double click
3559 */ 3380 */
3560void 3381void ecb_cold
3561rxvt_term::selection_rotate (int x, int y) NOTHROW 3382rxvt_term::selection_rotate (int x, int y) NOTHROW
3562{ 3383{
3563 selection.clicks = selection.clicks % 3 + 1; 3384 selection.clicks = selection.clicks % 3 + 1;
3564 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3385 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3565} 3386}
… …
3567/* ------------------------------------------------------------------------- */ 3388/* ------------------------------------------------------------------------- */
3568/* 3389/*
3569 * Respond to a request for our current selection 3390 * Respond to a request for our current selection
3570 * EXT: SelectionRequest 3391 * EXT: SelectionRequest
3571 */ 3392 */
3572void 3393void ecb_cold
3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3394rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3574{ 3395{
3396 Atom property = rq.property == None ? rq.target : rq.property;
3575 XSelectionEvent ev; 3397 XSelectionEvent ev;
3576 3398
3577 ev.type = SelectionNotify; 3399 ev.type = SelectionNotify;
3578 ev.property = None; 3400 ev.property = None;
3579 ev.display = rq.display; 3401 ev.display = rq.display;
… …
3594 *target++ = xa[XA_COMPOUND_TEXT]; 3416 *target++ = xa[XA_COMPOUND_TEXT];
3595#if X_HAVE_UTF8_STRING 3417#if X_HAVE_UTF8_STRING
3596 *target++ = xa[XA_UTF8_STRING]; 3418 *target++ = xa[XA_UTF8_STRING];
3597#endif 3419#endif
3598 3420
3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3421 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3600 32, PropModeReplace, 3422 32, PropModeReplace,
3601 (unsigned char *)target_list, target - target_list); 3423 (unsigned char *)target_list, target - target_list);
3602 ev.property = rq.property; 3424 ev.property = property;
3603 } 3425 }
3604#if TODO // TODO 3426#if TODO // TODO
3605 else if (rq.target == xa[XA_MULTIPLE]) 3427 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3428 {
3607 /* TODO: Handle MULTIPLE */ 3429 /* TODO: Handle MULTIPLE */
3608 } 3430 }
3609#endif 3431#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3432 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3433 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3434 XChangeProperty (dpy, rq.requestor, property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3435 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3614 ev.property = rq.property; 3436 ev.property = property;
3437 }
3438 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3439 {
3440 XChangeProperty (dpy, rq.requestor, property, rq.target,
3441 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3442 ev.property = property;
3615 } 3443 }
3616 else if (rq.target == XA_STRING 3444 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3445 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3446 || rq.target == xa[XA_COMPOUND_TEXT]
3619 || rq.target == xa[XA_UTF8_STRING] 3447 || rq.target == xa[XA_UTF8_STRING]
… …
3651 { 3479 {
3652 target = xa[XA_COMPOUND_TEXT]; 3480 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3481 style = enc_compound_text;
3654 } 3482 }
3655 3483
3656 if (selection.text) 3484 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3485 {
3658 cl = selection.text; 3486 cl = selection.text;
3659 selectlen = selection.len; 3487 selectlen = selection.len;
3488 }
3489 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3490 {
3491 cl = selection.clip_text;
3492 selectlen = selection.clip_len;
3660 } 3493 }
3661 else 3494 else
3662 { 3495 {
3663 cl = L""; 3496 cl = L"";
3664 selectlen = 0; 3497 selectlen = 0;
… …
3685 ct.value = (unsigned char *)cl; 3518 ct.value = (unsigned char *)cl;
3686 ct.nitems = selectlen; 3519 ct.nitems = selectlen;
3687 ct.encoding = target; 3520 ct.encoding = target;
3688 } 3521 }
3689 3522
3690 XChangeProperty (dpy, rq.requestor, rq.property, 3523 XChangeProperty (dpy, rq.requestor, property,
3691 ct.encoding, 8, PropModeReplace, 3524 ct.encoding, 8, PropModeReplace,
3692 ct.value, (int)ct.nitems); 3525 ct.value, (int)ct.nitems);
3693 ev.property = rq.property; 3526 ev.property = property;
3694 3527
3695 if (freect) 3528 if (freect)
3696 XFree (ct.value); 3529 XFree (ct.value);
3697 } 3530 }
3698 3531
3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3532 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3700} 3533}
3701 3534
3702/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3703#ifdef USE_XIM 3536#if USE_XIM
3704void 3537void ecb_cold
3705rxvt_term::im_set_position (XPoint &pos) NOTHROW 3538rxvt_term::im_set_position (XPoint &pos) NOTHROW
3706{ 3539{
3707 XWindowAttributes xwa; 3540 XWindowAttributes xwa;
3708 3541
3709 XGetWindowAttributes (dpy, vt, &xwa); 3542 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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