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.324 by root, Wed Nov 5 00:01:01 2008 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <inttypes.h> 32#include <inttypes.h>
32 33
33#include "salloc.C" // HACK, should be a seperate compile! 34static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
41/* ------------------------------------------------------------------------- */ 41/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 42#define TABSIZE 8 /* default tab size */
45 43
46/* ------------------------------------------------------------------------- * 44/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 45 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 46 * ------------------------------------------------------------------------- */
… …
99 97
100/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
101void 99void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 101{
104 if (!l.t) 102 if (!l.valid ())
105 { 103 {
106 lalloc (l); 104 l.alloc ();
107 col = 0; 105 col = 0;
108 width = ncol; 106 width = ncol;
109 } 107 }
110 108
111 l.touch (); 109 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 140 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 141 col--;
144 142
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 143 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 144 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
145
146 l.touch ();
147 147
148 // found start, nuke 148 // found start, nuke
149 do { 149 do {
150 l.t[col] = ' '; 150 l.t[col] = ' ';
151 l.r[col] = rend; 151 l.r[col] = rend;
152 col++; 152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
154} 154}
155 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
156/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
159 169
160void 170void
171rxvt_term::scr_alloc () NOTHROW
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
161rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
162{ 216{
163 scr_soft_reset (); 217#if ENABLE_OVERLAY
218 scr_overlay_off ();
219#endif
164 220
165 view_start = 0; 221 view_start = 0;
166 num_scr = 0; 222 num_scr = 0;
167 223
168 if (ncol == 0) 224 if (ncol == 0)
… …
189 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
190 246
191 screen.tscroll = 0; 247 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
193 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
194 if (!row_buf) 258 if (!prev_row_buf)
195 { 259 {
196 /*
197 * first time called so just malloc everything: don't rely on realloc
198 */
199 top_row = 0; 260 top_row = 0;
200 term_start = 0; 261 term_start = 0;
201
202 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204
205 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208
209 for (int row = nrow; row--; )
210 {
211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
213 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
214 }
215 262
216 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
217 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
218 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
219 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
233 selection.text = NULL; 280 selection.text = NULL;
234 selection.len = 0; 281 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 282 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 283 selection.screen = PRIMARY;
237 selection.clicks = 0; 284 selection.clicks = 0;
285 selection.clip_text = NULL;
286 selection.clip_len = 0;
238 } 287 }
239 else 288 else
240 { 289 {
241 /* 290 /*
242 * add or delete rows as appropriate 291 * add or delete rows as appropriate
243 */ 292 */
244 293
245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247
248#if 0
249 if (nrow < prev_nrow)
250 {
251 for (int row = nrow; row < prev_nrow; row++)
252 {
253 lfree (swap_buf [row]);
254 lfree (drawn_buf[row]);
255 }
256 }
257#endif
258
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 295
262 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
263 { 297 {
264 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
265 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
266 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
267 301
268 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
269 { 303 }
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 }
273
274 line_t *old_buf = row_buf;
275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 304
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
280 308
281 if (top_row) 309 if (top_row)
282 { 310 {
283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 311 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 312 // to come up with a lean and mean algorithm.
313 // TODO: maybe optimise when width didn't change
285 314
286 row_col_t ocur = screen.cur; 315 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 317
289 do 318 do
290 { 319 {
291 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
294#endif
295 int plines = 1; 322 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 324
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 326 {
300 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
301 328
302 plines++; 329 plines++;
303 llen += prev_ncol; 330 llen += prev_ncol;
… …
316 343
317 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
319 { 346 {
320 qline = row_buf + qrow; 347 qline = row_buf + qrow;
321 lalloc (*qline); 348 qline->alloc (); // redundant with next line
322 qline->l = ncol; 349 qline->l = ncol;
323 qline->is_longer (1); 350 qline->is_longer (1);
324 351
325 int qcol = 0; 352 int qcol = 0;
326 353
… …
341 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
342 // least. 369 // least.
343 if (prow == ocur.row) 370 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
345 372
346 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
347 374
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 376
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
372 { 399 {
373 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
374 401
375 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
376 { 403 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
379 406
380 qline = pline; 407 copy_line (dst, src);
381 lresize (qline);
382 } 408 }
383 409
384 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 412
389 term_start = 0; 413 term_start = 0;
390 } 414 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 415
396 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 418 }
399 419
420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
429 free (tabs);
430 tabs = (char *)rxvt_malloc (ncol);
431
432 for (int col = ncol; col--; )
433 tabs [col] = col % TABSIZE == 0;
434
400 CLEAR_ALL_SELECTION (); 435 CLEAR_ALL_SELECTION ();
401 436
402 prev_nrow = nrow; 437 prev_nrow = nrow;
403 prev_ncol = ncol; 438 prev_ncol = ncol;
404 439
405 tt_winch (); 440 tt_winch ();
406 441
407 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
408} 443}
409 444
410/* ------------------------------------------------------------------------- */ 445void ecb_cold
411/*
412 * Free everything. That way malloc debugging can find leakage.
413 */
414void
415rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () NOTHROW
416{ 447{
417 if (row_buf) 448 chunk_free (chunk, chunk_size);
418 { 449 chunk = 0;
419 delete talloc; talloc = 0; 450 row_buf = 0;
420 delete ralloc; ralloc = 0;
421 451
422 free (row_buf);
423 free (swap_buf);
424 free (drawn_buf);
425 row_buf = 0; // signal that we freed all the arrays above
426
427 free (tabs); 452 free (tabs);
428 tabs = 0; 453 tabs = 0;
429 }
430} 454}
431 455
432/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
433/* 457/*
434 * Hard/Soft reset 458 * Hard/Soft reset
435 */ 459 */
436void 460void ecb_cold
437rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
438{ 462{
439 scr_release (); 463 scr_release ();
464
440 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
466 rvideo_mode = false;
467 scr_soft_reset ();
441 scr_reset (); 468 scr_reset ();
442 469
443 scr_clear (true); 470 scr_clear (true);
444 scr_refresh (); 471 scr_refresh ();
445} 472}
446 473
447void 474void ecb_cold
448rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () NOTHROW
449{ 476{
450 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
452 scr_overlay_off (); 479 scr_overlay_off ();
453#endif 480#endif
454 481
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 482 if (current_screen != PRIMARY)
458 scr_swap_screen (); 483 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
465 484
466 scr_scroll_region (0, MAX_ROWS - 1); 485 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 486 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 487 scr_insert_mode (0);
469} 488}
… …
511 } 530 }
512 531
513 /* boundary check in case screen size changed between SAVE and RESTORE */ 532 /* boundary check in case screen size changed between SAVE and RESTORE */
514 min_it (s->cur.row, nrow - 1); 533 min_it (s->cur.row, nrow - 1);
515 min_it (s->cur.col, ncol - 1); 534 min_it (s->cur.col, ncol - 1);
516#ifdef DEBUG_STRICT
517 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
519#endif
520} 537}
521 538
522void 539void
523rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () NOTHROW
524{ 541{
525 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
526 return; 543 return;
527 544
528 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
547 return; 564 return;
548 565
549 want_refresh = 1; 566 want_refresh = 1;
550 view_start = 0; 567 view_start = 0;
551 568
552 selection_check (2); /* check for boundary cross */ 569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
553 575
554 int i = current_screen; current_screen = scrn; scrn = i; 576 current_screen = scrn;
555 577
556#if NSCREENS 578#if NSCREENS
557 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
558 { 580 {
559 num_scr = 0; 581 num_scr = 0;
… …
623/* 645/*
624 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
625 * count positive ==> scroll up 647 * count positive ==> scroll up
626 * count negative ==> scroll down 648 * count negative ==> scroll down
627 */ 649 */
628int 650int ecb_hot
629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630{ 652{
631 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
632 return 0; 654 return 0;
633 655
… …
636 658
637 if (count > 0 659 if (count > 0
638 && row1 == 0 660 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
641 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 666
646 // sever bottommost line 667 // sever bottommost line
647 { 668 {
648 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
649 l.is_longer (0); 670 l.is_longer (0);
650 l.touch (); 671 l.touch ();
651 } 672 }
652 673
674 // scroll everything up 'count' lines
675 term_start = (term_start + count) % total_rows;
676
677 // now copy lines below the scroll region bottom to the
678 // bottom of the screen again, so they look as if they
679 // hadn't moved.
680 for (int i = nrow; --i > row2; )
681 {
682 line_t &l1 = ROW(i - count);
683 line_t &l2 = ROW(i);
684
685 ::swap (l1, l2);
686 l2.touch ();
687 }
688
653 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 690 for (int i = count; i--; )
655 { 691 {
656 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
657 693
658 // optimize if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
660 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 696 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 697 {
662 scr_blank_line (l, 0, l.l, rstyle); 698 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 699 l.l = 0;
… …
665 } 701 }
666 else 702 else
667 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
668 } 704 }
669 705
670 // now copy lines below the scroll region bottom to the
671 // bottom of the screen again, so they look as if they
672 // hadn't moved.
673 for (int i = nrow; --i > row2; )
674 {
675 line_t &l1 = ROW(i - count);
676 line_t &l2 = ROW(i);
677
678 ::swap (l1, l2);
679 l2.touch ();
680 }
681
682 // move and/or clear selection, if any 706 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
684 { 709 {
685 selection.beg.row -= count; 710 selection.beg.row -= count;
686 selection.end.row -= count; 711 selection.end.row -= count;
687 selection.mark.row -= count; 712 selection.mark.row -= count;
688 713
689 if (selection.beg.row < top_row 714 selection_check (0);
690 || selection.end.row < top_row
691 || selection.mark.row < top_row)
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR;
695 }
696 } 715 }
697 716
698 // finally move the view window, if desired 717 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 719 && view_start != 0
701 && view_start != -saveLines) 720 && view_start != -saveLines)
702 scr_page (UP, count); 721 scr_page (count);
703 722
704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
705 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
706 } 725 }
707 else 726 else
… …
730 } 749 }
731 750
732 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
734 753
754 // sever line above scroll region
755 if (row1)
756 {
757 line_t &l = ROW(row1 - 1);
758 l.is_longer (0);
759 l.touch ();
760 }
761
735 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
736 763
737 min_it (count, rows); 764 min_it (count, rows);
738 765
739 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 767
741 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
742 { 769 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 771
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 774 }
748 775
749 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 777 ROW(row1 + row) = temp_buf [row];
778
779 // sever bottommost line
780 {
781 line_t &l = ROW(row2);
782 l.is_longer (0);
783 l.touch ();
784 }
751 } 785 }
752 786
753 return count; 787 return count;
754} 788}
755 789
756/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
757/* 791/*
758 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
759 */ 793 */
760void 794void ecb_hot
761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762{ 796{
763 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
764 return; 798 return;
765 799
766 unsigned char checksel; 800 bool checksel;
767 unicode_t c; 801 unicode_t c;
768 int ncol = this->ncol; 802 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
770 804
771 want_refresh = 1; 805 want_refresh = 1;
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 818 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 819 screen.cur.row -= minlines;
786 } 820 }
787 } 821 }
788 822
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 823 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 824 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 825 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 826 int row = screen.cur.row;
795 827
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 828 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 829
798 line_t *line = &ROW(row); 830 line_t *line = &ROW(row);
799 831
800 while (str < strend) 832 while (str < strend)
801 { 833 {
802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803 835
804 if (expect_false (c < 0x20)) 836 if (ecb_unlikely (c < 0x20))
805 if (c == C0_LF) 837 if (c == C0_LF)
806 { 838 {
807 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
808 840
809 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
828 { 860 {
829 scr_tab (1, true); 861 scr_tab (1, true);
830 continue; 862 continue;
831 } 863 }
832 864
833 if (expect_false ( 865 if (ecb_unlikely (
834 checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 )) 869 ))
838 { 870 {
… …
843 * should be a similar check. 875 * should be a similar check.
844 */ 876 */
845 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
846 } 878 }
847 879
848 if (expect_false (screen.flags & Screen_WrapNext)) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
849 { 881 {
850 scr_do_wrap (); 882 scr_do_wrap ();
851 883
852 line->l = ncol; 884 line->l = ncol;
853 line->is_longer (1); 885 line->is_longer (1);
… …
855 row = screen.cur.row; 887 row = screen.cur.row;
856 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
857 } 889 }
858 890
859 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861 c = 0xfffd; 893 c = 0xfffd;
862 894
863 // rely on wcwidth to tell us the character width, do wcwidth before 895 // rely on wcwidth to tell us the character width, do wcwidth before
864 // further replacements, as wcwidth might return -1 for the line 896 // further replacements, as wcwidth might return -1 for the line
865 // drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
866 // locale. 898 // locale.
867 int width = WCWIDTH (c); 899 int width = WCWIDTH (c);
868 900
869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870 { 902 {
871 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
872 // 5f-7e standard vt100 904 // 5f-7e standard vt100
873 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
874 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
888 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
889 } 921 }
890 } 922 }
891 923
892 if (expect_false (screen.flags & Screen_Insert)) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
893 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
894 926
895 if (width != 0) 927 if (width != 0)
896 { 928 {
897#if !UNICODE_3 929#if !UNICODE_3
… …
902# else 934# else
903 c = 0xfffd; 935 c = 0xfffd;
904# endif 936# endif
905#endif 937#endif
906 938
939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
940
941 // if the character doesn't fit into the remaining columns...
942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
943 {
944 if (screen.flags & Screen_Autowrap)
945 {
946 // ... artificially enlargen the previous one
947 c = NOCHAR;
948 // and try the same character next loop iteration
949 --str;
950 }
951 else
952 screen.cur.col = ncol - width;
953 }
954
907 // nuke the character at this position, if required 955 // nuke the character at this position, if required
908 if (expect_false ( 956 // due to wonderful coincidences everywhere else in this loop
957 // we never have to check for overwriting a wide char itself,
958 // only its tail.
909 line->t[screen.cur.col] == NOCHAR 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
910 || (screen.cur.col < ncol - 1
911 && line->t[screen.cur.col + 1] == NOCHAR)
912 ))
913 scr_kill_char (*line, screen.cur.col); 960 scr_kill_char (*line, screen.cur.col);
914
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916
917 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
919 {
920 // ... artificially enlargen the previous one
921 c = NOCHAR;
922 // and try the same character next loop iteration
923 --str;
924 }
925 961
926 line->touch (); 962 line->touch ();
927 963
928 do 964 do
929 { 965 {
930 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
932 968
933 if (expect_true (screen.cur.col < ncol - 1)) 969 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 970 screen.cur.col++;
935 else 971 else
936 { 972 {
937 line->l = ncol; 973 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
939 screen.flags |= Screen_WrapNext; 975 screen.flags |= Screen_WrapNext;
940 break; 976
977 goto end_of_line;
941 } 978 }
942 979
943 c = NOCHAR; 980 c = NOCHAR;
944 } 981 }
945 while (expect_false (--width > 0)); 982 while (ecb_unlikely (--width > 0));
946 983
947 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
948 if (expect_false (!width)) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
949 { 986 {
950 line->touch ();
951
952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
953 {
954 line->t[c] = ' '; 987 line->t[c] = ' ';
955 line->r[c] = rend; 988 line->r[c] = rend;
956 }
957 } 989 }
990
991end_of_line:
992 ;
958 } 993 }
959#if ENABLE_COMBINING 994#if ENABLE_COMBINING
960 else // width == 0 995 else // width == 0
961 { 996 {
962 if (c != 0xfeff) // ignore BOM 997 if (c != 0xfeff) // ignore BOM
… …
977 } 1012 }
978 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
979 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
980 { 1015 {
981 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
982 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
983 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
984 } 1019 }
985 else 1020 else
986 continue; 1021 continue;
987 1022
988 linep->touch (); 1023 linep->touch ();
… …
1002#endif 1037#endif
1003 } 1038 }
1004 1039
1005 max_it (line->l, screen.cur.col); 1040 max_it (line->l, screen.cur.col);
1006 1041
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1042 assert (screen.cur.row >= 0);
1009#endif
1010} 1043}
1011 1044
1012/* ------------------------------------------------------------------------- */ 1045/* ------------------------------------------------------------------------- */
1013/* 1046/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1047 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1027 1060
1028 want_refresh = 1; 1061 want_refresh = 1;
1029#endif 1062#endif
1030 } 1063 }
1031 } 1064 }
1065 else if (screen.flags & Screen_WrapNext)
1066 screen.flags &= ~Screen_WrapNext;
1032 else 1067 else
1033 scr_gotorc (0, -1, RELATIVE); 1068 scr_gotorc (0, -1, RELATIVE);
1034} 1069}
1035 1070
1036/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
… …
1114 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1115 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1116 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1117 */ 1152 */
1118#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1119void 1154void ecb_cold
1120rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1121{ 1156{
1122 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1123 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1124 else 1159 else
… …
1131 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1132 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1133 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1134 */ 1169 */
1135#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1136void 1171void ecb_cold
1137rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1138{ 1173{
1139 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1140 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1141 else 1176 else
… …
1206 * direction should be UP or DN 1241 * direction should be UP or DN
1207 */ 1242 */
1208void 1243void
1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1210{ 1245{
1211 int dirn;
1212
1213 want_refresh = 1; 1246 want_refresh = 1;
1214 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1215 1248
1216 dirn = ((direction == UP) ? 1 : -1);
1217
1218 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1219 1250
1220 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1221 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1222 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1223 else 1254 else
1224 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1225 1256
1226 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1227 selection_check (0); 1258 selection_check (0);
1228} 1259}
1229 1260
… …
1292 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1293} 1324}
1294 1325
1295/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1296/* 1327/*
1297 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1298 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1299 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1300 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1301 */ 1332 */
1302void 1333void
… …
1311 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1312 1343
1313 switch (mode) 1344 switch (mode)
1314 { 1345 {
1315 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1316 selection_check (1);
1317 scr_erase_line (0); 1347 scr_erase_line (0);
1318 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1319 num = nrow - row; 1349 num = nrow - row;
1320 break; 1350 break;
1321 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1322 selection_check (3);
1323 scr_erase_line (1); 1352 scr_erase_line (1);
1324 row = 0; 1353 row = 0;
1325 num = screen.cur.row; 1354 num = screen.cur.row;
1326 break; 1355 break;
1327 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1328 selection_check (3);
1329 row = 0; 1357 row = 0;
1330 num = nrow; 1358 num = nrow;
1331 break; 1359 break;
1332 default: 1360 default:
1333 return; 1361 return;
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1370 if (row >= nrow) /* Out Of Bounds */
1343 return; 1371 return;
1344 1372
1345 min_it (num, nrow - row); 1373 min_it (num, nrow - row);
1346 1374
1347 // TODO: the code below does not work when view_start != 0
1348 // the workaround is to disable the clear and use a normal refresh
1349 // when view_start != 0. mysterious.
1350 if (rstyle & (RS_RVid | RS_Uline)) 1375 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351 ren = (rend_t) ~RS_None; 1376 ren = (rend_t) ~RS_None;
1352 else if (GET_BASEBG (rstyle) == Color_bg) 1377 else if (GET_BASEBG (rstyle) == Color_bg)
1353 { 1378 {
1354 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1355 1380
1356 if (mapped && !view_start) 1381 if (mapped)
1357 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1360 } 1385 }
1361 else 1386 else
1362 { 1387 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 1389
1365 if (mapped && !view_start) 1390 if (mapped)
1366 { 1391 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1396 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1400 }
1376 } 1401 }
1377 1402
1378 for (; num--; row++) 1403 for (; num--; row++)
1379 { 1404 {
1380 scr_blank_screen_mem (ROW(row), rstyle); 1405 scr_blank_screen_mem (ROW(row), rstyle);
1381 1406
1382 if (!view_start) 1407 if (row - view_start < nrow)
1383 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1408 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1384 } 1409 }
1385} 1410}
1386 1411
1387#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1388void 1413void
… …
1398/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1399/* 1424/*
1400 * Fill the screen with `E's 1425 * Fill the screen with `E's
1401 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1402 */ 1427 */
1403void 1428void ecb_cold
1404rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1405{ 1430{
1406 rend_t fs; 1431 rend_t fs;
1407 1432
1408 want_refresh = 1; 1433 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1410 1435
1411 num_scr_allow = 0; 1436 num_scr_allow = 0;
1412 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1413 1442
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1416 { 1445 {
1417 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1541 { 1570 {
1542 line->t[col] = line->t[col + count]; 1571 line->t[col] = line->t[col + count];
1543 line->r[col] = line->r[col + count]; 1572 line->r[col] = line->r[col + count];
1544 } 1573 }
1545 1574
1546 scr_blank_line (*line, ncol - count, count, 1575 scr_blank_line (*line, ncol - count, count, rstyle);
1547 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1548 1576
1549 if (selection.op && current_screen == selection.screen 1577 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1578 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1579 {
1552 if (selection.end.row != screen.cur.row 1580 if (selection.end.row != screen.cur.row
… …
1569/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1570/* 1598/*
1571 * Set the scrolling region 1599 * Set the scrolling region
1572 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1573 */ 1601 */
1574void 1602void ecb_cold
1575rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1576{ 1604{
1577 max_it (top, 0); 1605 max_it (top, 0);
1578 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1579 1607
… …
1589/* 1617/*
1590 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1591 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1592 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1593 */ 1621 */
1594void 1622void ecb_cold
1595rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) NOTHROW
1596{ 1624{
1597 want_refresh = 1; 1625 want_refresh = 1;
1598 1626
1599 if (mode) 1627 if (mode)
… …
1606/* 1634/*
1607 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1608 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1609 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1610 */ 1638 */
1611void 1639void ecb_cold
1612rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) NOTHROW
1613{ 1641{
1614 if (mode) 1642 if (mode)
1615 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1616 else 1644 else
… …
1625 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1626 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1627 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1628 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1629 */ 1657 */
1630void 1658void ecb_cold
1631rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) NOTHROW
1632{ 1660{
1633 if (mode) 1661 if (mode)
1634 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1635 else 1663 else
… …
1642/* 1670/*
1643 * Set insert/replace mode 1671 * Set insert/replace mode
1644 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1645 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1646 */ 1674 */
1647void 1675void ecb_cold
1648rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) NOTHROW
1649{ 1677{
1650 if (mode) 1678 if (mode)
1651 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1652 else 1680 else
… …
1658 * Set/Unset tabs 1686 * Set/Unset tabs
1659 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1660 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1661 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1662 */ 1690 */
1663void 1691void ecb_cold
1664rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) NOTHROW
1665{ 1693{
1666 if (mode < 0) 1694 if (mode < 0)
1667 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1668 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
… …
1687 if (rvideo_state != on) 1715 if (rvideo_state != on)
1688 { 1716 {
1689 rvideo_state = on; 1717 rvideo_state = on;
1690 1718
1691 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1719 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1692#ifdef HAVE_BG_PIXMAP 1720#ifdef HAVE_IMG
1693 if (bgPixmap.pixmap == None) 1721 if (bg_img == 0)
1694#endif 1722#endif
1695 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1723 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1696 1724
1697 XGCValues gcvalue; 1725 XGCValues gcvalue;
1698 gcvalue.foreground = pix_colors[Color_fg]; 1726 gcvalue.foreground = pix_colors[Color_fg];
… …
1707/* ------------------------------------------------------------------------- */ 1735/* ------------------------------------------------------------------------- */
1708/* 1736/*
1709 * Report current cursor position 1737 * Report current cursor position
1710 * XTERM_SEQ: Report position: ESC [ 6 n 1738 * XTERM_SEQ: Report position: ESC [ 6 n
1711 */ 1739 */
1712void 1740void ecb_cold
1713rxvt_term::scr_report_position () NOTHROW 1741rxvt_term::scr_report_position () NOTHROW
1714{ 1742{
1715 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1743 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1716} 1744}
1717 1745
… …
1720 * ------------------------------------------------------------------------- */ 1748 * ------------------------------------------------------------------------- */
1721 1749
1722/* 1750/*
1723 * Set font style 1751 * Set font style
1724 */ 1752 */
1725void 1753void ecb_cold
1726rxvt_term::set_font_style () NOTHROW 1754rxvt_term::set_font_style () NOTHROW
1727{ 1755{
1728#if 0 1756#if 0
1729 switch (charsets [screen.charset]) 1757 switch (charsets [screen.charset])
1730 { 1758 {
… …
1752 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1780 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1753 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1781 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1754 * XTERM_SEQ: Invoke G2 character set: ESC N 1782 * XTERM_SEQ: Invoke G2 character set: ESC N
1755 * XTERM_SEQ: Invoke G3 character set: ESC O 1783 * XTERM_SEQ: Invoke G3 character set: ESC O
1756 */ 1784 */
1757void 1785void ecb_cold
1758rxvt_term::scr_charset_choose (int set) NOTHROW 1786rxvt_term::scr_charset_choose (int set) NOTHROW
1759{ 1787{
1760 screen.charset = set; 1788 screen.charset = set;
1761 set_font_style (); 1789 set_font_style ();
1762} 1790}
… …
1783 * ------------------------------------------------------------------------- */ 1811 * ------------------------------------------------------------------------- */
1784 1812
1785/* 1813/*
1786 * refresh matching text. 1814 * refresh matching text.
1787 */ 1815 */
1788bool 1816bool ecb_cold
1789rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1817rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1790{ 1818{
1791 bool found = false; 1819 bool found = false;
1792 1820
1793 for (int i = 0; i < nrow; i++) 1821 for (int i = 0; i < nrow; i++)
… …
1812 PART_BEG = 0, 1840 PART_BEG = 0,
1813 PART_END, 1841 PART_END,
1814 RC_COUNT 1842 RC_COUNT
1815}; 1843};
1816 1844
1817void 1845void ecb_hot
1818rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1846rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1819{ 1847{
1820 int i; 1848 int i;
1821 row_col_t rc[RC_COUNT]; 1849 row_col_t rc[RC_COUNT];
1822 1850
… …
1842 for (i = PART_BEG; i < RC_COUNT; i++) 1870 for (i = PART_BEG; i < RC_COUNT; i++)
1843 { 1871 {
1844 min_it (rc[i].col, ncol - 1); 1872 min_it (rc[i].col, ncol - 1);
1845 min_it (rc[i].row, nrow - 1); 1873 min_it (rc[i].row, nrow - 1);
1846 } 1874 }
1847// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1875
1848 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1876 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1849 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1877 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1850 1878
1851 num_scr_allow = 0; 1879 num_scr_allow = 0;
1852 1880
… …
1859 * Refresh the entire screen 1887 * Refresh the entire screen
1860 */ 1888 */
1861void 1889void
1862rxvt_term::scr_touch (bool refresh) NOTHROW 1890rxvt_term::scr_touch (bool refresh) NOTHROW
1863{ 1891{
1864 scr_expose (0, 0, width, height, refresh); 1892 scr_expose (0, 0, vt_width, vt_height, refresh);
1865} 1893}
1866 1894
1867/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1868/* 1896/*
1869 * Move the display so that the line represented by scrollbar value Y is at 1897 * Move the display so that the line represented by scrollbar value Y is at
1870 * the top of the screen 1898 * the top of the screen
1871 */ 1899 */
1872void 1900void
1873rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1874{ 1902{
1875 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1903 // lerp (y, 0, len, top_row, nrow - 1)
1904 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1876} 1905}
1877 1906
1878/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1879/* 1908/*
1880 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1881 * direction should be UP or DN 1910 * direction should be UP or DN
1882 */ 1911 */
1883bool 1912bool
1884rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1885{ 1914{
1886 int new_view_start =
1887 direction == UP ? view_start - nlines
1888 : view_start + nlines;
1889
1890 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1891} 1916}
1892 1917
1893bool 1918bool
1894rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1895{ 1920{
… …
1925 1950
1926# ifndef NO_MAPALERT 1951# ifndef NO_MAPALERT
1927# ifdef MAPALERT_OPTION 1952# ifdef MAPALERT_OPTION
1928 if (option (Opt_mapAlert)) 1953 if (option (Opt_mapAlert))
1929# endif 1954# endif
1930 XMapWindow (dpy, parent[0]); 1955 XMapWindow (dpy, parent);
1931# endif 1956# endif
1932 1957
1933# if ENABLE_FRILLS 1958# if ENABLE_FRILLS
1934 if (option (Opt_urgentOnBell)) 1959 if (option (Opt_urgentOnBell))
1935 set_urgency (1); 1960 set_urgency (1);
… …
1943 1968
1944 bell_ev.start (VISUAL_BELL_DURATION); 1969 bell_ev.start (VISUAL_BELL_DURATION);
1945 } 1970 }
1946 else 1971 else
1947 XBell (dpy, 0); 1972 XBell (dpy, 0);
1973 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1974#endif
1949} 1975}
1950 1976
1951/* ------------------------------------------------------------------------- */ 1977/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1978void ecb_cold
1953void
1954rxvt_term::scr_printscreen (int fullhist) NOTHROW 1979rxvt_term::scr_printscreen (int fullhist) NOTHROW
1955{ 1980{
1956#ifdef PRINTPIPE 1981#ifdef PRINTPIPE
1957 int nrows, row_start; 1982 int nrows, row_start;
1958 FILE *fd = popen_printer (); 1983 FILE *fd = popen_printer ();
… …
1971 row_start = view_start; 1996 row_start = view_start;
1972 } 1997 }
1973 1998
1974 wctomb (0, 0); 1999 wctomb (0, 0);
1975 2000
1976 for (int r1 = 0; r1 < nrows; r1++) 2001 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1977 { 2002 {
1978 text_t *tp = ROW(r1).t; 2003 text_t *tp = ROW(r1).t;
1979 int len = ROW(r1).l; 2004 int len = ROW(r1).l;
1980 2005
1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2006 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2007/* 2032/*
2008 * Refresh the screen 2033 * Refresh the screen
2009 * drawn_text/drawn_rend contain the screen information before the update. 2034 * drawn_text/drawn_rend contain the screen information before the update.
2010 * screen.text/screen.rend contain what the screen will change to. 2035 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2036 */
2012void 2037void ecb_hot
2013rxvt_term::scr_refresh () NOTHROW 2038rxvt_term::scr_refresh () NOTHROW
2014{ 2039{
2015 unsigned char have_bg,
2016 showcursor; /* show the cursor */
2017 int16_t col, row, /* column/row we're processing */ 2040 int16_t col, row, /* column/row we're processing */
2018 ocrow; /* old cursor row */ 2041 ocrow; /* old cursor row */
2019 int i; /* tmp */ 2042 int i; /* tmp */
2020#ifndef NO_CURSORCOLOR
2021 rend_t cc1; /* store colours at cursor position (s) */
2022#endif
2023 rend_t *crp; // cursor rendition pointer
2024 rend_t ccol1, /* Cursor colour */ 2043 rend_t ccol1, /* Cursor colour */
2025 ccol2; /* Cursor colour2 */ 2044 ccol2; /* Cursor colour2 */
2045 rend_t cur_rend;
2046 int cur_col;
2047 int cursorwidth;
2026 2048
2027 want_refresh = 0; /* screen is current */ 2049 want_refresh = 0; /* screen is current */
2028 2050
2029 if (refresh_type == NO_REFRESH || !mapped) 2051 if (refresh_type == NO_REFRESH || !mapped)
2030 return; 2052 return;
… …
2032 /* 2054 /*
2033 * A: set up vars 2055 * A: set up vars
2034 */ 2056 */
2035 refresh_count = 0; 2057 refresh_count = 0;
2036 2058
2059 unsigned int old_screen_flags = screen.flags;
2037 have_bg = 0; 2060 bool have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2039 have_bg = bgPixmap.pixmap != None; 2062 have_bg = bg_img != 0;
2040#endif 2063#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2065
2043 /* 2066 /*
2044 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
2045 */ 2068 */
2046 scr_reverse_selection (); 2069 scr_reverse_selection ();
2047 2070
2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2072#if ENABLE_OVERLAY
2073 scr_swap_overlay ();
2074#endif
2075
2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2077
2048 /* 2078 /*
2049 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2050 */ 2080 */
2051 { 2081 {
2052 unsigned char setoldcursor;
2053
2054 showcursor = (screen.flags & Screen_VisibleCursor);
2055#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2056 if (hidden_cursor) 2083 if (hidden_cursor)
2057 showcursor = 0; 2084 showcursor = 0;
2058#endif 2085#endif
2059 2086
… …
2062 int col = screen.cur.col; 2089 int col = screen.cur.col;
2063 2090
2064 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2065 col--; 2092 col--;
2066 2093
2094 cursorwidth = 1;
2095 while (col + cursorwidth < ncol
2096 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2097 cursorwidth++;
2098
2067 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2068 2101
2069#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2070 cc1 = *crp & (RS_fgMask | RS_bgMask);
2071 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2072 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2073 else 2105 else
2074#endif 2106#endif
2075#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2087 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2088#else 2120#else
2089 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2090#endif 2122#endif
2091 2123
2092 if (showcursor && focus) 2124 if (focus && cursor_type == 0)
2093 { 2125 {
2094 if (option (Opt_cursorUnderline)) 2126 rend_t rend = cur_rend;
2095 *crp ^= RS_Uline; 2127
2096 else
2097 {
2098 *crp ^= RS_RVid; 2128 rend ^= RS_RVid;
2099 *crp = SET_FGCOLOR (*crp, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2100 *crp = SET_BGCOLOR (*crp, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2101 } 2131
2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2102 } 2133 }
2103 } 2134 }
2104 2135
2105 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2106 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2107 if (ocrow != -1) 2138 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2139
2140 // save the current cursor coordinates if the cursor is visible
2141 // and either the window is unfocused or the cursor style is
2142 // underline or vertical bar, so as to clear the outline cursor in
2143 // the next refresh if the cursor moves or becomes invisible
2144 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2108 { 2145 {
2109 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2110 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2111 {
2112 if (ocrow < nrow
2113 && oldcursor.col < ncol)
2114 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2115
2116 if (focus || !showcursor)
2117 oldcursor.row = -1;
2118 else
2119 setoldcursor = 1;
2120 }
2121 } 2148 }
2122 else if (!focus) 2149 else
2123 setoldcursor = 1;
2124
2125 if (setoldcursor)
2126 {
2127 if (screen.cur.row - view_start >= nrow)
2128 oldcursor.row = -1; 2150 oldcursor.row = -1;
2129 else
2130 {
2131 oldcursor.row = screen.cur.row - view_start;
2132 oldcursor.col = screen.cur.col;
2133 }
2134 }
2135 } 2151 }
2136
2137 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2138#if ENABLE_OVERLAY
2139 scr_swap_overlay ();
2140#endif
2141 2152
2142#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2143 /* 2154 /*
2144 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2145 * This has been deliberately kept simple. 2156 * This has been deliberately kept simple.
… …
2150 { 2161 {
2151 int16_t nits; 2162 int16_t nits;
2152 int i = num_scr; 2163 int i = num_scr;
2153 int j; 2164 int j;
2154 int len, wlen; 2165 int len, wlen;
2155 dLocal (int, num_scr);
2156 2166
2157 j = nrow; 2167 j = nrow;
2158 wlen = len = -1; 2168 wlen = len = -1;
2159 row = i > 0 ? 0 : j - 1; 2169 row = i > 0 ? 0 : j - 1;
2160 2170
… …
2226 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2227 2237
2228 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2229 { 2239 {
2230 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2231 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2232 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2233 || (stp[col] == ' ' /* space w/ no background change */
2234 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2235 continue; 2242 continue;
2236 2243
2237 // redraw one or more characters 2244 // redraw one or more characters
2238 2245
2239 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2247 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2241 --col; 2248 --col;
2242 2249
2243 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2250 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2251 text_t *text = stp + col;
2245 int count = 1; 2252 int count = 1;
2246 2253
2247 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2248 drp[col] = rend; 2255 drp[col] = rend;
… …
2252 for (i = 0; ++col < ncol; ) 2259 for (i = 0; ++col < ncol; )
2253 { 2260 {
2254 if (stp[col] == NOCHAR) 2261 if (stp[col] == NOCHAR)
2255 { 2262 {
2256 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2257 drp[col] = rend; 2264 drp[col] = srp[col];
2265
2258 count++; 2266 count++;
2259 i++; 2267 i++;
2260 2268
2261 continue; 2269 continue;
2262 } 2270 }
… …
2282 2290
2283 col--; /* went one too far. move back */ 2291 col--; /* went one too far. move back */
2284 count -= i; /* dump any matching trailing chars */ 2292 count -= i; /* dump any matching trailing chars */
2285 2293
2286 // sometimes we optimize away the trailing NOCHAR's, add them back 2294 // sometimes we optimize away the trailing NOCHAR's, add them back
2287 while (expect_false (i && text[count] == NOCHAR)) 2295 while (ecb_unlikely (i && text[count] == NOCHAR))
2288 count++, i--; 2296 count++, i--;
2289 2297
2290 /* 2298 /*
2291 * Determine the attributes for the string 2299 * Determine the attributes for the string
2292 */ 2300 */
2293 int fore = fgcolor_of (rend); // desired foreground 2301 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2302 int back = bgcolor_of (rend); // desired background
2295 2303
2296 // only do special processing if any attributes are set, which is unlikely 2304 // only do special processing if any attributes are set, which is unlikely
2297 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2305 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298 { 2306 {
2299 bool invert = rend & RS_RVid; 2307 bool invert = rend & RS_RVid;
2300 2308
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2309#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2310 if (rend & RS_Bold && fore == Color_fg)
… …
2321 2329
2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2330 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2323 fore = Color_UL; 2331 fore = Color_UL;
2324#endif 2332#endif
2325 2333
2334#ifdef OPTION_HC
2335 if (rend & RS_Sel)
2336 {
2337 /* invert the column if no highlightColor is set or it is the
2338 * current cursor column */
2339 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2340 && ISSET_PIXCOLOR (Color_HC))
2341 {
2342 if (ISSET_PIXCOLOR (Color_HTC))
2343 fore = Color_HTC;
2344 // if invert is 0 reverse video is set so we use bg color as fg color
2345 else if (!invert)
2346 fore = back;
2347
2348 back = Color_HC;
2349 invert = 0;
2350 }
2351 }
2352#endif
2353
2326 if (invert) 2354 if (invert)
2327 { 2355 {
2328#ifdef OPTION_HC
2329 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2330 || !ISSET_PIXCOLOR (Color_HC))
2331#endif
2332 /* invert the column if no highlightColor is set or it is the
2333 * current cursor column */
2334 ::swap (fore, back); 2356 ::swap (fore, back);
2335#ifdef OPTION_HC
2336 else if (ISSET_PIXCOLOR (Color_HC))
2337 back = Color_HC;
2338#endif
2339 2357
2340#ifndef NO_BOLD_UNDERLINE_REVERSE 2358#ifndef NO_BOLD_UNDERLINE_REVERSE
2341# ifndef OPTION_HC
2342 if (ISSET_PIXCOLOR (Color_RV))
2343 back = Color_RV;
2344# endif
2345 if (fore == back) 2359 if (fore == back)
2346 { 2360 {
2347 fore = Color_bg; 2361 fore = Color_bg;
2348 back = Color_fg; 2362 back = Color_fg;
2349 } 2363 }
… …
2385 /* 2399 /*
2386 * Actually do the drawing of the string here 2400 * Actually do the drawing of the string here
2387 */ 2401 */
2388 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2402 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2389 2403
2390 if (expect_true (have_bg && back == Color_bg)) 2404 if (ecb_likely (have_bg && back == Color_bg))
2391 { 2405 {
2392 // this is very ugly, maybe push it into ->draw? 2406 // this is very ugly, maybe push it into ->draw?
2393 2407
2394 for (i = 0; i < count; i++) /* don't draw empty strings */ 2408 for (i = 0; i < count; i++) /* don't draw empty strings */
2395 if (text[i] != ' ') 2409 if (text[i] != ' ')
… …
2402 did_clear: ; 2416 did_clear: ;
2403 } 2417 }
2404 else 2418 else
2405 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2406 2420
2407 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2408 { 2422 {
2423 if (showcursor && focus && row == screen.cur.row
2424 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2425 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426 else
2409#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2410 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2411 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2412 else 2430 else
2413#endif 2431#endif
… …
2418 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2436 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2419 } 2437 }
2420 } /* for (col....) */ 2438 } /* for (col....) */
2421 } /* for (row....) */ 2439 } /* for (row....) */
2422 2440
2423#if ENABLE_OVERLAY
2424 scr_swap_overlay ();
2425#endif
2426 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2427
2428 /* 2441 /*
2429 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2430 */ 2443 */
2431 if (showcursor) 2444 if (showcursor)
2432 { 2445 {
2433 if (focus) 2446 if (focus)
2434 { 2447 {
2435 if (option (Opt_cursorUnderline)) 2448 if (cursor_type == 0)
2436 *crp ^= RS_Uline; 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2437 else 2450 else if (oldcursor.row >= 0)
2438 { 2451 {
2439 *crp ^= RS_RVid; 2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440#ifndef NO_CURSORCOLOR 2453 if (cursor_type == 1)
2441 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 XFillRectangle (dpy, vt, gc,
2442#endif 2455 Col2Pixel (cur_col),
2456 Row2Pixel (oldcursor.row + 1) - 2,
2457 Width2Pixel (1),
2458 2);
2459 else
2460 XFillRectangle (dpy, vt, gc,
2461 Col2Pixel (cur_col),
2462 Row2Pixel (oldcursor.row),
2463 2,
2464 Height2Pixel (1));
2443 } 2465 }
2444 } 2466 }
2445 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2446 { 2468 {
2447 int cursorwidth = 1;
2448 int col = oldcursor.col;
2449
2450 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2451 col--;
2452
2453 while (col + cursorwidth < ncol
2454 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2455 cursorwidth++;
2456
2457#ifndef NO_CURSORCOLOR
2458 if (ISSET_PIXCOLOR (Color_cursor))
2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2460 else
2461#endif
2462 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2463 2470
2464 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2466 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2476 }
2470 } 2477 }
2471 2478
2472 /* 2479 /*
2473 * H: cleanup selection 2480 * H: cleanup selection
2474 */ 2481 */
2482#if ENABLE_OVERLAY
2483 scr_swap_overlay ();
2484#endif
2485 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2486
2475 scr_reverse_selection (); 2487 scr_reverse_selection ();
2476 2488
2489 screen.flags = old_screen_flags;
2477 num_scr = 0; 2490 num_scr = 0;
2478 num_scr_allow = 1; 2491 num_scr_allow = 1;
2479} 2492}
2480 2493
2481void 2494void ecb_cold
2482rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2495rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2483{ 2496{
2484 if (!l.t) 2497 if (!l.valid ())
2485 return; 2498 return;
2486 2499
2487 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2500 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2488 2501
2489 for (int i = ncol; i--; ) 2502 for (int i = ncol; i--; )
2490 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2503 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2491} 2504}
2492 2505
2493void 2506void ecb_cold
2494rxvt_term::scr_remap_chars () NOTHROW 2507rxvt_term::scr_remap_chars () NOTHROW
2495{ 2508{
2496 for (int i = total_rows; i--; ) 2509 for (int i = total_rows; i--; )
2497 scr_remap_chars (row_buf [i]); 2510 scr_remap_chars (row_buf [i]);
2498 2511
… …
2501 scr_remap_chars (drawn_buf [i]); 2514 scr_remap_chars (drawn_buf [i]);
2502 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2503 } 2516 }
2504} 2517}
2505 2518
2506void 2519void ecb_cold
2507rxvt_term::scr_recolour () NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2508{ 2521{
2509#ifdef HAVE_BG_PIXMAP 2522 bool transparent = false;
2510 bgPixmap.apply ();
2511#else
2512 2523
2524#ifdef HAVE_IMG
2525 if (bg_img != 0)
2526 {
2527# if ENABLE_TRANSPARENCY
2528 if (bg_flags & BG_IS_TRANSPARENT)
2529 {
2530 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2531 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2532
2533 transparent = true;
2534 }
2535 else
2536# endif
2537 {
2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2539 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2540 }
2541 }
2542 else
2543#endif
2544 {
2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2545 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2514 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2547 }
2516 2548
2517 if (scrollBar.win) 2549 XClearWindow (dpy, parent);
2550
2551 if (scrollBar.state && scrollBar.win)
2518 { 2552 {
2553 if (transparent)
2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2555 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2520 scrollBar.state = STATE_IDLE; 2557 scrollBar.state = SB_STATE_IDLE;
2521 scrollBar.show (0); 2558 scrollBar.show (0);
2522 } 2559 }
2523 2560
2524#endif 2561 if (refresh)
2525 2562 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2563 scr_clear ();
2528 scr_touch (true); 2564 scr_touch (true);
2565 }
2529 want_refresh = 1; 2566 want_refresh = 1;
2530} 2567}
2531 2568
2532/* ------------------------------------------------------------------------- */ 2569/* ------------------------------------------------------------------------- */
2533void 2570void
… …
2590 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2627 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2591 srp[col] ^= rstyle; 2628 srp[col] ^= rstyle;
2592} 2629}
2593 2630
2594/* ------------------------------------------------------------------------- */ 2631/* ------------------------------------------------------------------------- */
2595void 2632void ecb_hot
2596rxvt_term::scr_reverse_selection () NOTHROW 2633rxvt_term::scr_reverse_selection () NOTHROW
2597{ 2634{
2598 if (selection.op 2635 if (selection.op
2599 && current_screen == selection.screen 2636 && current_screen == selection.screen
2600 && selection.end.row >= view_start) 2637 && selection.end.row >= view_start)
2601 { 2638 {
2602#if !ENABLE_MINIMAL 2639#if !ENABLE_MINIMAL
2603 if (selection.rect) 2640 if (selection.rect)
2604 scr_xor_rect (selection.beg.row, selection.beg.col, 2641 scr_xor_rect (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2606 RS_RVid, RS_RVid | RS_Uline); 2643 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2607 else 2644 else
2608#endif 2645#endif
2609 scr_xor_span (selection.beg.row, selection.beg.col, 2646 scr_xor_span (selection.beg.row, selection.beg.col,
2610 selection.end.row, selection.end.col, 2647 selection.end.row, selection.end.col,
2611 RS_RVid); 2648 RS_Sel | RS_RVid);
2612 } 2649 }
2613} 2650}
2614 2651
2615/* ------------------------------------------------------------------------- */ 2652/* ------------------------------------------------------------------------- */
2616/* 2653/*
… …
2619 */ 2656 */
2620#if 0 2657#if 0
2621void 2658void
2622rxvt_term::scr_dump (int fd) NOTHROW 2659rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2660{
2624 int row, wrote; 2661 // if this method is needed, it can be implemented by factoring the
2625 unsigned int width, towrite; 2662 // 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} 2663}
2645#endif 2664#endif
2646 2665
2647/* ------------------------------------------------------------------------- * 2666/* ------------------------------------------------------------------------- *
2648 * CHARACTER SELECTION * 2667 * CHARACTER SELECTION *
2649 * ------------------------------------------------------------------------- */ 2668 * ------------------------------------------------------------------------- */
2650void 2669void
2651rxvt_term::selection_check (int check_more) NOTHROW 2670rxvt_term::selection_check (int check_more) NOTHROW
2652{ 2671{
2653 row_col_t pos;
2654
2655 if (!selection.op) 2672 if (!selection.op)
2656 return; 2673 return;
2657 2674
2658 pos.row = pos.col = 0;
2659 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2675 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2660 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2676 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2661 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2677 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2662 || (check_more == 1 2678 || (check_more == 1
2663 && current_screen == selection.screen 2679 && current_screen == selection.screen
2664 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2665 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2681 && 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 (); 2682 CLEAR_ALL_SELECTION ();
2683}
2684
2685void
2686rxvt_term::selection_changed () NOTHROW
2687{
2688 line_t &r1 = ROW (selection.beg.row);
2689 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2690 ++selection.beg.col;
2691
2692 line_t &r2 = ROW (selection.end.row);
2693 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2694 ++selection.end.col;
2695
2696 want_refresh = 1;
2675} 2697}
2676 2698
2677/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2678/* 2700/*
2679 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
2680 */ 2702 */
2681void 2703void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2704rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2705{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2706 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2709 data[i] = C0_CR;
2688 2710
2689 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2691 2713
2692 tt_write (data, len); 2714 tt_write (data, len);
2693 2715
2694 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2696} 2718}
2697 2719
2698/* ------------------------------------------------------------------------- */
2699/*
2700 * Respond to a notification that a primary selection has been sent
2701 * EXT: SelectionNotify
2702 */
2703void 2720void
2704rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2705{ 2722{
2706 if (prop == None) /* check for failed XConvertSelection */ 2723 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; 2724 return;
2881 2725
2882 selection_paste (win, prop, true); 2726 tt_paste (data, len);
2883} 2727}
2884 2728
2885/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2886/* 2730/*
2887 * Request the current selection: 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2888 * Order: > internal selection if available 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2889 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2733 * 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 2734 * EXT: button 2 release
2894 */ 2735 */
2895void 2736void
2896rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2897{ 2738{
2898 if (selection.text && selnum == Sel_Primary) 2739 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 } 2740 {
2906 else 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2742 selection_req->run ();
2907 { 2743 }
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} 2744}
2949 2745
2950/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2951/* 2747/*
2952 * Clear all selected text 2748 * Clear all selected text
2953 * EXT: SelectionClear 2749 * EXT: SelectionClear
2954 */ 2750 */
2955void 2751void
2956rxvt_term::selection_clear () NOTHROW 2752rxvt_term::selection_clear (bool clipboard) NOTHROW
2957{ 2753{
2754 if (!clipboard)
2755 {
2958 want_refresh = 1; 2756 want_refresh = 1;
2959 free (selection.text); 2757 free (selection.text);
2960 selection.text = NULL; 2758 selection.text = NULL;
2961 selection.len = 0; 2759 selection.len = 0;
2962 CLEAR_SELECTION (); 2760 CLEAR_SELECTION ();
2963 2761
2964 if (display->selection_owner == this) 2762 if (display->selection_owner == this)
2965 display->selection_owner = 0; 2763 display->selection_owner = 0;
2764 }
2765 else
2766 {
2767 free (selection.clip_text);
2768 selection.clip_text = NULL;
2769 selection.clip_len = 0;
2770
2771 if (display->clipboard_owner == this)
2772 display->clipboard_owner = 0;
2773 }
2966} 2774}
2967 2775
2968/* ------------------------------------------------------------------------- */ 2776/* ------------------------------------------------------------------------- */
2969/* 2777/*
2970 * Copy a selection into the cut buffer 2778 * Copy a selection into the cut buffer
2971 * EXT: button 1 or 3 release 2779 * EXT: button 1 or 3 release
2972 */ 2780 */
2973void 2781void
2974rxvt_term::selection_make (Time tm) 2782rxvt_term::selection_make (Time tm)
2975{ 2783{
2976 int i; 2784 int size;
2977 wchar_t *new_selection_text; 2785 wchar_t *new_selection_text;
2978 text_t *t; 2786 text_t *t;
2979 2787
2980 switch (selection.op) 2788 switch (selection.op)
2981 { 2789 {
… …
2997 return; /* nothing selected, go away */ 2805 return; /* nothing selected, go away */
2998 2806
2999 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2807 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3000 return; 2808 return;
3001 2809
3002 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2810 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3003 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2811 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3004 2812
3005 int ofs = 0; 2813 int ofs = 0;
3006 int extra = 0; 2814 int extra = 0;
3007 2815
3008 int col = selection.beg.col; 2816 int col = selection.beg.col;
… …
3014 { 2822 {
3015#if !ENABLE_MINIMAL 2823#if !ENABLE_MINIMAL
3016 if (selection.rect) 2824 if (selection.rect)
3017 { 2825 {
3018 col = selection.beg.col; 2826 col = selection.beg.col;
3019 end_col = ncol + 1; 2827 end_col = selection.end.col;
3020 } 2828 }
3021 else 2829 else
3022#endif 2830#endif
3023 end_col = ROW(row).l; 2831 end_col = ROW(row).l;
3024 2832
3025 col = max (col, 0); 2833 col = max (col, 0);
3026 2834
3027 if (row == selection.end.row 2835 if (row == selection.end.row)
3028#if !ENABLE_MINIMAL
3029 || selection.rect
3030#endif
3031 )
3032 min_it (end_col, selection.end.col); 2836 min_it (end_col, selection.end.col);
3033 2837
3034 t = ROW(row).t + col; 2838 t = ROW(row).t + col;
3035 2839
3036 for (; col < end_col; col++) 2840 for (; col < end_col; col++)
… …
3044 2848
3045 extra -= (len - 1); 2849 extra -= (len - 1);
3046 2850
3047 if (extra < 0) 2851 if (extra < 0)
3048 { 2852 {
3049 extra += i; 2853 extra += size;
3050 i += i; 2854 size += size;
3051 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2855 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3052 } 2856 }
3053 2857
3054 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2858 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3055 } 2859 }
3056#endif 2860#endif
… …
3068 2872
3069 new_selection_text[ofs++] = C0_LF; 2873 new_selection_text[ofs++] = C0_LF;
3070 } 2874 }
3071 else 2875 else
3072#endif 2876#endif
3073 if (!ROW(row).is_longer () && row != selection.end.row) 2877 if (!ROW(row).is_longer ()
2878 && (row != selection.end.row || end_col != selection.end.col)
2879 && (row != selection.beg.row || selection.beg.col < ncol))
3074 new_selection_text[ofs++] = C0_LF; 2880 new_selection_text[ofs++] = C0_LF;
3075 } 2881 }
3076
3077 if (end_col != selection.end.col)
3078 new_selection_text[ofs++] = C0_LF;
3079 2882
3080 new_selection_text[ofs] = 0; 2883 new_selection_text[ofs] = 0;
3081 2884
3082 if (ofs == 0) 2885 if (ofs == 0)
3083 { 2886 {
… …
3096 2899
3097 selection_grab (tm); 2900 selection_grab (tm);
3098} 2901}
3099 2902
3100bool 2903bool
3101rxvt_term::selection_grab (Time tm) NOTHROW 2904rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3102{ 2905{
2906 Atom sel;
2907
2908 if (!clipboard)
2909 {
3103 selection_time = tm; 2910 selection_time = tm;
2911 sel = XA_PRIMARY;
2912 }
2913 else
2914 {
2915 clipboard_time = tm;
2916 sel = xa[XA_CLIPBOARD];
2917 }
3104 2918
3105 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2919 XSetSelectionOwner (dpy, sel, vt, tm);
3106 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2920 if (XGetSelectionOwner (dpy, sel) == vt)
3107 { 2921 {
3108 display->set_selection_owner (this); 2922 display->set_selection_owner (this, clipboard);
3109 return true; 2923 return true;
3110 } 2924 }
3111 else 2925 else
3112 { 2926 {
3113 selection_clear (); 2927 selection_clear (clipboard);
3114 return false; 2928 return false;
3115 } 2929 }
3116 2930
3117#if 0 2931#if 0
3118 XTextProperty ct; 2932 XTextProperty ct;
… …
3128/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
3129/* 2943/*
3130 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
3131 * EXT: button 1 press 2945 * EXT: button 1 press
3132 */ 2946 */
3133void 2947void ecb_cold
3134rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3135{ 2949{
3136 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
3137 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
3138 2952
… …
3157 2971
3158/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
3159/* 2973/*
3160 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
3161 */ 2975 */
3162void 2976void ecb_cold
3163rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3164{ 2978{
3165 want_refresh = 1; 2979 want_refresh = 1;
3166 2980
3167 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3190 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3191 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3192 */ 3006 */
3193 3007
3194/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3195#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3196 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3197#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3198 3012
3199void 3013void ecb_cold
3200rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3201{ 3015{
3202 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3203 row_col_t bound; 3017 row_col_t bound;
3204 text_t *stp; 3018 text_t *stp;
… …
3278 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3279 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3280 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3281 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3282 */ 3096 */
3283void 3097void ecb_cold
3284rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3285{ 3099{
3286 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3287 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3288 3102
… …
3314 3128
3315/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3316/* 3130/*
3317 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3318 */ 3132 */
3319void 3133void ecb_cold
3320rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3321{ 3135{
3322 row_col_t pos; 3136 row_col_t pos;
3323 enum { 3137 enum {
3324 LEFT, RIGHT 3138 LEFT, RIGHT
3325 } closeto = RIGHT; 3139 } closeto = RIGHT;
3326
3327 want_refresh = 1;
3328 3140
3329 switch (selection.op) 3141 switch (selection.op)
3330 { 3142 {
3331 case SELECTION_INIT: 3143 case SELECTION_INIT:
3332 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
… …
3512 3324
3513#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3514 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3515 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3516#endif 3328#endif
3329
3330 selection_changed ();
3517} 3331}
3518 3332
3519#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3520void 3334void ecb_cold
3521rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3522{ 3336{
3523 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3524 text_t *stp; 3338 text_t *stp;
3525 3339
… …
3563/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3564/* 3378/*
3565 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3566 * EXT: button 3 double click 3380 * EXT: button 3 double click
3567 */ 3381 */
3568void 3382void ecb_cold
3569rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3570{ 3384{
3571 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3572 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3573} 3387}
… …
3575/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3576/* 3390/*
3577 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3578 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3579 */ 3393 */
3580void 3394void ecb_cold
3581rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3582{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3583 XSelectionEvent ev; 3398 XSelectionEvent ev;
3584 3399
3585 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3586 ev.property = None; 3401 ev.property = None;
3587 ev.display = rq.display; 3402 ev.display = rq.display;
… …
3602 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3603#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3604 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3605#endif 3420#endif
3606 3421
3607 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3608 32, PropModeReplace, 3423 32, PropModeReplace,
3609 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3610 ev.property = rq.property; 3425 ev.property = property;
3611 } 3426 }
3612#if TODO // TODO 3427#if TODO // TODO
3613 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3614 { 3429 {
3615 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3616 } 3431 }
3617#endif 3432#endif
3618 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3619 { 3434 {
3620 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3621 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3622 ev.property = rq.property; 3437 ev.property = property;
3438 }
3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3440 {
3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3443 ev.property = property;
3623 } 3444 }
3624 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3625 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3626 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3627 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
… …
3659 { 3480 {
3660 target = xa[XA_COMPOUND_TEXT]; 3481 target = xa[XA_COMPOUND_TEXT];
3661 style = enc_compound_text; 3482 style = enc_compound_text;
3662 } 3483 }
3663 3484
3664 if (selection.text) 3485 if (rq.selection == XA_PRIMARY && selection.text)
3665 { 3486 {
3666 cl = selection.text; 3487 cl = selection.text;
3667 selectlen = selection.len; 3488 selectlen = selection.len;
3489 }
3490 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3491 {
3492 cl = selection.clip_text;
3493 selectlen = selection.clip_len;
3668 } 3494 }
3669 else 3495 else
3670 { 3496 {
3671 cl = L""; 3497 cl = L"";
3672 selectlen = 0; 3498 selectlen = 0;
… …
3693 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3694 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3695 ct.encoding = target; 3521 ct.encoding = target;
3696 } 3522 }
3697 3523
3698 XChangeProperty (dpy, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3699 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3700 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3701 ev.property = rq.property; 3527 ev.property = property;
3702 3528
3703 if (freect) 3529 if (freect)
3704 XFree (ct.value); 3530 XFree (ct.value);
3705 } 3531 }
3706 3532
3707 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3708} 3534}
3709 3535
3710/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3711#ifdef USE_XIM 3537#if USE_XIM
3712void 3538void ecb_cold
3713rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3714{ 3540{
3715 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3716 3542
3717 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);
… …
3740 h += 2; min_it (h, nrow); 3566 h += 2; min_it (h, nrow);
3741 3567
3742 x -= 1; clamp_it (x, 0, ncol - w); 3568 x -= 1; clamp_it (x, 0, ncol - w);
3743 y -= 1; clamp_it (y, 0, nrow - h); 3569 y -= 1; clamp_it (y, 0, nrow - h);
3744 3570
3745 ov_x = x; ov_y = y; 3571 ov.x = x; ov.y = y;
3746 ov_w = w; ov_h = h; 3572 ov.w = w; ov.h = h;
3747 3573
3748 ov_text = new text_t *[h]; 3574 ov.text = new text_t *[h];
3749 ov_rend = new rend_t *[h]; 3575 ov.rend = new rend_t *[h];
3750 3576
3751 for (y = 0; y < h; y++) 3577 for (y = 0; y < h; y++)
3752 { 3578 {
3753 text_t *tp = ov_text[y] = new text_t[w]; 3579 text_t *tp = ov.text[y] = new text_t[w];
3754 rend_t *rp = ov_rend[y] = new rend_t[w]; 3580 rend_t *rp = ov.rend[y] = new rend_t[w];
3755 3581
3756 text_t t0, t1, t2; 3582 text_t t0, t1, t2;
3757 rend_t r = OVERLAY_RSTYLE; 3583 rend_t r = OVERLAY_RSTYLE;
3758 3584
3759 if (y == 0) 3585 if (y == 0)
… …
3778} 3604}
3779 3605
3780void 3606void
3781rxvt_term::scr_overlay_off () NOTHROW 3607rxvt_term::scr_overlay_off () NOTHROW
3782{ 3608{
3783 if (!ov_text) 3609 if (!ov.text)
3784 return; 3610 return;
3785 3611
3786 want_refresh = 1; 3612 want_refresh = 1;
3787 3613
3788 for (int y = 0; y < ov_h; y++) 3614 for (int y = 0; y < ov.h; y++)
3789 { 3615 {
3790 delete [] ov_text[y]; 3616 delete [] ov.text[y];
3791 delete [] ov_rend[y]; 3617 delete [] ov.rend[y];
3792 } 3618 }
3793 3619
3794 delete [] ov_text; ov_text = 0; 3620 delete [] ov.text; ov.text = 0;
3795 delete [] ov_rend; ov_rend = 0; 3621 delete [] ov.rend; ov.rend = 0;
3796} 3622}
3797 3623
3798void 3624void
3799rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3625rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3800{ 3626{
3801 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3627 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3802 return; 3628 return;
3803 3629
3804 x++, y++; 3630 x++, y++;
3805 3631
3806 ov_text[y][x] = text; 3632 ov.text[y][x] = text;
3807 ov_rend[y][x] = rend; 3633 ov.rend[y][x] = rend;
3808} 3634}
3809 3635
3810void 3636void
3811rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3812{ 3638{
… …
3831} 3657}
3832 3658
3833void 3659void
3834rxvt_term::scr_swap_overlay () NOTHROW 3660rxvt_term::scr_swap_overlay () NOTHROW
3835{ 3661{
3836 if (!ov_text) 3662 if (!ov.text)
3837 return; 3663 return;
3838 3664
3665 // hide cursor if it is within the overlay area
3666 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3667 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3668 screen.flags &= ~Screen_VisibleCursor;
3669
3839 // swap screen mem with overlay 3670 // swap screen mem with overlay
3840 for (int y = ov_h; y--; ) 3671 for (int y = ov.h; y--; )
3841 { 3672 {
3842 text_t *t1 = ov_text[y]; 3673 text_t *t1 = ov.text[y];
3843 rend_t *r1 = ov_rend[y]; 3674 rend_t *r1 = ov.rend[y];
3844 3675
3845 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3676 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3846 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3677 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3847 3678
3848 for (int x = ov_w; x--; ) 3679 for (int x = ov.w; x--; )
3849 { 3680 {
3850 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3681 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3851 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3682 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3852 } 3683 }
3853 } 3684 }

Diff Legend

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