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

Diff Legend

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