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.327 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
152 col++; 151 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
154} 153}
155 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
156/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
159 168
160void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
161rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
162{ 215{
216#if ENABLE_OVERLAY
217 scr_overlay_off ();
218#endif
219
163 view_start = 0; 220 view_start = 0;
164 num_scr = 0; 221 num_scr = 0;
165 222
166 if (ncol == 0) 223 if (ncol == 0)
167 ncol = 80; 224 ncol = 80;
… …
187 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
188 245
189 screen.tscroll = 0; 246 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
191 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
192 if (!row_buf) 257 if (!prev_row_buf)
193 { 258 {
194 /* 259 /*
195 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
196 */ 261 */
197 top_row = 0; 262 top_row = 0;
198 term_start = 0; 263 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 264
214 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
231 selection.text = NULL; 282 selection.text = NULL;
232 selection.len = 0; 283 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 284 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 285 selection.screen = PRIMARY;
235 selection.clicks = 0; 286 selection.clicks = 0;
287 selection.clip_text = NULL;
288 selection.clip_len = 0;
236 } 289 }
237 else 290 else
238 { 291 {
239 /* 292 /*
240 * add or delete rows as appropriate 293 * add or delete rows as appropriate
241 */ 294 */
242 295
243 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 296 int common_col = min (prev_ncol, ncol);
244 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
245
246#if 0
247 if (nrow < prev_nrow)
248 {
249 for (int row = nrow; row < prev_nrow; row++)
250 {
251 lfree (swap_buf [row]);
252 lfree (drawn_buf[row]);
253 }
254 }
255#endif
256
257 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
258 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
259 297
260 for (int row = min (nrow, prev_nrow); row--; ) 298 for (int row = min (nrow, prev_nrow); row--; )
261 { 299 {
262 lresize (drawn_buf[row]); 300 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 301 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
264 } 302 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
265 303
266 for (int row = prev_nrow; row < nrow; row++) 304 copy_line (swap_buf [row], prev_swap_buf [row]);
267 { 305 }
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 }
271
272 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
274 306
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 307 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 308 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 309 int q = total_rows; // rewrapped row
278 310
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 318 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 319
288 do 320 do
289 { 321 {
290 p = MOD (p - 1, prev_total_rows); 322 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 323 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 324 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 325 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 326
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 327 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 328 {
299 p = MOD (p - 1, prev_total_rows); 329 p = MOD (p - 1, prev_total_rows);
300 330
301 plines++; 331 plines++;
302 llen += prev_ncol; 332 llen += prev_ncol;
… …
315 345
316 // re-assemble the full line by destination lines 346 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 347 for (int qrow = q; qlines--; qrow++)
318 { 348 {
319 qline = row_buf + qrow; 349 qline = row_buf + qrow;
320 lalloc (*qline); 350 qline->alloc (); // redundant with next line
321 qline->l = ncol; 351 qline->l = ncol;
322 qline->is_longer (1); 352 qline->is_longer (1);
323 353
324 int qcol = 0; 354 int qcol = 0;
325 355
… …
340 // this seems to upset applications/shells/readline 370 // this seems to upset applications/shells/readline
341 // least. 371 // least.
342 if (prow == ocur.row) 372 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 373 screen.cur.row = q - (total_rows - nrow);
344 374
345 line_t &pline = old_buf [prow]; 375 line_t &pline = prev_row_buf [prow];
346 376
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 377 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 378
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 379 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 380 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 401 {
372 // if no scrollback exists (yet), wing, instead of wrap 402 // if no scrollback exists (yet), wing, instead of wrap
373 403
374 for (int row = min (nrow, prev_nrow); row--; ) 404 for (int row = min (nrow, prev_nrow); row--; )
375 { 405 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 406 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row]; 407 line_t &dst = row_buf [row];
378 408
379 qline = pline; 409 copy_line (dst, src);
380 lresize (qline);
381 } 410 }
382 411
383 for (int row = prev_nrow; row < nrow; row++) 412 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 413 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 414
388 term_start = 0; 415 term_start = 0;
389 } 416 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 417
395 clamp_it (screen.cur.row, 0, nrow - 1); 418 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 419 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 420 }
398 421
422 for (int row = nrow; row--; )
423 {
424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
427 }
428
429 chunk_free (prev_chunk, prev_chunk_size);
430
399 free (tabs); 431 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 432 tabs = (char *)rxvt_malloc (ncol);
401 433
402 for (int col = ncol; --col; ) 434 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 435 tabs [col] = col % TABSIZE == 0;
404 436
405 CLEAR_ALL_SELECTION (); 437 CLEAR_ALL_SELECTION ();
406 438
407 prev_nrow = nrow; 439 prev_nrow = nrow;
… …
410 tt_winch (); 442 tt_winch ();
411 443
412 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 444 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413} 445}
414 446
415/* ------------------------------------------------------------------------- */ 447void ecb_cold
416/*
417 * Free everything. That way malloc debugging can find leakage.
418 */
419void
420rxvt_term::scr_release () NOTHROW 448rxvt_term::scr_release () NOTHROW
421{ 449{
422 if (row_buf) 450 chunk_free (chunk, chunk_size);
423 { 451 chunk = 0;
424 delete talloc; talloc = 0; 452 row_buf = 0;
425 delete ralloc; ralloc = 0;
426 453
427 free (row_buf);
428 free (swap_buf);
429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
432 free (tabs); 454 free (tabs);
433 tabs = 0; 455 tabs = 0;
434 }
435} 456}
436 457
437/* ------------------------------------------------------------------------- */ 458/* ------------------------------------------------------------------------- */
438/* 459/*
439 * Hard/Soft reset 460 * Hard/Soft reset
440 */ 461 */
441void 462void ecb_cold
442rxvt_term::scr_poweron () 463rxvt_term::scr_poweron ()
443{ 464{
444 scr_release (); 465 scr_release ();
466
445 prev_nrow = prev_ncol = 0; 467 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false; 468 rvideo_mode = false;
447 scr_soft_reset (); 469 scr_soft_reset ();
448 scr_reset (); 470 scr_reset ();
449 471
450 scr_clear (true); 472 scr_clear (true);
451 scr_refresh (); 473 scr_refresh ();
452} 474}
453 475
454void 476void ecb_cold
455rxvt_term::scr_soft_reset () 477rxvt_term::scr_soft_reset () NOTHROW
456{ 478{
457 /* only affects modes, nothing drastic such as clearing the screen */ 479 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY 480#if ENABLE_OVERLAY
459 scr_overlay_off (); 481 scr_overlay_off ();
460#endif 482#endif
… …
510 } 532 }
511 533
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 534 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 535 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 536 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 537 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 538 assert (s->cur.col >= 0);
518#endif
519} 539}
520 540
521void 541void
522rxvt_term::scr_swap_screen () 542rxvt_term::scr_swap_screen () NOTHROW
523{ 543{
524 if (!option (Opt_secondaryScreen)) 544 if (!option (Opt_secondaryScreen))
525 return; 545 return;
526 546
527 for (int i = prev_nrow; i--; ) 547 for (int i = prev_nrow; i--; )
… …
546 return; 566 return;
547 567
548 want_refresh = 1; 568 want_refresh = 1;
549 view_start = 0; 569 view_start = 0;
550 570
551 selection_check (2); /* check for boundary cross */ 571 /* check for boundary cross */
572 row_col_t pos;
573 pos.row = pos.col = 0;
574 if (ROWCOL_IS_BEFORE (selection.beg, pos)
575 && ROWCOL_IS_AFTER (selection.end, pos))
576 CLEAR_SELECTION ();
552 577
553 int i = current_screen; current_screen = scrn; scrn = i; 578 current_screen = scrn;
554 579
555#if NSCREENS 580#if NSCREENS
556 if (option (Opt_secondaryScreen)) 581 if (option (Opt_secondaryScreen))
557 { 582 {
558 num_scr = 0; 583 num_scr = 0;
… …
622/* 647/*
623 * Scroll text between <row1> and <row2> inclusive, by <count> lines 648 * Scroll text between <row1> and <row2> inclusive, by <count> lines
624 * count positive ==> scroll up 649 * count positive ==> scroll up
625 * count negative ==> scroll down 650 * count negative ==> scroll down
626 */ 651 */
627int 652int ecb_hot
628rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 653rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
629{ 654{
630 if (count == 0 || (row1 > row2)) 655 if (count == 0 || (row1 > row2))
631 return 0; 656 return 0;
632 657
… …
635 660
636 if (count > 0 661 if (count > 0
637 && row1 == 0 662 && row1 == 0
638 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 663 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639 { 664 {
665 min_it (count, total_rows - (nrow - (row2 + 1)));
666
640 top_row = max (top_row - count, -saveLines); 667 top_row = max (top_row - count, -saveLines);
641
642 // scroll everything up 'count' lines
643 term_start = (term_start + count) % total_rows;
644 668
645 // sever bottommost line 669 // sever bottommost line
646 { 670 {
647 line_t &l = ROW(row2 - count); 671 line_t &l = ROW(row2);
648 l.is_longer (0); 672 l.is_longer (0);
649 l.touch (); 673 l.touch ();
650 } 674 }
651 675
676 // scroll everything up 'count' lines
677 term_start = (term_start + count) % total_rows;
678
679 // now copy lines below the scroll region bottom to the
680 // bottom of the screen again, so they look as if they
681 // hadn't moved.
682 for (int i = nrow; --i > row2; )
683 {
684 line_t &l1 = ROW(i - count);
685 line_t &l2 = ROW(i);
686
687 ::swap (l1, l2);
688 l2.touch ();
689 }
690
652 // erase newly scrolled-in lines 691 // erase newly scrolled-in lines
653 for (int i = count; i--; ) 692 for (int i = count; i--; )
654 { 693 {
655 line_t &l = ROW(nrow - 1 - i); 694 line_t &l = ROW(row2 - i);
656 695
657 // optimize if already cleared, can be significant on slow machines 696 // optimise if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem 697 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 698 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 { 699 {
661 scr_blank_line (l, 0, l.l, rstyle); 700 scr_blank_line (l, 0, l.l, rstyle);
662 l.l = 0; 701 l.l = 0;
… …
664 } 703 }
665 else 704 else
666 scr_blank_screen_mem (l, rstyle); 705 scr_blank_screen_mem (l, rstyle);
667 } 706 }
668 707
669 // now copy lines below the scroll region bottom to the
670 // bottom of the screen again, so they look as if they
671 // hadn't moved.
672 for (int i = nrow; --i > row2; )
673 {
674 line_t &l1 = ROW(i - count);
675 line_t &l2 = ROW(i);
676
677 ::swap (l1, l2);
678 l2.touch ();
679 }
680
681 // move and/or clear selection, if any 708 // move and/or clear selection, if any
682 if (selection.op && current_screen == selection.screen) 709 if (selection.op && current_screen == selection.screen
710 && selection.beg.row <= row2)
683 { 711 {
684 selection.beg.row -= count; 712 selection.beg.row -= count;
685 selection.end.row -= count; 713 selection.end.row -= count;
686 selection.mark.row -= count; 714 selection.mark.row -= count;
687 715
688 if (selection.beg.row < top_row 716 selection_check (0);
689 || selection.end.row < top_row
690 || selection.mark.row < top_row)
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 } 717 }
696 718
697 // finally move the view window, if desired 719 // finally move the view window, if desired
698 if (option (Opt_scrollWithBuffer) 720 if (option (Opt_scrollWithBuffer)
699 && view_start != 0 721 && view_start != 0
… …
729 } 751 }
730 752
731 // use a simple and robust scrolling algorithm, this 753 // use a simple and robust scrolling algorithm, this
732 // part of scr_scroll_text is not time-critical. 754 // part of scr_scroll_text is not time-critical.
733 755
756 // sever line above scroll region
757 if (row1)
758 {
759 line_t &l = ROW(row1 - 1);
760 l.is_longer (0);
761 l.touch ();
762 }
763
734 int rows = row2 - row1 + 1; 764 int rows = row2 - row1 + 1;
735 765
736 min_it (count, rows); 766 min_it (count, rows);
737 767
738 line_t *temp_buf = row_buf + total_rows; 768 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739 769
740 for (int row = 0; row < rows; row++) 770 for (int row = 0; row < rows; row++)
741 { 771 {
742 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 772 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743 773
… …
745 scr_blank_screen_mem (temp_buf [row], rstyle); 775 scr_blank_screen_mem (temp_buf [row], rstyle);
746 } 776 }
747 777
748 for (int row = 0; row < rows; row++) 778 for (int row = 0; row < rows; row++)
749 ROW(row1 + row) = temp_buf [row]; 779 ROW(row1 + row) = temp_buf [row];
780
781 // sever bottommost line
782 {
783 line_t &l = ROW(row2);
784 l.is_longer (0);
785 l.touch ();
786 }
750 } 787 }
751 788
752 return count; 789 return count;
753} 790}
754 791
755/* ------------------------------------------------------------------------- */ 792/* ------------------------------------------------------------------------- */
756/* 793/*
757 * Add text given in <str> of length <len> to screen struct 794 * Add text given in <str> of length <len> to screen struct
758 */ 795 */
759void 796void ecb_hot
760rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
761{ 798{
762 if (len <= 0) /* sanity */ 799 if (len <= 0) /* sanity */
763 return; 800 return;
764 801
765 unsigned char checksel; 802 bool checksel;
766 unicode_t c; 803 unicode_t c;
767 int ncol = this->ncol; 804 int ncol = this->ncol;
768 const wchar_t *strend = str + len; 805 const wchar_t *strend = str + len;
769 806
770 want_refresh = 1; 807 want_refresh = 1;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 820 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 821 screen.cur.row -= minlines;
785 } 822 }
786 } 823 }
787 824
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 825 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 826 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 827 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 828 int row = screen.cur.row;
794 829
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 830 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 831
797 line_t *line = &ROW(row); 832 line_t *line = &ROW(row);
798 833
799 while (str < strend) 834 while (str < strend)
800 { 835 {
801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 836 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802 837
803 if (expect_false (c < 0x20)) 838 if (ecb_unlikely (c < 0x20))
804 if (c == C0_LF) 839 if (c == C0_LF)
805 { 840 {
806 max_it (line->l, screen.cur.col); 841 max_it (line->l, screen.cur.col);
807 842
808 screen.flags &= ~Screen_WrapNext; 843 screen.flags &= ~Screen_WrapNext;
… …
827 { 862 {
828 scr_tab (1, true); 863 scr_tab (1, true);
829 continue; 864 continue;
830 } 865 }
831 866
832 if (expect_false ( 867 if (ecb_unlikely (
833 checksel /* see if we're writing within selection */ 868 checksel /* see if we're writing within selection */
834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 869 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 870 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 )) 871 ))
837 { 872 {
… …
842 * should be a similar check. 877 * should be a similar check.
843 */ 878 */
844 CLEAR_SELECTION (); 879 CLEAR_SELECTION ();
845 } 880 }
846 881
847 if (expect_false (screen.flags & Screen_WrapNext)) 882 if (ecb_unlikely (screen.flags & Screen_WrapNext))
848 { 883 {
849 scr_do_wrap (); 884 scr_do_wrap ();
850 885
851 line->l = ncol; 886 line->l = ncol;
852 line->is_longer (1); 887 line->is_longer (1);
… …
854 row = screen.cur.row; 889 row = screen.cur.row;
855 line = &ROW(row); /* _must_ refresh */ 890 line = &ROW(row); /* _must_ refresh */
856 } 891 }
857 892
858 // some utf-8 decoders "decode" surrogate characters: let's fix this. 893 // some utf-8 decoders "decode" surrogate characters: let's fix this.
859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 894 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860 c = 0xfffd; 895 c = 0xfffd;
861 896
862 // rely on wcwidth to tell us the character width, do wcwidth before 897 // rely on wcwidth to tell us the character width, do wcwidth before
863 // further replacements, as wcwidth might return -1 for the line 898 // further replacements, as wcwidth might return -1 for the line
864 // drawing characters below as they might be invalid in the current 899 // drawing characters below as they might be invalid in the current
865 // locale. 900 // locale.
866 int width = WCWIDTH (c); 901 int width = WCWIDTH (c);
867 902
868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 903 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869 { 904 {
870 // vt100 special graphics and line drawing 905 // vt100 special graphics and line drawing
871 // 5f-7e standard vt100 906 // 5f-7e standard vt100
872 // 40-5e rxvt extension for extra curses acs chars 907 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[62] = { // 41 .. 7e 908 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 c = vt100_0[c - 0x41]; 921 c = vt100_0[c - 0x41];
887 width = 1; // vt100 line drawing characters are always single-width 922 width = 1; // vt100 line drawing characters are always single-width
888 } 923 }
889 } 924 }
890 925
891 if (expect_false (screen.flags & Screen_Insert)) 926 if (ecb_unlikely (screen.flags & Screen_Insert))
892 scr_insdel_chars (width, INSERT); 927 scr_insdel_chars (width, INSERT);
893 928
894 if (width != 0) 929 if (width != 0)
895 { 930 {
896#if !UNICODE_3 931#if !UNICODE_3
… …
901# else 936# else
902 c = 0xfffd; 937 c = 0xfffd;
903# endif 938# endif
904#endif 939#endif
905 940
941 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
942
943 // if the character doesn't fit into the remaining columns...
944 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
945 {
946 if (screen.flags & Screen_Autowrap)
947 {
948 // ... artificially enlargen the previous one
949 c = NOCHAR;
950 // and try the same character next loop iteration
951 --str;
952 }
953 else
954 screen.cur.col = ncol - width;
955 }
956
906 // nuke the character at this position, if required 957 // nuke the character at this position, if required
907 if (expect_false ( 958 // due to wonderful coincidences everywhere else in this loop
959 // we never have to check for overwriting a wide char itself,
960 // only its tail.
908 line->t[screen.cur.col] == NOCHAR 961 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col); 962 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 {
919 // ... artificially enlargen the previous one
920 c = NOCHAR;
921 // and try the same character next loop iteration
922 --str;
923 }
924 963
925 line->touch (); 964 line->touch ();
926 965
927 do 966 do
928 { 967 {
929 line->t[screen.cur.col] = c; 968 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 969 line->r[screen.cur.col] = rend;
931 970
932 if (expect_true (screen.cur.col < ncol - 1)) 971 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 972 screen.cur.col++;
934 else 973 else
935 { 974 {
936 line->l = ncol; 975 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 976 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 977 screen.flags |= Screen_WrapNext;
939 break; 978
979 goto end_of_line;
940 } 980 }
941 981
942 c = NOCHAR; 982 c = NOCHAR;
943 } 983 }
944 while (expect_false (--width > 0)); 984 while (ecb_unlikely (--width > 0));
945 985
946 // pad with spaces when overwriting wide character with smaller one 986 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 987 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 988 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 989 line->t[c] = ' ';
954 line->r[c] = rend; 990 line->r[c] = rend;
955 }
956 } 991 }
992
993end_of_line:
994 ;
957 } 995 }
958#if ENABLE_COMBINING 996#if ENABLE_COMBINING
959 else // width == 0 997 else // width == 0
960 { 998 {
961 if (c != 0xfeff) // ignore BOM 999 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1039#endif
1002 } 1040 }
1003 1041
1004 max_it (line->l, screen.cur.col); 1042 max_it (line->l, screen.cur.col);
1005 1043
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1044 assert (screen.cur.row >= 0);
1008#endif
1009} 1045}
1010 1046
1011/* ------------------------------------------------------------------------- */ 1047/* ------------------------------------------------------------------------- */
1012/* 1048/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1049 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1062
1027 want_refresh = 1; 1063 want_refresh = 1;
1028#endif 1064#endif
1029 } 1065 }
1030 } 1066 }
1067 else if (screen.flags & Screen_WrapNext)
1068 screen.flags &= ~Screen_WrapNext;
1031 else 1069 else
1032 scr_gotorc (0, -1, RELATIVE); 1070 scr_gotorc (0, -1, RELATIVE);
1033} 1071}
1034 1072
1035/* ------------------------------------------------------------------------- */ 1073/* ------------------------------------------------------------------------- */
… …
1113 * XTERM_SEQ: ESC 6 1151 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1152 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1153 * in that row right. Clear left column.
1116 */ 1154 */
1117#if !ENABLE_MINIMAL 1155#if !ENABLE_MINIMAL
1118void 1156void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1157rxvt_term::scr_backindex () NOTHROW
1120{ 1158{
1121 if (screen.cur.col > 0) 1159 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1161 else
… …
1130 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1133 */ 1171 */
1134#if !ENABLE_MINIMAL 1172#if !ENABLE_MINIMAL
1135void 1173void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1174rxvt_term::scr_forwardindex () NOTHROW
1137{ 1175{
1138 if (screen.cur.col < ncol - 1) 1176 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1178 else
… …
1291 scr_blank_line (line, col, num, rstyle); 1329 scr_blank_line (line, col, num, rstyle);
1292} 1330}
1293 1331
1294/* ------------------------------------------------------------------------- */ 1332/* ------------------------------------------------------------------------- */
1295/* 1333/*
1296 * Erase part of whole of the screen 1334 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1335 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1336 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1337 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1338 */
1301void 1339void
… …
1310 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1311 1349
1312 switch (mode) 1350 switch (mode)
1313 { 1351 {
1314 case 0: /* erase to end of screen */ 1352 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1353 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1354 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1355 num = nrow - row;
1319 break; 1356 break;
1320 case 1: /* erase to beginning of screen */ 1357 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1358 scr_erase_line (1);
1323 row = 0; 1359 row = 0;
1324 num = screen.cur.row; 1360 num = screen.cur.row;
1325 break; 1361 break;
1326 case 2: /* erase whole screen */ 1362 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1363 row = 0;
1329 num = nrow; 1364 num = nrow;
1330 break; 1365 break;
1331 default: 1366 default:
1332 return; 1367 return;
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1376 if (row >= nrow) /* Out Of Bounds */
1342 return; 1377 return;
1343 1378
1344 min_it (num, nrow - row); 1379 min_it (num, nrow - row);
1345 1380
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1381 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1382 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1383 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1384 {
1353 ren = DEFAULT_RSTYLE; 1385 ren = DEFAULT_RSTYLE;
1354 1386
1355 if (mapped && !view_start) 1387 if (mapped)
1356 XClearArea (dpy, vt, 0, 1388 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1389 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1390 (unsigned int)Height2Pixel (num), False);
1359 } 1391 }
1360 else 1392 else
1361 { 1393 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1394 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1395
1364 if (mapped && !view_start) 1396 if (mapped)
1365 { 1397 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1398 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1400 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1401 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1402 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1403 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1404 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1405 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1406 }
1375 } 1407 }
1376 1408
1377 for (; num--; row++) 1409 for (; num--; row++)
1378 { 1410 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1411 scr_blank_screen_mem (ROW(row), rstyle);
1380 1412
1381 if (!view_start) 1413 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1414 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1415 }
1384} 1416}
1385 1417
1386#if !ENABLE_MINIMAL 1418#if !ENABLE_MINIMAL
1387void 1419void
… …
1397/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1398/* 1430/*
1399 * Fill the screen with `E's 1431 * Fill the screen with `E's
1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1432 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1401 */ 1433 */
1402void 1434void ecb_cold
1403rxvt_term::scr_E () NOTHROW 1435rxvt_term::scr_E () NOTHROW
1404{ 1436{
1405 rend_t fs; 1437 rend_t fs;
1406 1438
1407 want_refresh = 1; 1439 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1440 ZERO_SCROLLBACK ();
1409 1441
1410 num_scr_allow = 0; 1442 num_scr_allow = 0;
1411 selection_check (3); 1443
1444 row_col_t pos;
1445 pos.row = pos.col = 0;
1446 if (ROWCOL_IS_AFTER (selection.end, pos))
1447 CLEAR_SELECTION ();
1412 1448
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1449 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1450 for (int row = nrow; row--; )
1415 { 1451 {
1416 line_t &line = ROW(row); 1452 line_t &line = ROW(row);
… …
1567/* ------------------------------------------------------------------------- */ 1603/* ------------------------------------------------------------------------- */
1568/* 1604/*
1569 * Set the scrolling region 1605 * Set the scrolling region
1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1606 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571 */ 1607 */
1572void 1608void ecb_cold
1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1609rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574{ 1610{
1575 max_it (top, 0); 1611 max_it (top, 0);
1576 min_it (bot, nrow - 1); 1612 min_it (bot, nrow - 1);
1577 1613
… …
1587/* 1623/*
1588 * Make the cursor visible/invisible 1624 * Make the cursor visible/invisible
1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1625 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1626 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591 */ 1627 */
1592void 1628void ecb_cold
1593rxvt_term::scr_cursor_visible (int mode) NOTHROW 1629rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594{ 1630{
1595 want_refresh = 1; 1631 want_refresh = 1;
1596 1632
1597 if (mode) 1633 if (mode)
… …
1604/* 1640/*
1605 * Set/unset automatic wrapping 1641 * Set/unset automatic wrapping
1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1642 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1643 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608 */ 1644 */
1609void 1645void ecb_cold
1610rxvt_term::scr_autowrap (int mode) NOTHROW 1646rxvt_term::scr_autowrap (int mode) NOTHROW
1611{ 1647{
1612 if (mode) 1648 if (mode)
1613 screen.flags |= Screen_Autowrap; 1649 screen.flags |= Screen_Autowrap;
1614 else 1650 else
… …
1623 * Relative mode: line numbers are relative to top margin of scrolling region 1659 * Relative mode: line numbers are relative to top margin of scrolling region
1624 * and the cursor cannot be moved outside. 1660 * and the cursor cannot be moved outside.
1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1661 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1662 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627 */ 1663 */
1628void 1664void ecb_cold
1629rxvt_term::scr_relative_origin (int mode) NOTHROW 1665rxvt_term::scr_relative_origin (int mode) NOTHROW
1630{ 1666{
1631 if (mode) 1667 if (mode)
1632 screen.flags |= Screen_Relative; 1668 screen.flags |= Screen_Relative;
1633 else 1669 else
… …
1640/* 1676/*
1641 * Set insert/replace mode 1677 * Set insert/replace mode
1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1678 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1679 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644 */ 1680 */
1645void 1681void ecb_cold
1646rxvt_term::scr_insert_mode (int mode) NOTHROW 1682rxvt_term::scr_insert_mode (int mode) NOTHROW
1647{ 1683{
1648 if (mode) 1684 if (mode)
1649 screen.flags |= Screen_Insert; 1685 screen.flags |= Screen_Insert;
1650 else 1686 else
… …
1656 * Set/Unset tabs 1692 * Set/Unset tabs
1657 * XTERM_SEQ: Set tab at current column : ESC H 1693 * XTERM_SEQ: Set tab at current column : ESC H
1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1694 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1695 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660 */ 1696 */
1661void 1697void ecb_cold
1662rxvt_term::scr_set_tab (int mode) NOTHROW 1698rxvt_term::scr_set_tab (int mode) NOTHROW
1663{ 1699{
1664 if (mode < 0) 1700 if (mode < 0)
1665 memset (tabs, 0, ncol); 1701 memset (tabs, 0, ncol);
1666 else if (screen.cur.col < ncol) 1702 else if (screen.cur.col < ncol)
… …
1685 if (rvideo_state != on) 1721 if (rvideo_state != on)
1686 { 1722 {
1687 rvideo_state = on; 1723 rvideo_state = on;
1688 1724
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1726#ifdef HAVE_IMG
1691 if (bgPixmap.pixmap == None) 1727 if (bg_img == 0)
1692#endif 1728#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1730
1695 XGCValues gcvalue; 1731 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1732 gcvalue.foreground = pix_colors[Color_fg];
… …
1705/* ------------------------------------------------------------------------- */ 1741/* ------------------------------------------------------------------------- */
1706/* 1742/*
1707 * Report current cursor position 1743 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1744 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1745 */
1710void 1746void ecb_cold
1711rxvt_term::scr_report_position () NOTHROW 1747rxvt_term::scr_report_position () NOTHROW
1712{ 1748{
1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1749 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714} 1750}
1715 1751
… …
1718 * ------------------------------------------------------------------------- */ 1754 * ------------------------------------------------------------------------- */
1719 1755
1720/* 1756/*
1721 * Set font style 1757 * Set font style
1722 */ 1758 */
1723void 1759void ecb_cold
1724rxvt_term::set_font_style () NOTHROW 1760rxvt_term::set_font_style () NOTHROW
1725{ 1761{
1726#if 0 1762#if 0
1727 switch (charsets [screen.charset]) 1763 switch (charsets [screen.charset])
1728 { 1764 {
… …
1750 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1786 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1787 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1788 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1789 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1790 */
1755void 1791void ecb_cold
1756rxvt_term::scr_charset_choose (int set) NOTHROW 1792rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1793{
1758 screen.charset = set; 1794 screen.charset = set;
1759 set_font_style (); 1795 set_font_style ();
1760} 1796}
… …
1781 * ------------------------------------------------------------------------- */ 1817 * ------------------------------------------------------------------------- */
1782 1818
1783/* 1819/*
1784 * refresh matching text. 1820 * refresh matching text.
1785 */ 1821 */
1786bool 1822bool ecb_cold
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1823rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1824{
1789 bool found = false; 1825 bool found = false;
1790 1826
1791 for (int i = 0; i < nrow; i++) 1827 for (int i = 0; i < nrow; i++)
… …
1810 PART_BEG = 0, 1846 PART_BEG = 0,
1811 PART_END, 1847 PART_END,
1812 RC_COUNT 1848 RC_COUNT
1813}; 1849};
1814 1850
1815void 1851void ecb_hot
1816rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1852rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1817{ 1853{
1818 int i; 1854 int i;
1819 row_col_t rc[RC_COUNT]; 1855 row_col_t rc[RC_COUNT];
1820 1856
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1876 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1877 {
1842 min_it (rc[i].col, ncol - 1); 1878 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1879 min_it (rc[i].row, nrow - 1);
1844 } 1880 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1881
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1882 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1883 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1884
1849 num_scr_allow = 0; 1885 num_scr_allow = 0;
1850 1886
… …
1857 * Refresh the entire screen 1893 * Refresh the entire screen
1858 */ 1894 */
1859void 1895void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1896rxvt_term::scr_touch (bool refresh) NOTHROW
1861{ 1897{
1862 scr_expose (0, 0, width, height, refresh); 1898 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1899}
1864 1900
1865/* ------------------------------------------------------------------------- */ 1901/* ------------------------------------------------------------------------- */
1866/* 1902/*
1867 * Move the display so that the line represented by scrollbar value Y is at 1903 * Move the display so that the line represented by scrollbar value Y is at
… …
1923 1959
1924# ifndef NO_MAPALERT 1960# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1961# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1962 if (option (Opt_mapAlert))
1927# endif 1963# endif
1928 XMapWindow (dpy, parent[0]); 1964 XMapWindow (dpy, parent);
1929# endif 1965# endif
1930 1966
1931# if ENABLE_FRILLS 1967# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1968 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1969 set_urgency (1);
… …
1941 1977
1942 bell_ev.start (VISUAL_BELL_DURATION); 1978 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1979 }
1944 else 1980 else
1945 XBell (dpy, 0); 1981 XBell (dpy, 0);
1982 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1983#endif
1947} 1984}
1948 1985
1949/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1987void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1988rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1989{
1954#ifdef PRINTPIPE 1990#ifdef PRINTPIPE
1955 int nrows, row_start; 1991 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1992 FILE *fd = popen_printer ();
… …
1969 row_start = view_start; 2005 row_start = view_start;
1970 } 2006 }
1971 2007
1972 wctomb (0, 0); 2008 wctomb (0, 0);
1973 2009
1974 for (int r1 = 0; r1 < nrows; r1++) 2010 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 2011 {
1976 text_t *tp = ROW(r1).t; 2012 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 2013 int len = ROW(r1).l;
1978 2014
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2015 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2005/* 2041/*
2006 * Refresh the screen 2042 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2043 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2044 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2045 */
2010void 2046void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () NOTHROW
2012{ 2048{
2013 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2051 int i; /* tmp */
2016#ifndef NO_CURSORCOLOR
2017 rend_t cc1; /* store colours at cursor position (s) */
2018#endif
2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */ 2052 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
2022 2056
2023 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2024 2058
2025 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2026 return; 2060 return;
… …
2029 * A: set up vars 2063 * A: set up vars
2030 */ 2064 */
2031 refresh_count = 0; 2065 refresh_count = 0;
2032 2066
2033 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2068 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2036 have_bg = bgPixmap.pixmap != None; 2070 have_bg = bg_img != 0;
2037#endif 2071#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2073
2040 /* 2074 /*
2041 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2081 scr_swap_overlay ();
2048#endif 2082#endif
2049 2083
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2085
2052 /* 2086 /*
2053 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2054 */ 2088 */
2055 { 2089 {
2056 unsigned char setoldcursor; 2090 bool setoldcursor;
2057 2091
2058#ifdef CURSOR_BLINK 2092#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2093 if (hidden_cursor)
2060 showcursor = 0; 2094 showcursor = 0;
2061#endif 2095#endif
… …
2065 int col = screen.cur.col; 2099 int col = screen.cur.col;
2066 2100
2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2068 col--; 2102 col--;
2069 2103
2070 crp = &ROW(screen.cur.row).r[col]; 2104 cur_rend = ROW(screen.cur.row).r[col];
2105 cur_col = col;
2071 2106
2072#ifndef NO_CURSORCOLOR 2107#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor)) 2108 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor; 2109 ccol1 = Color_cursor;
2076 else 2110 else
2077#endif 2111#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2090 ccol2 = bgcolor_of (rstyle); 2124 ccol2 = bgcolor_of (rstyle);
2091#else 2125#else
2092 ccol2 = Color_bg; 2126 ccol2 = Color_bg;
2093#endif 2127#endif
2094 2128
2095 if (showcursor && focus) 2129 if (focus)
2096 { 2130 {
2131 rend_t rend = cur_rend;
2132
2097 if (option (Opt_cursorUnderline)) 2133 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2134 rend ^= RS_Uline;
2099 else 2135 else
2100 { 2136 {
2101 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2102 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2103 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2104 } 2140 }
2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2105 } 2143 }
2106 } 2144 }
2107 2145
2108 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2109 setoldcursor = 0; 2147 setoldcursor = 0;
… …
2148 { 2186 {
2149 int16_t nits; 2187 int16_t nits;
2150 int i = num_scr; 2188 int i = num_scr;
2151 int j; 2189 int j;
2152 int len, wlen; 2190 int len, wlen;
2153 dLocal (int, num_scr);
2154 2191
2155 j = nrow; 2192 j = nrow;
2156 wlen = len = -1; 2193 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2194 row = i > 0 ? 0 : j - 1;
2158 2195
… …
2233 continue; 2270 continue;
2234 2271
2235 // redraw one or more characters 2272 // redraw one or more characters
2236 2273
2237 // seek to the beginning of wide characters 2274 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2275 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2276 --col;
2240 2277
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2278 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2279 text_t *text = stp + col;
2243 int count = 1; 2280 int count = 1;
2244 2281
2245 dtp[col] = stp[col]; 2282 dtp[col] = stp[col];
2246 drp[col] = rend; 2283 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2287 for (i = 0; ++col < ncol; )
2251 { 2288 {
2252 if (stp[col] == NOCHAR) 2289 if (stp[col] == NOCHAR)
2253 { 2290 {
2254 dtp[col] = stp[col]; 2291 dtp[col] = stp[col];
2255 drp[col] = rend; 2292 drp[col] = srp[col];
2293
2256 count++; 2294 count++;
2257 i++; 2295 i++;
2258 2296
2259 continue; 2297 continue;
2260 } 2298 }
… …
2280 2318
2281 col--; /* went one too far. move back */ 2319 col--; /* went one too far. move back */
2282 count -= i; /* dump any matching trailing chars */ 2320 count -= i; /* dump any matching trailing chars */
2283 2321
2284 // sometimes we optimize away the trailing NOCHAR's, add them back 2322 // sometimes we optimize away the trailing NOCHAR's, add them back
2285 while (expect_false (i && text[count] == NOCHAR)) 2323 while (ecb_unlikely (i && text[count] == NOCHAR))
2286 count++, i--; 2324 count++, i--;
2287 2325
2288 /* 2326 /*
2289 * Determine the attributes for the string 2327 * Determine the attributes for the string
2290 */ 2328 */
2291 int fore = fgcolor_of (rend); // desired foreground 2329 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2330 int back = bgcolor_of (rend); // desired background
2293 2331
2294 // only do special processing if any attributes are set, which is unlikely 2332 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2333 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2334 {
2297 bool invert = rend & RS_RVid; 2335 bool invert = rend & RS_RVid;
2298 2336
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2337#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2338 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2357
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2358 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2359 fore = Color_UL;
2322#endif 2360#endif
2323 2361
2362#ifdef OPTION_HC
2363 if (rend & RS_Sel)
2364 {
2365 /* invert the column if no highlightColor is set or it is the
2366 * current cursor column */
2367 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2368 && ISSET_PIXCOLOR (Color_HC))
2369 {
2370 if (ISSET_PIXCOLOR (Color_HTC))
2371 fore = Color_HTC;
2372 // if invert is 0 reverse video is set so we use bg color as fg color
2373 else if (!invert)
2374 fore = back;
2375
2376 back = Color_HC;
2377 invert = 0;
2378 }
2379 }
2380#endif
2381
2324 if (invert) 2382 if (invert)
2325 { 2383 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2384 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2385
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2386#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2387 if (fore == back)
2344 { 2388 {
2345 fore = Color_bg; 2389 fore = Color_bg;
2346 back = Color_fg; 2390 back = Color_fg;
2347 } 2391 }
… …
2383 /* 2427 /*
2384 * Actually do the drawing of the string here 2428 * Actually do the drawing of the string here
2385 */ 2429 */
2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2430 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387 2431
2388 if (expect_true (have_bg && back == Color_bg)) 2432 if (ecb_likely (have_bg && back == Color_bg))
2389 { 2433 {
2390 // this is very ugly, maybe push it into ->draw? 2434 // this is very ugly, maybe push it into ->draw?
2391 2435
2392 for (i = 0; i < count; i++) /* don't draw empty strings */ 2436 for (i = 0; i < count; i++) /* don't draw empty strings */
2393 if (text[i] != ' ') 2437 if (text[i] != ' ')
… …
2400 did_clear: ; 2444 did_clear: ;
2401 } 2445 }
2402 else 2446 else
2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2447 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404 2448
2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2449 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406 { 2450 {
2407#if ENABLE_FRILLS 2451#if ENABLE_FRILLS
2408 if (ISSET_PIXCOLOR (Color_underline)) 2452 if (ISSET_PIXCOLOR (Color_underline))
2409 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2453 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410 else 2454 else
… …
2422 * G: cleanup cursor and display outline cursor if necessary 2466 * G: cleanup cursor and display outline cursor if necessary
2423 */ 2467 */
2424 if (showcursor) 2468 if (showcursor)
2425 { 2469 {
2426 if (focus) 2470 if (focus)
2427 { 2471 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2428 if (option (Opt_cursorUnderline))
2429 *crp ^= RS_Uline;
2430 else
2431 {
2432 *crp ^= RS_RVid;
2433#ifndef NO_CURSORCOLOR
2434 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2435#endif
2436 }
2437 }
2438 else if (oldcursor.row >= 0) 2472 else if (oldcursor.row >= 0)
2439 { 2473 {
2440 int cursorwidth = 1; 2474 int cursorwidth = 1;
2441 int col = oldcursor.col; 2475 int col = oldcursor.col;
2442 2476
… …
2456 2490
2457 XDrawRectangle (dpy, vt, gc, 2491 XDrawRectangle (dpy, vt, gc,
2458 Col2Pixel (col), 2492 Col2Pixel (col),
2459 Row2Pixel (oldcursor.row), 2493 Row2Pixel (oldcursor.row),
2460 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2494 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2461 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2495 (unsigned int) (Height2Pixel (1) - 1));
2462 } 2496 }
2463 } 2497 }
2464 2498
2465 /* 2499 /*
2466 * H: cleanup selection 2500 * H: cleanup selection
… …
2475 screen.flags = old_screen_flags; 2509 screen.flags = old_screen_flags;
2476 num_scr = 0; 2510 num_scr = 0;
2477 num_scr_allow = 1; 2511 num_scr_allow = 1;
2478} 2512}
2479 2513
2480void 2514void ecb_cold
2481rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2515rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2482{ 2516{
2483 if (!l.t) 2517 if (!l.valid ())
2484 return; 2518 return;
2485 2519
2486 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2520 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2487 2521
2488 for (int i = ncol; i--; ) 2522 for (int i = ncol; i--; )
2489 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2523 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2490} 2524}
2491 2525
2492void 2526void ecb_cold
2493rxvt_term::scr_remap_chars () NOTHROW 2527rxvt_term::scr_remap_chars () NOTHROW
2494{ 2528{
2495 for (int i = total_rows; i--; ) 2529 for (int i = total_rows; i--; )
2496 scr_remap_chars (row_buf [i]); 2530 scr_remap_chars (row_buf [i]);
2497 2531
… …
2500 scr_remap_chars (drawn_buf [i]); 2534 scr_remap_chars (drawn_buf [i]);
2501 scr_remap_chars (swap_buf [i]); 2535 scr_remap_chars (swap_buf [i]);
2502 } 2536 }
2503} 2537}
2504 2538
2505void 2539void ecb_cold
2506rxvt_term::scr_recolour () NOTHROW 2540rxvt_term::scr_recolour (bool refresh) NOTHROW
2507{ 2541{
2508#ifdef HAVE_BG_PIXMAP 2542 bool transparent = false;
2509 bgPixmap.apply ();
2510#else
2511 2543
2544#ifdef HAVE_IMG
2545 if (bg_img != 0)
2546 {
2547# if ENABLE_TRANSPARENCY
2548 if (bg_flags & BG_IS_TRANSPARENT)
2549 {
2550 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2551 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2552
2553 transparent = true;
2554 }
2555 else
2556# endif
2557 {
2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2559 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2560 }
2561 }
2562 else
2563#endif
2564 {
2512 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2565 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2513 XClearWindow (dpy, parent[0]);
2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2566 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2567 }
2568
2569 XClearWindow (dpy, parent);
2515 2570
2516 if (scrollBar.win) 2571 if (scrollBar.win)
2517 { 2572 {
2573 if (transparent)
2574 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2575 else
2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2576 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2519 scrollBar.state = STATE_IDLE; 2577 scrollBar.state = SB_STATE_IDLE;
2520 scrollBar.show (0); 2578 scrollBar.show (0);
2521 } 2579 }
2522 2580
2523#endif 2581 if (refresh)
2524 2582 {
2525 /* bgPixmap.apply () does not do the following : */
2526 scr_clear (); 2583 scr_clear ();
2527 scr_touch (true); 2584 scr_touch (true);
2585 }
2528 want_refresh = 1; 2586 want_refresh = 1;
2529} 2587}
2530 2588
2531/* ------------------------------------------------------------------------- */ 2589/* ------------------------------------------------------------------------- */
2532void 2590void
… …
2589 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2647 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2590 srp[col] ^= rstyle; 2648 srp[col] ^= rstyle;
2591} 2649}
2592 2650
2593/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2594void 2652void ecb_hot
2595rxvt_term::scr_reverse_selection () NOTHROW 2653rxvt_term::scr_reverse_selection () NOTHROW
2596{ 2654{
2597 if (selection.op 2655 if (selection.op
2598 && current_screen == selection.screen 2656 && current_screen == selection.screen
2599 && selection.end.row >= view_start) 2657 && selection.end.row >= view_start)
2600 { 2658 {
2601#if !ENABLE_MINIMAL 2659#if !ENABLE_MINIMAL
2602 if (selection.rect) 2660 if (selection.rect)
2603 scr_xor_rect (selection.beg.row, selection.beg.col, 2661 scr_xor_rect (selection.beg.row, selection.beg.col,
2604 selection.end.row, selection.end.col, 2662 selection.end.row, selection.end.col,
2605 RS_RVid, RS_RVid | RS_Uline); 2663 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2606 else 2664 else
2607#endif 2665#endif
2608 scr_xor_span (selection.beg.row, selection.beg.col, 2666 scr_xor_span (selection.beg.row, selection.beg.col,
2609 selection.end.row, selection.end.col, 2667 selection.end.row, selection.end.col,
2610 RS_RVid); 2668 RS_Sel | RS_RVid);
2611 } 2669 }
2612} 2670}
2613 2671
2614/* ------------------------------------------------------------------------- */ 2672/* ------------------------------------------------------------------------- */
2615/* 2673/*
… …
2618 */ 2676 */
2619#if 0 2677#if 0
2620void 2678void
2621rxvt_term::scr_dump (int fd) NOTHROW 2679rxvt_term::scr_dump (int fd) NOTHROW
2622{ 2680{
2623 int row, wrote; 2681 // if this method is needed, it can be implemented by factoring the
2624 unsigned int width, towrite; 2682 // relevant code in scr_printscreen
2625 char r1[] = "\n";
2626
2627 for (row = saveLines + top_row;
2628 row < saveLines + nrow - 1; row++)
2629 {
2630 width = row_buf[row].l >= 0 ? row_buf[row].l
2631 : ncol;
2632 for (towrite = width; towrite; towrite -= wrote)
2633 {
2634 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2635 towrite);
2636 if (wrote < 0)
2637 return; /* XXX: death, no report */
2638 }
2639 if (row_buf[row].l >= 0)
2640 if (write (fd, r1, 1) <= 0)
2641 return; /* XXX: death, no report */
2642 }
2643} 2683}
2644#endif 2684#endif
2645 2685
2646/* ------------------------------------------------------------------------- * 2686/* ------------------------------------------------------------------------- *
2647 * CHARACTER SELECTION * 2687 * CHARACTER SELECTION *
2648 * ------------------------------------------------------------------------- */ 2688 * ------------------------------------------------------------------------- */
2649void 2689void
2650rxvt_term::selection_check (int check_more) NOTHROW 2690rxvt_term::selection_check (int check_more) NOTHROW
2651{ 2691{
2652 row_col_t pos;
2653
2654 if (!selection.op) 2692 if (!selection.op)
2655 return; 2693 return;
2656 2694
2657 pos.row = pos.col = 0;
2658 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2695 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2659 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2696 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2660 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2697 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2661 || (check_more == 1 2698 || (check_more == 1
2662 && current_screen == selection.screen 2699 && current_screen == selection.screen
2663 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2700 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2664 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2701 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2665 || (check_more == 2
2666 && ROWCOL_IS_BEFORE (selection.beg, pos)
2667 && ROWCOL_IS_AFTER (selection.end, pos))
2668 || (check_more == 3
2669 && ROWCOL_IS_AFTER (selection.end, pos))
2670 || (check_more == 4 /* screen width change */
2671 && (selection.beg.row != selection.end.row
2672 || selection.end.col > ncol)))
2673 CLEAR_SELECTION (); 2702 CLEAR_ALL_SELECTION ();
2703}
2704
2705void
2706rxvt_term::selection_changed () NOTHROW
2707{
2708 line_t &r1 = ROW (selection.beg.row);
2709 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2710 --selection.beg.col;
2711
2712 line_t &r2 = ROW (selection.end.row);
2713 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2714 ++selection.end.col;
2715
2716 want_refresh = 1;
2674} 2717}
2675 2718
2676/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2677/* 2720/*
2678 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
2679 */ 2722 */
2680void 2723void
2681rxvt_term::paste (char *data, unsigned int len) NOTHROW 2724rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2682{ 2725{
2683 /* convert normal newline chars into common keyboard Return key sequence */ 2726 /* convert normal newline chars into common keyboard Return key sequence */
2684 for (unsigned int i = 0; i < len; i++) 2727 for (unsigned int i = 0; i < len; i++)
2685 if (data[i] == C0_LF) 2728 if (data[i] == C0_LF)
2686 data[i] = C0_CR; 2729 data[i] = C0_CR;
2687 2730
2688 if (priv_modes & PrivMode_BracketPaste) 2731 if (priv_modes & PrivMode_BracketPaste)
2689 tt_printf ("\e[200~"); 2732 tt_printf ("\x1b[200~");
2690 2733
2691 tt_write (data, len); 2734 tt_write (data, len);
2692 2735
2693 if (priv_modes & PrivMode_BracketPaste) 2736 if (priv_modes & PrivMode_BracketPaste)
2694 tt_printf ("\e[201~"); 2737 tt_printf ("\x1b[201~");
2695} 2738}
2696 2739
2697/* ------------------------------------------------------------------------- */
2698/*
2699 * Respond to a notification that a primary selection has been sent
2700 * EXT: SelectionNotify
2701 */
2702void 2740void
2703rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::paste (char *data, unsigned int len) NOTHROW
2704{ 2742{
2705 if (prop == None) /* check for failed XConvertSelection */ 2743 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2706 {
2707 if ((selection_type & Sel_CompoundText))
2708 {
2709 int selnum = selection_type & Sel_whereMask;
2710
2711 selection_type = 0;
2712 if (selnum != Sel_direct)
2713 selection_request_other (XA_STRING, selnum);
2714 }
2715
2716 if ((selection_type & Sel_UTF8String))
2717 {
2718 int selnum = selection_type & Sel_whereMask;
2719
2720 selection_type = Sel_CompoundText;
2721 if (selnum != Sel_direct)
2722 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2723 else
2724 selection_type = 0;
2725 }
2726
2727 return;
2728 }
2729
2730 unsigned long bytes_after;
2731 XTextProperty ct;
2732
2733 if (XGetWindowProperty (dpy, win, prop,
2734 0, PROP_SIZE / 4,
2735 delete_prop, AnyPropertyType,
2736 &ct.encoding, &ct.format,
2737 &ct.nitems, &bytes_after,
2738 &ct.value) != Success)
2739 {
2740 ct.value = 0;
2741 goto bailout;
2742 }
2743
2744 if (ct.encoding == None)
2745 goto bailout;
2746
2747 if (bytes_after)
2748 {
2749 // fetch and append remaining data
2750 XTextProperty ct2;
2751
2752 if (XGetWindowProperty (dpy, win, prop,
2753 ct.nitems / 4, (bytes_after + 3) / 4,
2754 delete_prop, AnyPropertyType,
2755 &ct2.encoding, &ct2.format,
2756 &ct2.nitems, &bytes_after,
2757 &ct2.value) != Success)
2758 goto bailout;
2759
2760 // realloc should be compatible to XFree, here, and elsewhere, too
2761 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2762 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2763 ct.nitems += ct2.nitems;
2764
2765 XFree (ct2.value);
2766 }
2767
2768 if (ct.value == 0)
2769 goto bailout;
2770
2771 if (ct.encoding == xa[XA_INCR])
2772 {
2773 // INCR selection, start handshake
2774 if (!delete_prop)
2775 XDeleteProperty (dpy, win, prop);
2776
2777 selection_wait = Sel_incr;
2778 incr_buf_fill = 0;
2779 incr_ev.start (10);
2780
2781 goto bailout;
2782 }
2783
2784 if (ct.nitems == 0)
2785 {
2786 if (selection_wait == Sel_incr)
2787 {
2788 XFree (ct.value);
2789
2790 // finally complete, now paste the whole thing
2791 selection_wait = Sel_normal;
2792 ct.value = (unsigned char *)incr_buf;
2793 ct.nitems = incr_buf_fill;
2794 incr_buf = 0;
2795 incr_buf_size = 0;
2796 incr_ev.stop ();
2797 }
2798 else
2799 {
2800 if (selection_wait == Sel_normal
2801 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2802 {
2803 /*
2804 * pass through again trying CUT_BUFFER0 if we've come from
2805 * XConvertSelection () but nothing was presented
2806 */
2807 selection_paste (display->root, XA_CUT_BUFFER0, False);
2808 }
2809
2810 goto bailout;
2811 }
2812 }
2813 else if (selection_wait == Sel_incr)
2814 {
2815 incr_ev.start (10);
2816
2817 while (incr_buf_fill + ct.nitems > incr_buf_size)
2818 {
2819 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2820 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2821 }
2822
2823 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2824 incr_buf_fill += ct.nitems;
2825
2826 goto bailout;
2827 }
2828
2829 char **cl;
2830 int cr;
2831
2832#if !ENABLE_MINIMAL
2833 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2834 // so recode it manually
2835 if (ct.encoding == xa[XA_UTF8_STRING])
2836 {
2837 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2838 char *s = rxvt_wcstombs (w);
2839 free (w);
2840 // TODO: strlen == only the first element will be converted. well...
2841 paste (s, strlen (s));
2842 free (s);
2843 }
2844 else
2845#endif
2846 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2847 && cl)
2848 {
2849 for (int i = 0; i < cr; i++)
2850 paste (cl[i], strlen (cl[i]));
2851
2852 XFreeStringList (cl);
2853 }
2854 else
2855 paste ((char *)ct.value, ct.nitems); // paste raw
2856
2857bailout:
2858 XFree (ct.value);
2859
2860 if (selection_wait == Sel_normal)
2861 selection_wait = Sel_none;
2862}
2863
2864void
2865rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2866{
2867 selection_wait = Sel_none;
2868
2869 incr_buf_size = 0;
2870 free (incr_buf);
2871
2872 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2873}
2874
2875void
2876rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2877{
2878 if (prop == None || selection_wait != Sel_incr)
2879 return; 2744 return;
2880 2745
2881 selection_paste (win, prop, true); 2746 tt_paste (data, len);
2882} 2747}
2883 2748
2884/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2885/* 2750/*
2886 * Request the current selection: 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2887 * Order: > internal selection if available 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2888 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2753 * as fallback
2889 * > CUT_BUFFER0
2890 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2891 * will auto fallback to CUT_BUFFER0
2892 * EXT: button 2 release 2754 * EXT: button 2 release
2893 */ 2755 */
2894void 2756void
2895rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2896{ 2758{
2897 if (selection.text && selnum == Sel_Primary) 2759 if (!selection_req)
2898 {
2899 /* internal selection */
2900 char *str = rxvt_wcstombs (selection.text, selection.len);
2901 paste (str, strlen (str));
2902 free (str);
2903 return;
2904 } 2760 {
2905 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2906 { 2763 }
2907 selection_request_time = tm;
2908 selection_wait = Sel_normal;
2909
2910#if X_HAVE_UTF8_STRING
2911 selection_type = Sel_UTF8String;
2912 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2913 return;
2914#else
2915 selection_type = Sel_CompoundText;
2916 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2917 return;
2918#endif
2919 }
2920
2921 selection_wait = Sel_none; /* don't loop in selection_paste () */
2922 selection_paste (display->root, XA_CUT_BUFFER0, false);
2923}
2924
2925int
2926rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2927{
2928 Atom sel;
2929
2930 selection_type |= selnum;
2931
2932 if (selnum == Sel_Primary)
2933 sel = XA_PRIMARY;
2934 else if (selnum == Sel_Secondary)
2935 sel = XA_SECONDARY;
2936 else
2937 sel = xa[XA_CLIPBOARD];
2938
2939 if (XGetSelectionOwner (dpy, sel) != None)
2940 {
2941 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2942 vt, selection_request_time);
2943 return 1;
2944 }
2945
2946 return 0;
2947} 2764}
2948 2765
2949/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2950/* 2767/*
2951 * Clear all selected text 2768 * Clear all selected text
2952 * EXT: SelectionClear 2769 * EXT: SelectionClear
2953 */ 2770 */
2954void 2771void
2955rxvt_term::selection_clear () NOTHROW 2772rxvt_term::selection_clear (bool clipboard) NOTHROW
2956{ 2773{
2774 if (!clipboard)
2775 {
2957 want_refresh = 1; 2776 want_refresh = 1;
2958 free (selection.text); 2777 free (selection.text);
2959 selection.text = NULL; 2778 selection.text = NULL;
2960 selection.len = 0; 2779 selection.len = 0;
2961 CLEAR_SELECTION (); 2780 CLEAR_SELECTION ();
2962 2781
2963 if (display->selection_owner == this) 2782 if (display->selection_owner == this)
2964 display->selection_owner = 0; 2783 display->selection_owner = 0;
2784 }
2785 else
2786 {
2787 free (selection.clip_text);
2788 selection.clip_text = NULL;
2789 selection.clip_len = 0;
2790
2791 if (display->clipboard_owner == this)
2792 display->clipboard_owner = 0;
2793 }
2965} 2794}
2966 2795
2967/* ------------------------------------------------------------------------- */ 2796/* ------------------------------------------------------------------------- */
2968/* 2797/*
2969 * Copy a selection into the cut buffer 2798 * Copy a selection into the cut buffer
2970 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
2971 */ 2800 */
2972void 2801void
2973rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
2974{ 2803{
2975 int i; 2804 int size;
2976 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
2977 text_t *t; 2806 text_t *t;
2978 2807
2979 switch (selection.op) 2808 switch (selection.op)
2980 { 2809 {
… …
2996 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
2997 2826
2998 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2827 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2999 return; 2828 return;
3000 2829
3001 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3002 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2831 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3003 2832
3004 int ofs = 0; 2833 int ofs = 0;
3005 int extra = 0; 2834 int extra = 0;
3006 2835
3007 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
3013 { 2842 {
3014#if !ENABLE_MINIMAL 2843#if !ENABLE_MINIMAL
3015 if (selection.rect) 2844 if (selection.rect)
3016 { 2845 {
3017 col = selection.beg.col; 2846 col = selection.beg.col;
3018 end_col = ncol + 1; 2847 end_col = selection.end.col;
3019 } 2848 }
3020 else 2849 else
3021#endif 2850#endif
3022 end_col = ROW(row).l; 2851 end_col = ROW(row).l;
3023 2852
3024 col = max (col, 0); 2853 col = max (col, 0);
3025 2854
3026 if (row == selection.end.row 2855 if (row == selection.end.row)
3027#if !ENABLE_MINIMAL
3028 || selection.rect
3029#endif
3030 )
3031 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
3032 2857
3033 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
3034 2859
3035 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
… …
3043 2868
3044 extra -= (len - 1); 2869 extra -= (len - 1);
3045 2870
3046 if (extra < 0) 2871 if (extra < 0)
3047 { 2872 {
3048 extra += i; 2873 extra += size;
3049 i += i; 2874 size += size;
3050 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3051 } 2876 }
3052 2877
3053 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3054 } 2879 }
3055#endif 2880#endif
… …
3067 2892
3068 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3069 } 2894 }
3070 else 2895 else
3071#endif 2896#endif
3072 if (!ROW(row).is_longer () && row != selection.end.row) 2897 if (!ROW(row).is_longer ()
2898 && (row != selection.end.row || end_col != selection.end.col)
2899 && (row != selection.beg.row || selection.beg.col < ncol))
3073 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3074 } 2901 }
3075
3076 if (end_col != selection.end.col)
3077 new_selection_text[ofs++] = C0_LF;
3078 2902
3079 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
3080 2904
3081 if (ofs == 0) 2905 if (ofs == 0)
3082 { 2906 {
… …
3095 2919
3096 selection_grab (tm); 2920 selection_grab (tm);
3097} 2921}
3098 2922
3099bool 2923bool
3100rxvt_term::selection_grab (Time tm) NOTHROW 2924rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3101{ 2925{
2926 Atom sel;
2927
2928 if (!clipboard)
2929 {
3102 selection_time = tm; 2930 selection_time = tm;
2931 sel = XA_PRIMARY;
2932 }
2933 else
2934 {
2935 clipboard_time = tm;
2936 sel = xa[XA_CLIPBOARD];
2937 }
3103 2938
3104 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2939 XSetSelectionOwner (dpy, sel, vt, tm);
3105 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2940 if (XGetSelectionOwner (dpy, sel) == vt)
3106 { 2941 {
3107 display->set_selection_owner (this); 2942 display->set_selection_owner (this, clipboard);
3108 return true; 2943 return true;
3109 } 2944 }
3110 else 2945 else
3111 { 2946 {
3112 selection_clear (); 2947 selection_clear (clipboard);
3113 return false; 2948 return false;
3114 } 2949 }
3115 2950
3116#if 0 2951#if 0
3117 XTextProperty ct; 2952 XTextProperty ct;
… …
3127/* ------------------------------------------------------------------------- */ 2962/* ------------------------------------------------------------------------- */
3128/* 2963/*
3129 * Mark or select text based upon number of clicks: 1, 2, or 3 2964 * Mark or select text based upon number of clicks: 1, 2, or 3
3130 * EXT: button 1 press 2965 * EXT: button 1 press
3131 */ 2966 */
3132void 2967void ecb_cold
3133rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3134{ 2969{
3135 clicks = ((clicks - 1) % 3) + 1; 2970 clicks = ((clicks - 1) % 3) + 1;
3136 selection.clicks = clicks; /* save clicks so extend will work */ 2971 selection.clicks = clicks; /* save clicks so extend will work */
3137 2972
… …
3156 2991
3157/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
3158/* 2993/*
3159 * Mark a selection at the specified col/row 2994 * Mark a selection at the specified col/row
3160 */ 2995 */
3161void 2996void ecb_cold
3162rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3163{ 2998{
3164 want_refresh = 1; 2999 want_refresh = 1;
3165 3000
3166 selection.mark.row = row + view_start; 3001 selection.mark.row = row + view_start;
… …
3189 * Word select: select text for 2 clicks 3024 * Word select: select text for 2 clicks
3190 * We now only find out the boundary in one direction 3025 * We now only find out the boundary in one direction
3191 */ 3026 */
3192 3027
3193/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3194#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3195 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3196#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3197 3032
3198void 3033void ecb_cold
3199rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3200{ 3035{
3201 int col, row, dirnadd, tcol, trow, w1, w2; 3036 int col, row, dirnadd, tcol, trow, w1, w2;
3202 row_col_t bound; 3037 row_col_t bound;
3203 text_t *stp; 3038 text_t *stp;
… …
3277 * EXT: button 3 press; button 1 or 3 drag 3112 * EXT: button 3 press; button 1 or 3 drag
3278 * flag == 0 ==> button 1 3113 * flag == 0 ==> button 1
3279 * flag == 1 ==> button 3 press 3114 * flag == 1 ==> button 3 press
3280 * flag == 2 ==> button 3 motion 3115 * flag == 2 ==> button 3 motion
3281 */ 3116 */
3282void 3117void ecb_cold
3283rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3284{ 3119{
3285 int col = clamp (Pixel2Col (x), 0, ncol); 3120 int col = clamp (Pixel2Col (x), 0, ncol);
3286 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3121 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3287 3122
… …
3313 3148
3314/* ------------------------------------------------------------------------- */ 3149/* ------------------------------------------------------------------------- */
3315/* 3150/*
3316 * Extend the selection to the specified col/row 3151 * Extend the selection to the specified col/row
3317 */ 3152 */
3318void 3153void ecb_cold
3319rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3320{ 3155{
3321 row_col_t pos; 3156 row_col_t pos;
3322 enum { 3157 enum {
3323 LEFT, RIGHT 3158 LEFT, RIGHT
3324 } closeto = RIGHT; 3159 } closeto = RIGHT;
3325
3326 want_refresh = 1;
3327 3160
3328 switch (selection.op) 3161 switch (selection.op)
3329 { 3162 {
3330 case SELECTION_INIT: 3163 case SELECTION_INIT:
3331 CLEAR_SELECTION (); 3164 CLEAR_SELECTION ();
… …
3511 3344
3512#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3513 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3514 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3515#endif 3348#endif
3349
3350 selection_changed ();
3516} 3351}
3517 3352
3518#if !ENABLE_MINIMAL 3353#if !ENABLE_MINIMAL
3519void 3354void ecb_cold
3520rxvt_term::selection_remove_trailing_spaces () NOTHROW 3355rxvt_term::selection_remove_trailing_spaces () NOTHROW
3521{ 3356{
3522 int32_t end_col, end_row; 3357 int32_t end_col, end_row;
3523 text_t *stp; 3358 text_t *stp;
3524 3359
… …
3562/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3563/* 3398/*
3564 * Double click on button 3 when already selected 3399 * Double click on button 3 when already selected
3565 * EXT: button 3 double click 3400 * EXT: button 3 double click
3566 */ 3401 */
3567void 3402void ecb_cold
3568rxvt_term::selection_rotate (int x, int y) NOTHROW 3403rxvt_term::selection_rotate (int x, int y) NOTHROW
3569{ 3404{
3570 selection.clicks = selection.clicks % 3 + 1; 3405 selection.clicks = selection.clicks % 3 + 1;
3571 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3572} 3407}
… …
3574/* ------------------------------------------------------------------------- */ 3409/* ------------------------------------------------------------------------- */
3575/* 3410/*
3576 * Respond to a request for our current selection 3411 * Respond to a request for our current selection
3577 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3578 */ 3413 */
3579void 3414void ecb_cold
3580rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3581{ 3416{
3417 Atom property = rq.property == None ? rq.target : rq.property;
3582 XSelectionEvent ev; 3418 XSelectionEvent ev;
3583 3419
3584 ev.type = SelectionNotify; 3420 ev.type = SelectionNotify;
3585 ev.property = None; 3421 ev.property = None;
3586 ev.display = rq.display; 3422 ev.display = rq.display;
… …
3601 *target++ = xa[XA_COMPOUND_TEXT]; 3437 *target++ = xa[XA_COMPOUND_TEXT];
3602#if X_HAVE_UTF8_STRING 3438#if X_HAVE_UTF8_STRING
3603 *target++ = xa[XA_UTF8_STRING]; 3439 *target++ = xa[XA_UTF8_STRING];
3604#endif 3440#endif
3605 3441
3606 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3442 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3607 32, PropModeReplace, 3443 32, PropModeReplace,
3608 (unsigned char *)target_list, target - target_list); 3444 (unsigned char *)target_list, target - target_list);
3609 ev.property = rq.property; 3445 ev.property = property;
3610 } 3446 }
3611#if TODO // TODO 3447#if TODO // TODO
3612 else if (rq.target == xa[XA_MULTIPLE]) 3448 else if (rq.target == xa[XA_MULTIPLE])
3613 { 3449 {
3614 /* TODO: Handle MULTIPLE */ 3450 /* TODO: Handle MULTIPLE */
3615 } 3451 }
3616#endif 3452#endif
3617 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3618 { 3454 {
3619 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3620 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3456 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3621 ev.property = rq.property; 3457 ev.property = property;
3458 }
3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3460 {
3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3462 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3463 ev.property = property;
3622 } 3464 }
3623 else if (rq.target == XA_STRING 3465 else if (rq.target == XA_STRING
3624 || rq.target == xa[XA_TEXT] 3466 || rq.target == xa[XA_TEXT]
3625 || rq.target == xa[XA_COMPOUND_TEXT] 3467 || rq.target == xa[XA_COMPOUND_TEXT]
3626 || rq.target == xa[XA_UTF8_STRING] 3468 || rq.target == xa[XA_UTF8_STRING]
… …
3658 { 3500 {
3659 target = xa[XA_COMPOUND_TEXT]; 3501 target = xa[XA_COMPOUND_TEXT];
3660 style = enc_compound_text; 3502 style = enc_compound_text;
3661 } 3503 }
3662 3504
3663 if (selection.text) 3505 if (rq.selection == XA_PRIMARY && selection.text)
3664 { 3506 {
3665 cl = selection.text; 3507 cl = selection.text;
3666 selectlen = selection.len; 3508 selectlen = selection.len;
3509 }
3510 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3511 {
3512 cl = selection.clip_text;
3513 selectlen = selection.clip_len;
3667 } 3514 }
3668 else 3515 else
3669 { 3516 {
3670 cl = L""; 3517 cl = L"";
3671 selectlen = 0; 3518 selectlen = 0;
… …
3692 ct.value = (unsigned char *)cl; 3539 ct.value = (unsigned char *)cl;
3693 ct.nitems = selectlen; 3540 ct.nitems = selectlen;
3694 ct.encoding = target; 3541 ct.encoding = target;
3695 } 3542 }
3696 3543
3697 XChangeProperty (dpy, rq.requestor, rq.property, 3544 XChangeProperty (dpy, rq.requestor, property,
3698 ct.encoding, 8, PropModeReplace, 3545 ct.encoding, 8, PropModeReplace,
3699 ct.value, (int)ct.nitems); 3546 ct.value, (int)ct.nitems);
3700 ev.property = rq.property; 3547 ev.property = property;
3701 3548
3702 if (freect) 3549 if (freect)
3703 XFree (ct.value); 3550 XFree (ct.value);
3704 } 3551 }
3705 3552
3706 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3707} 3554}
3708 3555
3709/* ------------------------------------------------------------------------- */ 3556/* ------------------------------------------------------------------------- */
3710#ifdef USE_XIM 3557#if USE_XIM
3711void 3558void ecb_cold
3712rxvt_term::im_set_position (XPoint &pos) NOTHROW 3559rxvt_term::im_set_position (XPoint &pos) NOTHROW
3713{ 3560{
3714 XWindowAttributes xwa; 3561 XWindowAttributes xwa;
3715 3562
3716 XGetWindowAttributes (dpy, vt, &xwa); 3563 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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